Merge branch 'feature/3.x-analysis' of http://192.168.0.115:3000/zhangyupeng/zfb_mp into feature/3.x-analysis

package.json

@@ -35,6 +35,7 @@
     "@iconify/iconify": "^2.2.1",
     "@logicflow/core": "^0.7.16",
     "@logicflow/extension": "^0.7.16",
+    "@pansy/china-division": "^2.0.0",
     "@vue/runtime-core": "^3.2.39",
     "@vue/shared": "^3.2.39",
     "@vueuse/core": "^7.7.1",

pnpm-lock.yaml

@@ -14,6 +14,7 @@ specifiers:
   '@iconify/json': ^2.1.109
   '@logicflow/core': ^0.7.16
   '@logicflow/extension': ^0.7.16
+  '@pansy/china-division': ^2.0.0
   '@purge-icons/generated': ^0.7.0
   '@types/codemirror': ^5.60.5
   '@types/crypto-js': ^4.1.1
@@ -127,6 +128,7 @@ dependencies:
   '@iconify/iconify': 2.2.1
   '@logicflow/core': 0.7.16
   '@logicflow/extension': 0.7.16
+  '@pansy/china-division': 2.0.0
   '@vue/runtime-core': 3.2.39
   '@vue/shared': 3.2.39
   '@vueuse/core': 7.7.1_vue@3.2.39
@@ -213,23 +215,23 @@ devDependencies:
   postcss-less: 5.0.0
   prettier: 2.7.1
   rimraf: 3.0.2
-  rollup-plugin-visualizer: 5.8.1_rollup@2.79.0
+  rollup-plugin-visualizer: 5.8.1
   stylelint: 14.12.0
   stylelint-config-html: 1.1.0_zfebnb5lvglv4r4cxzjwsgstda
   stylelint-config-prettier: 9.0.3_stylelint@14.12.0
   stylelint-config-recommended: 6.0.0_stylelint@14.12.0
   stylelint-config-standard: 24.0.0_stylelint@14.12.0
   stylelint-order: 5.0.0_stylelint@14.12.0
-  ts-jest: 27.1.5_522i2llw4km6zbjuqjwpbi4za4
+  ts-jest: 27.1.5_qqheuyrmnawe7ws7n63adpwbnu
   ts-node: 10.9.1_rb7lfb2dlgdf5f7m6mcvvespxa
   typescript: 4.8.3
   vite: 2.9.15_less@4.1.3
   vite-plugin-compression: 0.4.0_vite@2.9.15
   vite-plugin-html: 2.1.2_vite@2.9.15
   vite-plugin-imagemin: 0.5.3_vite@2.9.15
-  vite-plugin-mock: 2.9.6_svyre2rajepoanuwz3sihbtzba
+  vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@2.9.15
   vite-plugin-purge-icons: 0.7.0_vite@2.9.15
-  vite-plugin-pwa: 0.11.13_mzzo5qdcantp6obyzixnpsysz4
+  vite-plugin-pwa: 0.11.13_vite@2.9.15
   vite-plugin-rewrite-all: 0.1.2_vite@2.9.15
   vite-plugin-style-import: 1.4.1_vite@2.9.15
   vite-plugin-svg-icons: 1.1.0_vite@2.9.15
@@ -1580,7 +1582,7 @@ packages:
       '@types/node': 17.0.45
       chalk: 4.1.2
       cosmiconfig: 7.0.1
-      cosmiconfig-typescript-loader: 2.0.2_n2mghxxmttyhwwiumrxhzs77qa
+      cosmiconfig-typescript-loader: 2.0.2_rb7lfb2dlgdf5f7m6mcvvespxa
       lodash: 4.17.21
       resolve-from: 5.0.0
       typescript: 4.8.3
@@ -2169,6 +2171,11 @@ packages:
       fastq: 1.13.0
     dev: true
 
