浏览代码

feat: 修改保存

gemercheung 10 月之前
父节点
当前提交
7c97ef1d4e
共有 4 个文件被更改,包括 118 次插入6 次删除
  1. 1 1
      package.json
  2. 15 0
      pnpm-lock.yaml
  3. 13 5
      src/app/criminal/view/example/edit.vue
  4. 89 0
      src/app/criminal/view/example/getGeo.ts

+ 1 - 1
package.json

@@ -15,11 +15,11 @@
     "@types/qs": "^6.9.7",
     "axios": "^1.4.0",
     "echarts": "^5.5.1",
-    "element-china-area-data": "^6.1.0",
     "element-plus": "^2.3.8",
     "js-base64": "^3.7.5",
     "mime": "^3.0.0",
     "mitt": "^3.0.1",
+    "province-city-china": "^8.5.8",
     "qs": "^6.11.2",
     "sass": "^1.64.2",
     "unplugin-element-plus": "^0.7.2",

+ 15 - 0
pnpm-lock.yaml

@@ -38,6 +38,9 @@ importers:
       mitt:
         specifier: ^3.0.1
         version: 3.0.1
+      province-city-china:
+        specifier: ^8.5.8
+        version: 8.5.8
       qs:
         specifier: ^6.11.2
         version: 6.13.0
@@ -251,6 +254,9 @@ packages:
   '@jridgewell/sourcemap-codec@1.5.0':
     resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
 
+  '@province-city-china/types@8.5.8':
+    resolution: {integrity: sha512-KZ3NyM8HsaBVcn5BRhWaOeZRhqEvm18PfB6HfRDuZfwwWhJLoTxB81mTENrBlONr2g8fy/fSbjsh44gvOj+/Lw==}
+
   '@rollup/pluginutils@5.1.2':
     resolution: {integrity: sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==}
     engines: {node: '>=14.0.0'}
@@ -596,6 +602,9 @@ packages:
     resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
     engines: {node: ^10 || ^12 || >=14}
 
+  province-city-china@8.5.8:
+    resolution: {integrity: sha512-gUV5kSOWHVufemkq6lygb0ngNZ4snMcONmr3QzxHuj1MYOQPphiyjHplfmywcVGWdGQgim30RXia/mYB007eLg==}
+
   proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
@@ -842,6 +851,8 @@ snapshots:
 
   '@jridgewell/sourcemap-codec@1.5.0': {}
 
+  '@province-city-china/types@8.5.8': {}
+
   '@rollup/pluginutils@5.1.2(rollup@3.29.5)':
     dependencies:
       '@types/estree': 1.0.6
@@ -1240,6 +1251,10 @@ snapshots:
       picocolors: 1.1.0
       source-map-js: 1.2.1
 
+  province-city-china@8.5.8:
+    dependencies:
+      '@province-city-china/types': 8.5.8
+
   proxy-from-env@1.1.0: {}
 
   qs@6.13.0:

+ 13 - 5
src/app/criminal/view/example/edit.vue

@@ -25,7 +25,7 @@
       <el-select
         v-model="bindExample.caseCategory"
         placeholder="请输入案件类别"
-        style="width: 60%"
+        style="width: 40%"
       >
         <el-option v-for="item in criminalType" :label="item" :value="item" />
       </el-select>
@@ -39,8 +39,9 @@
       /> -->
       <el-cascader
         size="large"
-        style="width: 60%"
-        :options="(pcaTextArr as any as CascaderOption[])"
+        style="width: 100%"
+        :props="selectSetting"
+        :options="(geoData as any as CascaderOption[])"
         v-model="bindExample.caseRegion"
       ></el-cascader>
     </el-form-item>
@@ -97,13 +98,20 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import { Example, setExample, addExample } from "@/app/criminal/store/example";
-import { ElMessage, CascaderOption } from "element-plus";
+import { ElMessage, CascaderOption, CascaderProps } from "element-plus";
 import { QuiskExpose } from "@/helper/mount";
 import { Search } from "@element-plus/icons-vue";
 import { selectMapImage } from "@/view/case/quisk";
