资产增加更新周期字段

config/config.ts

@@ -152,9 +152,10 @@ export default {
   */
   proxy: {
     '/api': {
-      target: 'http://139.198.126.96:9011',
+      // target: 'http://139.198.126.96:9011',
       // target: 'http://192.168.0.220',
       // target: 'http://139.198.127.54:18392',
+      target: 'http://192.168.0.216:8762',
       changeOrigin: true,
     },
   },

config/routes.ts

@@ -88,12 +88,12 @@ export default [
             icon: 'appstore',
             component: './data/datastandard',
           },
-          {
-            path: './dataquality',
-            name: 'dataquality',
-            icon: 'appstore',
-            component: './data/dataquality',
-          },
+          // {
+          //   path: './dataquality',
+          //   name: 'dataquality',
+          //   icon: 'appstore',
+          //   component: './data/dataquality',
+          // },
         ],
       },
       {

src/global.less

@@ -70,12 +70,10 @@ ol {
 .ant-modal-body {
   .ant-descriptions-item-label, .ant-table-column-title {
     color: #333 !important;
-    font-size: 12px !important;
   }
 
   .ant-descriptions-item-content, .ant-table-tbody {
     color: #666 !important;
-    font-size: 10px !important;
   }
 
   .ant-tabs-nav {
@@ -85,7 +83,6 @@ ol {
 }
 
 
-.ant-modal
 
 /* 滚动条 */
 ::-webkit-scrollbar-track-piece {

src/pages/.umi/router.js

@@ -210,28 +210,6 @@ const routes = [
             exact: true,
           },
           {
-            path: '/manage/dataquality',
-            name: 'dataquality',
-            icon: 'appstore',
-            component: __IS_BROWSER
-              ? _dvaDynamic({
-                  app: require('@tmp/dva').getApp(),
-                  models: () => [
-                    import(/* webpackChunkName: 'p__data__dataquality__model.ts' */ '/Users/zcx/Desktop/react/hnyc-data-pro/src/pages/data/dataquality/model.ts').then(
-                      m => {
-                        return { namespace: 'model', ...m.default };
-                      },
-                    ),
-                  ],
-                  component: () =>
-                    import(/* webpackChunkName: "p__data__dataquality" */ '../data/dataquality'),
-                  LoadingComponent: require('/Users/zcx/Desktop/react/hnyc-data-pro/src/components/PageLoading/index')
-                    .default,
-                })
-              : require('../data/dataquality').default,
-            exact: true,
-          },
-          {
             component: () =>
               React.createElement(
                 require('/Users/zcx/Desktop/react/hnyc-data-pro/node_modules/umi-build-dev/lib/plugins/404/NotFound.js')

src/pages/assets/components/AssetList.tsx

@@ -48,6 +48,8 @@ export interface TableModel {
   rated?: boolean;
   tableIdInSource?: string;
   processId?: string | undefined;
+  updateCycle: string;
+  dataCycle: string;
 }
 
 export interface AssetListStateType {
@@ -221,6 +223,7 @@ class AssetListCOM extends React.Component<Props, State> {
         expireDate,
         score,
         rated,
+        updateCycle
       },
       item,
     }: {
@@ -234,8 +237,8 @@ class AssetListCOM extends React.Component<Props, State> {
             {departMent}
           </Col>
           <Col md={6}>
-            <Text>更新时间：</Text>
-            {updateTime_str}
+            <Text>更新周期：</Text>
+            {updateCycle}
           </Col>
           <Col md={6}>
             <Text>发布时间：</Text>
@@ -254,7 +257,7 @@ class AssetListCOM extends React.Component<Props, State> {
         </Row>
         <Row>
           <Col md={18}>
-            <Text>资产摘要：</Text>
+            <Text>资产备注：</Text>
             <span dangerouslySetInnerHTML={{ __html: remarks }} />
           </Col>
           <Col md={6}>

src/pages/assets/components/AssetListHelper.tsx

@@ -68,6 +68,7 @@ export const DataDesc: React.FunctionComponent<DataDescProps> = ({ dataDesc }) =
           pageSize={pageSize}
           defaultCurrent={1}
           total={dataDesc.columns.length}
+          showTotal={total => `共 ${total} 条`}
         />
       )}
     </Fragment>
@@ -166,9 +167,9 @@ export const DataDetail: React.FunctionComponent<DataDetailProps> = ({
     <Descriptions.Item label="所属系统">{tableModel.system}</Descriptions.Item>
     <Descriptions.Item label="发布时间">{tableModel.createTime_str}</Descriptions.Item>
     {/* <Descriptions.Item label="资产密级">{tableModel.assetStrictLevel_}</Descriptions.Item> */}
-    <Descriptions.Item label="更新时间">{tableModel.updateTime_str}</Descriptions.Item>
+    <Descriptions.Item label="更新周期">{tableModel.updateCycle}</Descriptions.Item>
     {/* <Descriptions.Item label="表内容及业务含义">{metaData.business}</Descriptions.Item> */}
-    <Descriptions.Item label="源系统">{metaData.sourceSystem}</Descriptions.Item>
+    <Descriptions.Item label="数据周期">{tableModel.dataCycle}</Descriptions.Item>
     {/* <Descriptions.Item label="数据更新特点">{metaData.updateFeature}</Descriptions.Item> */}
     {/* <Descriptions.Item label="主题域">{metaData.domain}</Descriptions.Item> */}
     {/* {metaData.hasOwnProperty('leaderInfo') && (
@@ -312,6 +313,7 @@ const ApplyDescFunc: React.FunctionComponent<ApplyDescProps> = ({ dataDesc, form
           pageSize={pageSize}
           defaultCurrent={1}
           total={dataDesc.columns.length}
+          showTotal={total => `共 ${total} 条`}
         />
       )}
       <Divider />

src/pages/assets/index.tsx

@@ -142,6 +142,7 @@ class DataAssetsCOM extends React.Component<DataAssetsProps, DataAssetsState> {
                 pageSize={pageSize}
                 defaultCurrent={1}
                 total={tableModelNum}
+                showTotal={total => `共 ${total} 条`}
               />
             </Card>
           </Col>

src/pages/data/dataindicator/index.tsx

@@ -243,6 +243,7 @@ class DataIndicator extends Component<DataIndicatorProps, DataIndicatorState> {
                 pageSize={pageSize}
                 defaultCurrent={1}
                 total={totalPage}
+                showTotal={total => `共 ${total} 条`}
               />
             </Card>
           </Col>

src/pages/data/dataquality/index.tsx

@@ -409,6 +409,7 @@ class DataQuality extends React.Component<Props, State> {
                 pageSize={errorPage.pageSize}
                 defaultCurrent={1}
                 total={errorTotal}
+                showTotal={total => `共 ${total} 条`}
               />
             </Card>
           </Col>
@@ -452,6 +453,7 @@ class DataQuality extends React.Component<Props, State> {
                 pageSize={goodPage.pageSize}
                 defaultCurrent={1}
                 total={goodTotal}
+                showTotal={total => `共 ${total} 条`}
               />
             </Card>
           </Col>
@@ -495,6 +497,7 @@ class DataQuality extends React.Component<Props, State> {
                 pageSize={neverPage.pageSize}
                 defaultCurrent={1}
                 total={neverTotal}
+                showTotal={total => `共 ${total} 条`}
               />
             </Card>
           </Col>

src/pages/data/datastandard/index.tsx

@@ -243,6 +243,7 @@ class DataStandard extends Component<DataStandardProps, DataStandardState> {
                 pageSize={pageSize}
                 defaultCurrent={1}
                 total={totalPage}
+                showTotal={total => `共 ${total} 条`}
               />
             </Card>
           </Col>

src/pages/home/HomeHelper.js

@@ -135,7 +135,7 @@ const homeMenu = [
   },
   { title: '数据指标', img: menuImg3, url: '/manage/dataindicator' },
   { title: '数据标准', img: menuImg4, url: '/manage/datastandard' },
-  { title: '数据质量', img: menuImg5, url: '/manage/dataquality' },
+  // { title: '数据质量', img: menuImg5, url: '/manage/dataquality' },
 ];
 
 export class HomeMenu extends Component {

src/pages/manage/categorieSearch/index.tsx

@@ -230,6 +230,7 @@ class CategoriesSearch extends React.Component<CategoriesSearchProps, Categories
               pageSize={pageSize}
               defaultCurrent={1}
               total={tableModelTotal}
+              showTotal={total => `共 ${total} 条`}
             />
           </Spin>
         </Card>

src/pages/manage/commonSearch/index.tsx

@@ -250,6 +250,7 @@ class SearchResult extends React.Component<SearchResultProps, SearchResultState>
               pageSize={pageSize}
               defaultCurrent={1}
               total={tableModelTotal}
+              showTotal={total => `共 ${total} 条`}
             />
           </Spin>
         </Card>

src/pages/user/apply/index.tsx

@@ -83,6 +83,7 @@ class DataAssetsCOM extends React.Component<Props, State> {
                 pageSize={pageSize}
                 defaultCurrent={1}
                 total={tableModelNum}
+                showTotal={total => `共 ${total} 条`}
               />
             </Card>
           </Col>

src/pages/user/assets/index.tsx

@@ -90,6 +90,7 @@ class DataAssetsCOM extends React.Component<Props, State> {
                 pageSize={pageSize}
                 defaultCurrent={1}
                 total={tableModelNum}
+                showTotal={total => `共 ${total} 条`}
               />
             </Card>
           </Col>

src/pages/user/question/index.tsx

@@ -219,6 +219,7 @@ class UserQuestion extends React.Component<UserQuestionProps, UserQuestionState>
               pageSize={pageSize}
               current={pageNum}
               total={total}
+              showTotal={total => `共 ${total} 条`}
               defaultCurrent={1}
               showSizeChanger
               showQuickJumper

src/pages/user/subscrible/index.tsx

@@ -107,6 +107,7 @@ class UserSubscrible extends React.Component<UserSubscribleProps, UserSubscrible
             current={pageNum}
             defaultCurrent={1}
             total={tableModel.length}
+            showTotal={total => `共 ${total} 条`}
             onChange={(_pageNum: number, _pageSize: number | undefined) => {
               this.setState({ pageNum: _pageNum, pageSize: _pageSize || 10 });
             }}