+  /@pansy/china-division/2.0.0:
+    resolution: {integrity: sha512-CYaywhQni39wzpoVGDzgOal/nRdBApSHxcP4oOPVfCWatorVGjjPf37Ch/+bjZCKhKqNX1njY0MT7qLYSQs/Aw==}
+    engines: {node: '>=8.9.0'}
+    dev: false
+
   /@purge-icons/core/0.7.0:
     resolution: {integrity: sha512-PaCeTFjkQUX+MzBsNg3L8x5aCZqXwaUSNw1FY3Jn7wlLqNqxRNoShw5P//a1DQAy7hLlUHvEL6IGeDoN/xf98A==}
     dependencies:
@@ -2220,19 +2227,18 @@ packages:
       rollup: 2.79.0
     dev: true
 
-  /@rollup/plugin-node-resolve/13.3.0_rollup@2.79.0:
+  /@rollup/plugin-node-resolve/13.3.0:
     resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       rollup: ^2.42.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.79.0
+      '@rollup/pluginutils': 3.1.0
       '@types/resolve': 1.17.1
       deepmerge: 4.2.2
       is-builtin-module: 3.2.0
       is-module: 1.0.0
       resolve: 1.22.1
-      rollup: 2.79.0
     dev: true
 
   /@rollup/plugin-replace/2.4.2_rollup@2.79.0:
@@ -2245,6 +2251,17 @@ packages:
       rollup: 2.79.0
     dev: true
 
+  /@rollup/pluginutils/3.1.0:
+    resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0
+    dependencies:
+      '@types/estree': 0.0.39
+      estree-walker: 1.0.1
+      picomatch: 2.3.1
+    dev: true
+
   /@rollup/pluginutils/3.1.0_rollup@2.79.0:
     resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
     engines: {node: '>= 8.0.0'}
@@ -4409,12 +4426,11 @@ packages:
       vary: 1.1.2
     dev: true
 
-  /cosmiconfig-typescript-loader/2.0.2_n2mghxxmttyhwwiumrxhzs77qa:
+  /cosmiconfig-typescript-loader/2.0.2_rb7lfb2dlgdf5f7m6mcvvespxa:
     resolution: {integrity: sha512-KmE+bMjWMXJbkWCeY4FJX/npHuZPNr9XF9q9CIQ/bpFwi1qHfCmSiKarrCcRa0LO4fWjk93pVoeRtJAkTGcYNw==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@types/node': '*'
-      cosmiconfig: '>=7'
       typescript: '>=3'
     dependencies:
       '@types/node': 17.0.45
@@ -10375,7 +10391,7 @@ packages:
       terser: 5.15.0
     dev: true
 
-  /rollup-plugin-visualizer/5.8.1_rollup@2.79.0:
+  /rollup-plugin-visualizer/5.8.1:
     resolution: {integrity: sha512-NBT/xN/LWCwDM2/j5vYmjzpEAKHyclo/8Cv8AfTCwgADAG+tLJDy1vzxMw6NO0dSDjmTeRELD9UU3FwknLv0GQ==}
     engines: {node: '>=14'}
     hasBin: true
@@ -10387,7 +10403,6 @@ packages:
     dependencies:
       nanoid: 3.3.4
       open: 8.4.0
-      rollup: 2.79.0
       source-map: 0.7.4
       yargs: 17.5.1
     dev: true
@@ -11462,7 +11477,7 @@ packages:
       escape-string-regexp: 1.0.5
     dev: true
 
-  /ts-jest/27.1.5_522i2llw4km6zbjuqjwpbi4za4:
+  /ts-jest/27.1.5_qqheuyrmnawe7ws7n63adpwbnu:
     resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     hasBin: true
@@ -11483,10 +11498,8 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.19.1
       '@types/jest': 27.5.2
       bs-logger: 0.2.6
-      esbuild: 0.15.8
       fast-json-stable-stringify: 2.1.0
       jest: 27.5.1_ts-node@10.9.1
       jest-util: 27.5.1
@@ -11931,14 +11944,14 @@ packages:
       - supports-color
     dev: true
 
-  /vite-plugin-mock/2.9.6_svyre2rajepoanuwz3sihbtzba:
+  /vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.9.15:
     resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       mockjs: '>=1.1.0'
       vite: '>=2.0.0'
     dependencies:
-      '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.0
+      '@rollup/plugin-node-resolve': 13.3.0
       '@types/mockjs': 1.0.6
       chalk: 4.1.2
       chokidar: 3.5.3
@@ -11969,12 +11982,10 @@ packages:
       - supports-color
     dev: true
 
-  /vite-plugin-pwa/0.11.13_mzzo5qdcantp6obyzixnpsysz4:
+  /vite-plugin-pwa/0.11.13_vite@2.9.15:
     resolution: {integrity: sha512-Ssj14m3TRVLfkFEAWSMcFE2d1cSdEZyrVTzfY2lSL+umHYvcIFHVDAY143sygtBCb44OPczsAOmWwBTxwOvh7g==}
     peerDependencies:
       vite: ^2.0.0
-      workbox-build: ^6.4.0
-      workbox-window: ^6.4.0
     dependencies:
       debug: 4.3.4
       fast-glob: 3.2.12
@@ -11984,6 +11995,7 @@ packages:
       workbox-build: 6.5.4
       workbox-window: 6.5.4
     transitivePeerDependencies:
+      - '@types/babel__core'
       - supports-color
     dev: true
 

src/components/Form/src/components/ApiCascader.vue

@@ -131,6 +131,28 @@
         }
       }
 
