up

src/views/component/imports.vue

@@ -110,10 +110,12 @@ export default {
       // tab:1,2 1是新增，2是台账
       let paths = this.$route.path;
       let isBook = paths.split("_")[0]
+      let year = new Date().getFullYear()
       console.log(isBook)
       if(isBook=='/book'){
         for(var k of this.tableList){
           k.isBook = true
+          k.year = k.year?k.year:year
         }
       }
       // return

src/views/jsc/components/echartsMap.vue

@@ -24,13 +24,16 @@
         hookToolTip: {},
         streetlist:[],
         streetNameList:[{
-          name:'开发区',
+          name:'东城街道',
-          coord:[119.59,31.77]
+          coord:[119.62,31.74]
         },{
           name:'指前镇',
           coord:[119.45,31.62]
         },{
-          name:'尧塘镇',
+          name:'尧塘街道',
+          coord:[119.59,31.77]
+        },{
+          name:'西城街道',
           coord:[119.62,31.69]
         },{
           name:'儒林镇',
@@ -161,7 +164,7 @@
             regions: [
               //对不同的区块进行着色
               {
-                name: "开发区",
+                name: "东城街道",
                 itemStyle: {
                   normal: {
                     areaColor: "#75bedc",
@@ -171,6 +174,17 @@
                   },
                 },
               },
+              {
+                name: "尧塘街道",
+                itemStyle: {
+                  normal: {
+                    areaColor:'#00ffff',
+                  },
+                  emphasis: {
+                    areaColor:'#00ffff',
+                  },
+                },
+              },
               {
                 name: "指前镇",
                 itemStyle: {
@@ -236,18 +250,7 @@
                     areaColor:'#c968e1',
                   },
                 },
-              },
+              }
-              {
-                name: "尧塘镇",
-                itemStyle: {
-                  normal: {
-                    areaColor:'#00ffff',
-                  },
-                  emphasis: {
-                    areaColor:'#00ffff',
-                  },
-                },
-              },
 
             ]
           },

src/views/jsc/components/jtmap.json

@@ -7,11 +7,12 @@
       "name": "urn:ogc:def:crs:OGC:1.3:CRS84"
     }
   },
-  "features": [{
+  "features": [
+    {
         "type": "Feature",
         "properties": {
-        "id": "8969",
+          "id": "8968",
-        "name": "开发区",
+          "name": "尧塘街道",
           "site": "www.poi86.com"
         },
         "geometry": {
@@ -346,7 +347,24 @@
                 [119.667475, 31.775051],
                 [119.667785, 31.775061],
                 [119.667795, 31.774951],
-              [119.667965, 31.774961],
+                [119.667965, 31.774961]
+              ]
+            ]
+          ]
+        }
+      },{
+      "type": "Feature",
+      "properties": {
+        "id": "8969",
+        "name": "东城街道",
+        "site": "www.poi86.com"
+      },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              
               [119.667945, 31.775491],
               [119.668555, 31.775491],
               [119.668585, 31.775211],

src/views/viewrecords/components/addViewRecord.vue

@@ -583,6 +583,7 @@
           viewtime: "",
           viewscene: "",
           viewstatus: '',
+          uploads:'',
           infotext: '',
           jiedao:res?.jiedao,
           name: res?.name,