Merge branch 'feature/shuiluo' into 'master'

Feature/shuiluo

See merge request product/kim3-web-vue/starter-web-vue!51

package.json

@@ -17,12 +17,12 @@
   "dependencies": {
     "@antv/data-set": "^0.11.4",
     "@tailwindcss/postcss7-compat": "^2.2.2",
-    "cronstrue": "^1.106.0",
     "animate.css": "^4.1.0",
     "ant-design-vue": "1.7.2",
     "axios": "^0.21.1",
     "clipboard": "^2.0.6",
     "core-js": "^3.6.5",
+    "cronstrue": "^1.114.0",
     "crypto-js": "^4.0.0",
     "date-fns": "^2.14.0",
     "highlight.js": "^10.2.1",

pnpm-lock.yaml

@@ -18,7 +18,7 @@ specifiers:
   clipboard: ^2.0.6
   compression-webpack-plugin: ^2.0.0
   core-js: ^3.6.5
-  cronstrue: ^1.106.0
+  cronstrue: ^1.114.0
   crypto-js: ^4.0.0
   date-fns: ^2.14.0
   deepmerge: ^4.2.2
@@ -731,6 +731,8 @@ packages:
     resolution: {integrity: sha1-IlY0gZYvTWvemnbVFu8OXTwJsrg=, tarball: axios/download/axios-0.21.1.tgz?cache=0&sync_timestamp=1609319355933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.21.1.tgz}
     dependencies:
       follow-redirects: registry.nlark.com/follow-redirects/1.14.1
+    transitivePeerDependencies:
+      - debug
     dev: false
 
   /babel-helper-vue-jsx-merge-props/2.0.3:
@@ -2531,6 +2533,7 @@ packages:
   /fsevents/1.2.13:
     resolution: {integrity: sha1-8yXLBFVZJCi88Rs4M3DvcOO/zDg=, tarball: fsevents/download/fsevents-1.2.13.tgz}
     engines: {node: '>= 4.0'}
+    os: [darwin]
     deprecated: fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.
     requiresBuild: true
     dependencies:
@@ -2880,13 +2883,15 @@ packages:
     resolution: {integrity: sha1-AdJwnHnUFpi7AdTezF6dpOSgM9k=, tarball: http-parser-js/download/http-parser-js-0.5.3.tgz}
     dev: true
 
-  /http-proxy/1.18.1:
+  /http-proxy/1.18.1_debug@4.3.2:
     resolution: {integrity: sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk=, tarball: http-proxy/download/http-proxy-1.18.1.tgz}
     engines: {node: '>=8.0.0'}
     dependencies:
       eventemitter3: 4.0.7
       follow-redirects: registry.nlark.com/follow-redirects/1.14.1
       requires-port: 1.0.0
+    transitivePeerDependencies:
+      - debug
     dev: true
 
   /http-signature/1.2.0:
@@ -4561,6 +4566,8 @@ packages:
     engines: {node: '>=6'}
     dependencies:
       ts-pnp: 1.2.0
+    transitivePeerDependencies:
+      - typescript
     dev: true
 
   /point-at-length/1.1.0:
@@ -5093,7 +5100,7 @@ packages:
   /resolve/1.20.0:
     resolution: {integrity: sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU=, tarball: resolve/download/resolve-1.20.0.tgz}
     dependencies:
-      is-core-module: registry.nlark.com/is-core-module/2.4.0
+      is-core-module: registry.nlark.com/is-core-module/2.5.0
       path-parse: registry.nlark.com/path-parse/1.0.7
 
   /responselike/1.0.2:
@@ -5939,6 +5946,11 @@ packages:
   /ts-pnp/1.2.0:
     resolution: {integrity: sha1-pQCtCEsHmPHDBxrzkeZZEshrypI=, tarball: ts-pnp/download/ts-pnp-1.2.0.tgz}
     engines: {node: '>=6'}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dev: true
 
   /tty-browserify/0.0.0:
@@ -6877,6 +6889,8 @@ packages:
       '@babel/helper-annotate-as-pure': registry.nlark.com/@babel/helper-annotate-as-pure/7.14.5
       '@babel/helper-wrap-function': registry.nlark.com/@babel/helper-wrap-function/7.14.5
       '@babel/types': registry.nlark.com/@babel/types/7.14.5
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   registry.nlark.com/@babel/helper-replace-supers/7.14.5:
@@ -6943,6 +6957,8 @@ packages:
       '@babel/template': registry.nlark.com/@babel/template/7.14.5
       '@babel/traverse': registry.nlark.com/@babel/traverse/7.14.7
       '@babel/types': registry.nlark.com/@babel/types/7.14.5
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   registry.nlark.com/@babel/helpers/7.14.6:
@@ -7004,6 +7020,8 @@ packages:
       '@babel/helper-plugin-utils': registry.nlark.com/@babel/helper-plugin-utils/7.14.5
       '@babel/helper-remap-async-to-generator': registry.nlark.com/@babel/helper-remap-async-to-generator/7.14.5
       '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.14.6
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   registry.nlark.com/@babel/plugin-proposal-class-properties/7.14.5_@babel+core@7.14.6:
@@ -7325,6 +7343,8 @@ packages:
       '@babel/helper-module-imports': registry.nlark.com/@babel/helper-module-imports/7.14.5
       '@babel/helper-plugin-utils': registry.nlark.com/@babel/helper-plugin-utils/7.14.5
       '@babel/helper-remap-async-to-generator': registry.nlark.com/@babel/helper-remap-async-to-generator/7.14.5
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   registry.nlark.com/@babel/plugin-transform-block-scoped-functions/7.14.5_@babel+core@7.14.6:
@@ -7932,7 +7952,7 @@ packages:
     dev: true
 
   registry.nlark.com/@nodelib/fs.scandir/2.1.5:
-    resolution: {integrity: sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622793808741&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz}
+    resolution: {integrity: sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz}
     name: '@nodelib/fs.scandir'
     version: 2.1.5
     engines: {node: '>= 8'}
@@ -8196,8 +8216,9 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  registry.nlark.com/@types/webpack-dev-server/3.11.5:
+  registry.nlark.com/@types/webpack-dev-server/3.11.5_debug@4.3.2:
     resolution: {integrity: sha1-9KJUo90GZ8juSvkNQq/bStHWB/M=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/@types/webpack-dev-server/download/@types/webpack-dev-server-3.11.5.tgz}
+    id: registry.nlark.com/@types/webpack-dev-server/3.11.5
     name: '@types/webpack-dev-server'
     version: 3.11.5
     dependencies:
@@ -8205,7 +8226,9 @@ packages:
       '@types/express': registry.nlark.com/@types/express/4.17.13
       '@types/serve-static': registry.nlark.com/@types/serve-static/1.13.10
       '@types/webpack': registry.nlark.com/@types/webpack/4.41.30
-      http-proxy-middleware: registry.nlark.com/http-proxy-middleware/1.3.1
+      http-proxy-middleware: registry.nlark.com/http-proxy-middleware/1.3.1_debug@4.3.2
+    transitivePeerDependencies:
+      - debug
     dev: true
 
   registry.nlark.com/@types/webpack-sources/2.1.1:
@@ -8395,7 +8418,7 @@ packages:
       '@soda/get-current-script': 1.0.2
       '@types/minimist': registry.nlark.com/@types/minimist/1.2.2
       '@types/webpack': registry.nlark.com/@types/webpack/4.41.30
-      '@types/webpack-dev-server': registry.nlark.com/@types/webpack-dev-server/3.11.5
+      '@types/webpack-dev-server': registry.nlark.com/@types/webpack-dev-server/3.11.5_debug@4.3.2
       '@vue/cli-overlay': registry.nlark.com/@vue/cli-overlay/4.5.13
       '@vue/cli-plugin-router': registry.nlark.com/@vue/cli-plugin-router/4.5.13_@vue+cli-service@4.5.13
       '@vue/cli-plugin-vuex': registry.nlark.com/@vue/cli-plugin-vuex/4.5.13_@vue+cli-service@4.5.13
@@ -8451,6 +8474,7 @@ packages:
       vue-loader-v16: registry.nlark.com/vue-loader/16.3.0
     transitivePeerDependencies:
       - supports-color
+      - typescript
       - webpack-cli
       - webpack-command
     dev: true
@@ -8524,7 +8548,7 @@ packages:
       toml: 3.0.0
       url-loader: 1.1.2_webpack@4.46.0
       vue: registry.nlark.com/vue/2.6.14
-      vue-loader: registry.nlark.com/vue-loader/15.9.7_css-loader@2.1.1+webpack@4.46.0
+      vue-loader: registry.nlark.com/vue-loader/15.9.7_a021309c4954b2e3e3b6c3a6e1323de2
       vue-router: registry.nlark.com/vue-router/3.5.2
       vue-server-renderer: registry.nlark.com/vue-server-renderer/2.6.14
       vue-template-compiler: registry.nlark.com/vue-template-compiler/2.6.14
@@ -8535,6 +8559,10 @@ packages:
       webpack-dev-server: registry.nlark.com/webpack-dev-server/3.11.2_webpack@4.46.0
       webpack-merge: registry.nlark.com/webpack-merge/4.2.2
       webpackbar: registry.nlark.com/webpackbar/3.2.0_webpack@4.46.0
+    transitivePeerDependencies:
+      - supports-color
+      - webpack-cli
+      - webpack-command
     dev: true
 
   registry.nlark.com/@vuepress/markdown-loader/1.8.2:
@@ -9326,7 +9354,7 @@ packages:
     requiresBuild: true
 
   registry.nlark.com/cronstrue/1.114.0:
-    resolution: {integrity: sha1-Dmc/pizpAYHDjgfGstf5/HUxU7g=, registry: http://registry.npm.taobao.org/, tarball: https://registry.nlark.com/cronstrue/download/cronstrue-1.114.0.tgz}
+    resolution: {integrity: sha1-Dmc/pizpAYHDjgfGstf5/HUxU7g=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/cronstrue/download/cronstrue-1.114.0.tgz}
     name: cronstrue
     version: 1.114.0
     dev: false
@@ -10077,6 +10105,11 @@ packages:
     name: follow-redirects
     version: 1.14.1
     engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
 
   registry.nlark.com/forwarded/0.2.0:
     resolution: {integrity: sha1-ImmTZCiq1MFcfr6XeahL8LKoGBE=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/forwarded/download/forwarded-0.2.0.tgz}
@@ -10284,29 +10317,35 @@ packages:
       webpack: registry.nlark.com/webpack/4.46.0
     dev: true
 
-  registry.nlark.com/http-proxy-middleware/0.19.1:
+  registry.nlark.com/http-proxy-middleware/0.19.1_debug@4.3.2:
     resolution: {integrity: sha1-GDx9xKoUeRUDBkmMIQza+WCApDo=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-0.19.1.tgz}
+    id: registry.nlark.com/http-proxy-middleware/0.19.1
     name: http-proxy-middleware
     version: 0.19.1
     engines: {node: '>=4.0.0'}
     dependencies:
-      http-proxy: 1.18.1
+      http-proxy: 1.18.1_debug@4.3.2
       is-glob: 4.0.1
       lodash: 4.17.21
       micromatch: 3.1.10
+    transitivePeerDependencies:
+      - debug
     dev: true
 
-  registry.nlark.com/http-proxy-middleware/1.3.1:
+  registry.nlark.com/http-proxy-middleware/1.3.1_debug@4.3.2:
     resolution: {integrity: sha1-Q3ANbZ7st0Gb8IahKND3IF2etmU=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-1.3.1.tgz}
+    id: registry.nlark.com/http-proxy-middleware/1.3.1
     name: http-proxy-middleware
     version: 1.3.1
     engines: {node: '>=8.0.0'}
     dependencies:
       '@types/http-proxy': registry.nlark.com/@types/http-proxy/1.17.7
-      http-proxy: 1.18.1
+      http-proxy: 1.18.1_debug@4.3.2
       is-glob: 4.0.1
       is-plain-obj: 3.0.0
       micromatch: 4.0.4
+    transitivePeerDependencies:
+      - debug
     dev: true
 
   registry.nlark.com/human-signals/1.1.1:
@@ -10389,10 +10428,10 @@ packages:
     dependencies:
       call-bind: 1.0.2
 
-  registry.nlark.com/is-core-module/2.4.0:
-    resolution: {integrity: sha1-jp/I4VAnsBFBgCbpjw5vTYYwXME=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/is-core-module/download/is-core-module-2.4.0.tgz}
+  registry.nlark.com/is-core-module/2.5.0:
+    resolution: {integrity: sha1-91SENhfHC/0pt72HMnQAzaXBhJE=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/is-core-module/download/is-core-module-2.5.0.tgz}
     name: is-core-module
-    version: 2.4.0
+    version: 2.5.0
     dependencies:
       has: 1.0.3
 
@@ -10883,9 +10922,6 @@ packages:
     engines: {node: '>= 10'}
     peerDependencies:
       ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      ts-node:
-        optional: true
     dependencies:
       import-cwd: 3.0.0
       lilconfig: registry.nlark.com/lilconfig/2.0.3
@@ -11811,26 +11847,35 @@ packages:
       webpack: registry.nlark.com/webpack/4.46.0
     dev: true
 
-  registry.nlark.com/vue-loader/15.9.7_css-loader@2.1.1+webpack@4.46.0:
+  registry.nlark.com/vue-loader/15.9.7_a021309c4954b2e3e3b6c3a6e1323de2:
     resolution: {integrity: sha1-FbBXdcPgw4QHZ5OTws5t9nOwEEQ=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/vue-loader/download/vue-loader-15.9.7.tgz}
     id: registry.nlark.com/vue-loader/15.9.7
     name: vue-loader
     version: 15.9.7
     peerDependencies:
+      cache-loader: '*'
       css-loader: '*'
+      vue-template-compiler: '*'
       webpack: ^3.0.0 || ^4.1.0 || ^5.0.0-0
+    peerDependenciesMeta:
+      cache-loader:
+        optional: true
+      vue-template-compiler:
+        optional: true
     dependencies:
       '@vue/component-compiler-utils': registry.nlark.com/@vue/component-compiler-utils/3.2.2
+      cache-loader: 3.0.1_webpack@4.46.0
       css-loader: registry.nlark.com/css-loader/2.1.1_webpack@4.46.0
       hash-sum: 1.0.2
       loader-utils: 1.4.0
       vue-hot-reload-api: 2.3.4
       vue-style-loader: 4.1.3
+      vue-template-compiler: registry.nlark.com/vue-template-compiler/2.6.14
       webpack: registry.nlark.com/webpack/4.46.0
     dev: true
 
   registry.nlark.com/vue-loader/16.3.0:
-    resolution: {integrity: sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=, registry: http://registry.npm.taobao.org/, tarball: https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz}
+    resolution: {integrity: sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz}
     name: vue-loader
     version: 16.3.0
     dependencies:
@@ -11896,6 +11941,10 @@ packages:
       envinfo: 7.8.1
       opencollective-postinstall: 2.0.3
       update-notifier: 4.1.3
+    transitivePeerDependencies:
+      - supports-color
+      - webpack-cli
+      - webpack-command
     dev: true
 
   registry.nlark.com/vuex/3.6.2_vue@2.6.14:
@@ -11983,7 +12032,7 @@ packages:
       del: 4.1.1
       express: 4.17.1
       html-entities: 1.4.0
-      http-proxy-middleware: registry.nlark.com/http-proxy-middleware/0.19.1
+      http-proxy-middleware: registry.nlark.com/http-proxy-middleware/0.19.1_debug@4.3.2
       import-local: 2.0.0
       internal-ip: 4.3.0
       ip: 1.1.5

src/api/index.js

@@ -35,5 +35,5 @@ export const getStaticDataApi = async (data) => {
 };
 
 export function getStaticDataByTwoParamsApi(paramModule, paramCode) {
-    return getStaticDataApi({ paramModule, paramCode });
+    return () => getStaticDataApi({ paramModule, paramCode });
 }

src/components/MySelect/url_select.vue

@@ -2,7 +2,7 @@
     <a-select
         style="width: 100%"
         :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-        placeholder="Please select"
+        :placeholder="$t('select.placeholder')"
         allow-clear
         :options="options"
         v-on="$listeners"

src/components/table/table.vue

 <template>
-    <div :style="`min-width: ${width}px`" class="tw-overflow-x-auto">
-        <my-card v-if="$scopedSlots.search" class="tw-mb-2.5">
+    <div :style="`min-width: ${width}px;`" class="tw-overflow-x-auto">
+        <my-card v-if="$scopedSlots.search" :class="{ 'tw-mb-2.5': !noMargin }">
             <div class="tw-flex">
                 <slot name="search" :query="queryForm" />
             </div>
@@ -21,7 +21,7 @@
             </div>
         </my-card>
 
-        <my-card :class="noPadding ? 'tw-p-0' : ''">
+        <my-card :class="noPadding ? 'tw-p-0' : ''" :style="tableCardStyle">
             <a-space class="tw-mb-2">
                 <a-button type="primary" v-if="newBtn" @click="addBtnClick">
                     {{ newBtn.text || '新增' }}
@@ -45,8 +45,6 @@
                     :title="newButtons.title"
                     v-if="this.newButtons"
                     v-bind="this.newButtons.options"
-                    fixed="right"
-                    width="180"
                 >
                     <template #default="row">
                         <my-ac-btn :row="row" :buttons="newButtons.data" />
@@ -107,6 +105,7 @@ export default {
             type: Object,
             default: () => ({}),
         },
+        noMargin: Boolean,
         otherQuery: {
             type: Object,
             default: () => ({}),
@@ -182,6 +181,13 @@ export default {
                 },
             };
         },
+        tableCardStyle() {
+            return this.noMargin
+                ? {
+                      paddingTop: 0,
+                  }
+                : {};
+        },
     },
 
     methods: {

src/local/index.js

+import selectLang from './select';
+
+const zh_CN = {};
+const en_US = {};
+
+function formatLang(langObject) {
+    for (const key in langObject) {
+        const element = langObject[key];
+        zh_CN[key] = element[0];
+        en_US[key] = element[1];
+    }
+}
+
+formatLang(selectLang);
+
+export { en_US, zh_CN };

src/local/select.js

+// 0 中文， 1 英文
+export default {
+    'select.placeholder': ['请选择', 'Please Select'],
+};

src/main.js

@@ -12,6 +12,7 @@ import { loadGuards, setAppOptions } from './utils/routerUtil';
 import guards from './router/guards';
 import { loadResponseInterceptor } from './utils/requestUtil';
 import langUtils from '@/utils/langUtils';
+import { en_US, zh_CN } from '@/local';
 
 import 'tailwindcss/tailwind.css';
 import 'animate.css/source/animate.css';
@@ -43,6 +44,7 @@ const i18n = new VueI18n({
     locale: localeLang,
     fallbackLocale: langUtils.fallbackLocale,
     silentFallbackWarn: true,
+    messages: { zh_CN, en_US },
 });
 
 //装载antd控件
@@ -67,5 +69,5 @@ new Vue({
     router,
     store,
     i18n,
-    render: h => h(App),
+    render: (h) => h(App),
 }).$mount('#app');

src/pages/ranger/basic/line/Assemble/index.vue

@@ -6,10 +6,12 @@
             :formatData="formatData"
             addBtn
             ref="assembleTable"
-            :scroll="{ x: true }"
+            :scroll="scroll"
             :otherQuery="getDefaultQuery()"
             @expand="expand"
             :buttons="buttons"
+            noPadding
+            :width="400"
         >
             <template #drawer="drawer">
                 <Add v-bind="drawer" :data="row" />
@@ -56,7 +58,11 @@ export default {
     props: { hidden: Function, row: Object },
     data() {
         return {
-            buttons: [
+            scroll: { x: 1300, y: 600 },
+            buttons: {
+                options: { width: 200, fixed: 'right' },
+                title: '操作',
+                data: [
                     { label: '新增', click: () => {} },
                     { label: '失效', click: () => {} },
                     { label: '生效', click: () => {} },
@@ -68,6 +74,7 @@ export default {
                         after: this.refresh,
                     },
                 ],
+            },
         };
     },
     mounted() {},

src/pages/ranger/basic/line/index.vue

@@ -6,7 +6,7 @@
         addBtn
         :buttons="buttons"
         ref="table"
-        :scroll="{ x: true }"
+        :scroll="scroll"
     >
         <template #search="{ query }">
             <MoreItem label="状态">
@@ -78,7 +78,7 @@
                 <span v-if="row.routeState === 'INVALID'">无效</span>
             </template>
         </a-table-column>
-        <a-table-column title="修改人" data-index="editorName" />
+        <a-table-column title="修改人" data-index="editorName" width="200" />
         <a-table-column title="修改时间" data-index="editTime" />
         <template #other>
             <ImportFlie ref="importFlie" :afterSubmit="rest" />
@@ -102,7 +102,10 @@ export default {
     components: { Table, UrlSelect, MoreItem, AddAndEdit, ImportFlie, Schedule, Personnel, Assemble },
     data() {
         return {
-            buttons: [
+            buttons: {
+                title: '操作',
+                options: { width: 200, fixed: 'right' },
+                data: [
                     { label: '编辑', click: this.edit },
                     { label: '详情', click: this.view },
                     { label: '编排', click: this.assemble },
@@ -114,7 +117,9 @@ export default {
                         after: this.refresh,
                     },
                 ],
+            },
             selected: {},
+            scroll: { x: 1500 },
         };
     },
     methods: {

src/pages/ranger/report/trend/index.vue

+<template>
+    <my-card class="tw-flex">
+        <div class="tw-mr-2.5" :class="$style.container" style="flex-basis: 500px">
+            <Table
+                url="/ranger/inspection/api/v1/items"
+                rowKey="itemId"
+                :width="700"
+                :buttons="buttons"
+                noMargin
+            >
+                <template #search="{ query }">
+                    <MoreItem label="地区">
+                        <UrlSelect
+                            url="/ranger/inspection/api/v1/region/list"
+                            v-model="query.regionId"
+                            labelFiled="regionName"
+                            valueFiled="regionId"
+                        />
+                    </MoreItem>
+                    <MoreItem label="指标名称">
+                        <a-input v-model="query.itemName" />
+                    </MoreItem>
+                </template>
+                <a-table-column title="巡检指标" data-index="itemName" />
+                <a-table-column title="单元" data-index="unitName" />
+            </Table>
+        </div>
+        <div :class="$style.container" class="tw-flex-1 tw-h-10"></div>
+    </my-card>
+</template>
+
+<script>
+import Table from '@/components/table/table.vue';
+import MoreItem from '@/components/table/more_item.vue';
+import UrlSelect from '@/components/MySelect/url_select.vue';
+
+export default {
+    components: { Table, MoreItem, UrlSelect },
+    data() {
+        return {
+            buttons: [
+                {
+                    label: '添加',
+                    click: this.addToChart,
+                    isHidden(row) {
+                        return row.__isHidden__;
+                    },
+                },
+            ],
+        };
+    },
+    methods: {
+        addToChart(row) {
+            console.log(row);
+            this.$set(row, '__isHidden__', true);
+        },
+    },
+};
+</script>
+
+<style module>
+.container {
+    @apply tw-border tw-border-gray-300 tw-border-solid tw-rounded;
+}
+</style>

src/pages/ranger/task_managment/center/detail.vue

@@ -142,7 +142,7 @@ export default {
                 title: '备注 & 附件',
                 options: {
                     fixed: 'right',
-                    width: 150,
+                    width: 100,
                 },
                 data: [
                     {
@@ -166,7 +166,6 @@ export default {
     },
     methods: {
         viewDetail(row) {
-            console.log(row);
             this.$refs.table.show({ row, title: '备注 & 附件' });
         },
     },

src/router/config.js

@@ -81,13 +81,11 @@ const hasAuthorityRoutes = [
                                 component: () => import('@/pages/ranger/basic/unit'),
                             },
                             {
-
                                 path: 'major',
                                 name: '专业配置',
                                 component: () => import('@/pages/ranger/basic/major'),
                             },
                             {
-
                                 path: 'item',
                                 name: '项目配置',
                                 component: () => import('@/pages/ranger/basic/item'),
@@ -121,6 +119,11 @@ const hasAuthorityRoutes = [
                         name: '报表中心',
                         component: RouterView,
                         children: [
+                            {
+                                path: 'trend-analysis',
+                                name: '趋势对比',
+                                component: () => import('@/pages/ranger/report/trend/index.vue'),
+                            },
                             {
                                 path: 'week',
                                 name: '巡检周报',