-import { pcaTextArr } from "element-china-area-data";
+// import geoData from "province-city-china/dist/level.json";
+import { geoData } from "./getGeo";
 import { criminalType } from "./criminalType";
 
+console.log("geoData", geoData);
+const selectSetting = ref<CascaderProps>({
+  value: "name",
+  label: "name",
+});
+
 interface CriminalExample extends Example {
   caseNum: string; //案件编号
   caseCategory: string; //案件类别

+ 89 - 0
src/app/criminal/view/example/getGeo.ts

@@ -0,0 +1,89 @@
+
+
+import data from "province-city-china/dist/level.json";
+
+const tw = {
+    name: "台湾省",
+    province: "71",
+    code: "710000",
+    children: [
+        {
+            code: '710101', name: '台北市', province: '71', city: '01', children: [
+                { code: '710101', name: '内湖区', province: '71', city: '01', area: '01' },
+                { code: '710102', name: '南港区', province: '71', city: '01', area: '02' },
+                { code: '710103', name: '中正区', province: '71', city: '01', area: '03' },
+                { code: '710104', name: '万华区', province: '71', city: '01', area: '04' },
+                { code: '710105', name: '大同区', province: '71', city: '01', area: '05' },
+                { code: '710106', name: '中山区', province: '71', city: '01', area: '06' },
+                { code: '710107', name: '松山区', province: '71', city: '01', area: '07' },
+                { code: '710108', name: '大安区', province: '71', city: '01', area: '08' },
+                { code: '710109', name: '信义区', province: '71', city: '01', area: '09' },
+                { code: '710110', name: '文山区', province: '71', city: '01', area: '10' },
+                { code: '710111', name: '士林区', province: '71', city: '01', area: '11' },
+                { code: '710112', name: '北投区', province: '71', city: '01', area: '12' }
+            ],
+
+        },
+        {
+            code: '710102', name: '高雄市', province: '71', city: '02', children: [],
+        },
+        {
+            code: '710103', name: '台南市', province: '71', city: '03', children: [],
+        },
+        {
+            code: '710104', name: '台中市', province: '71', city: '04', children: [],
+        },
+        {
+            code: '710105', name: '桃园市', province: '71', city: '05', children: [],
+        },
+        {
+            code: '710106', name: '金门县', province: '71', city: '06', children: [],
+        },
+        {
+            code: '710107', name: '南投县', province: '71', city: '07', children: [],
+        },
+
+        {
+            code: '710108', name: '宜兰县', province: '71', city: '08', children: [],
+        },
+        {
+            code: '710109', name: '基隆市', province: '71', city: '09', children: [],
+        },
+        {
+            code: '710110', name: '新竹县', province: '71', city: '10', children: [],
+        },
+        {
+            code: '710111', name: '澎湖县', province: '71', city: '11', children: [],
+        },
+        {
+            code: '710112', name: '苗栗县', province: '71', city: '12', children: [],
+        },
+        {
+            code: '710113', name: '彰化县', province: '71', city: '13', children: [],
+        },
+        {
+            code: '710114', name: '嘉义市', province: '71', city: '14', children: [],
+        },
+        {
+            code: '710115', name: '云林县', province: '71', city: '15', children: [],
+        },
+        {
+            code: '710116', name: '屏东县', province: '71', city: '16', children: [],
+        },
+        {
+            code: '710117', name: '台东县', province: '71', city: '17', children: [],
+        },
+        {
+            code: '710118', name: '花莲县', province: '71', city: '18', children: [],
+        },
+    ],
+}
+const geoData = data.map(c => {
+    if (c.code === '710000') {
+        c = tw
+    }
+    return c
+})
+
+console.log('geoData-1', geoData)
+export { geoData }