+      const deepSearch = (
+        data: Option[],
+        value: string,
+        key = 'title',
+        sub = 'children',
+        tempObj = {} as any,
+      ) => {
+        if (value && data) {
+          data.find((node) => {
+            if (node[key] == value) {
+              tempObj.found = node;
+              return node;
+            }
+            return deepSearch(node[sub], value, key, sub, tempObj);
+          });
+          if (tempObj.found) {
+            return tempObj.found;
+          }
+        }
+        return false;
+      };
+
       async function loadData(selectedOptions: Option[]) {
         const targetOption = selectedOptions[selectedOptions.length - 1];
         targetOption.loading = true;
@@ -143,7 +165,9 @@
           });
           if (Array.isArray(res)) {
             const children = generatorOptions(res);
-            targetOption.children = children;
+            const targetChildren = deepSearch(children, targetOption.value, 'value');
+            // console.log('targetChildren', targetChildren.children);
+            targetOption.children = targetChildren.children;
             return;
           }
           if (props.resultField) {

src/views/dashboard/analysis/index.vue

@@ -172,7 +172,7 @@
               const days = Math.abs(value[1].diff(value[0], 'days'));
               console.log('days', days);
               if (days > 30) {
-                return Promise.reject('请选择小于30天以下');
+                return Promise.reject('选择时间段应小于30天');
               }
               if (days < 1) {
                 return Promise.reject('至少选择2天以上');

src/views/scenes/liveDrawer.vue

@@ -76,6 +76,15 @@
   import { staffListApi } from '/@/api/staff/list';
   import { SceneLiveItem } from '/@/api/scene/model';
   import { isBoolean } from '/@/utils/is';
+  // import cascaderOptions, { DivisionUtil } from '@pansy/china-division';
+
+  // const divisionUtil = new DivisionUtil(cascaderOptions);
+  // let ProvincesData = divisionUtil.getProvinces();
+  // ProvincesData.map((n) => {
+  //   const cities = divisionUtil.getChildrenByCode(n.value);
+  //   n.children = cities;
+  // });
+  // console.log('ProvincesData', ProvincesData);
   const A_MAP_URL = 'https://webapi.amap.com/maps?v=2.0&key=e661b00bdf2c44cccf71ef6070ef41b8';
 
   // const A_MAP_URL = 'https://webapi.amap.com/maps?v=2.0&key=5a2d384532ae531bf99bd8487c4f03d2';
@@ -256,6 +265,7 @@
           },
           componentProps: {
             api: () => {
+              // return ProvincesData;
               return CascaderData;
             },
             apiParamKey: 'provinceCode',