Merge branch 'dev_bugfix_ljj' into yantai_master

package.json

@@ -16,9 +16,9 @@
     "et:list": "gulp themes"
   },
   "dependencies": {
-    "@antv/l7": "^2.9.14",
-    "@antv/l7-draw": "^3.0.5",
-    "@antv/l7-maps": "^2.9.14",
+    "@antv/l7": "2.9.14",
+    "@antv/l7-draw": "3.0.5",
+    "@antv/l7-maps": "2.9.14",
     "@riophae/vue-treeselect": "^0.4.0",
     "@tinymce/tinymce-vue": "^3.2.8",
     "async-validator": "^4.2.5",

src/views/modules/base/epidemic/natFocus/nfVisiteList.vue

@@ -131,7 +131,7 @@ export default {
       formData: {
         visitTime: '',//随访时间
         content: '',//内容
-        realIdCard: '',
+        idCard: '',
         name: '',
         mobile: '',
         origin: ''
@@ -150,7 +150,7 @@ export default {
 
     async initTable (row, origin) {
 
-      this.formData.realIdCard = row.realIdCard
+      this.formData.idCard = row.realIdCard
       this.formData.name = row.name
       this.formData.mobile = row.mobile
       this.formData.origin = origin
@@ -167,7 +167,7 @@ export default {
       // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/followup/page'
       let params = {
         name: this.formData.name,
-        idCard: this.formData.realIdCard,
+        idCard: this.formData.idCard,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         origin: this.formData.origin
@@ -225,7 +225,7 @@ export default {
 
       const url = "/epmetuser/followup/export"
       let params = {
-        idCard: this.formData.realIdCard,
+        idCard: this.formData.idCard,
         name: this.formData.name,
         origin: this.formData.origin
       }

src/views/modules/visual/command/cpts/map.vue

@@ -444,8 +444,8 @@ export default {
         .size(12)
         .style({
           offsets: [0, 8], // 文本相对锚点的偏移量 [水平, 垂直]
-          // rotation: 60,
-          layerType: "fillImage",
+          rotation: 0,
+          // layerType: "fillImage",
         });
       scene.addLayer(posLayer);
 
@@ -516,7 +516,7 @@ export default {
 
     iniMapDot(scene) {
       const { darkStyle, lightStyle, dotIcoList, dotData } = this;
-      console.log('--------------------------图标', dotIcoList)
+      console.log("--------------------------图标", dotIcoList);
       Object.keys(dotIcoList).forEach((k) => {
         scene.addImage(k, dotIcoList[k]);
       });
@@ -538,11 +538,12 @@ export default {
       })
         .source(dotData)
         .shape("categoryKey", (k) => k)
-        .size(10)
         .style({
           offsets: [0, 0],
+          rotation: 0,
           layerType: "fillImage",
-        });
+        })
+        .size(10);
 
       scene.addLayer(dotBgLayer);
       scene.addLayer(dotLayer);
@@ -573,11 +574,12 @@ export default {
       })
         .source(dotData)
         .shape("categoryKey", (k) => k + "2")
-        .size(30)
         .style({
           offsets: [0, 0],
+          rotation: 0,
           layerType: "fillImage",
-        });
+        })
+        .size(30);
       scene.addLayer(dotLayer2);
 
       dotLayer2.on("click", (e) => {

src/views/modules/visual/cpts/map/index.vue

@@ -408,7 +408,7 @@ export default {
         .style({
           offsets: [0, 8], // 文本相对锚点的偏移量 [水平, 垂直]
           // rotation: 60,
-          layerType: "fillImage",
+          // layerType: "fillImage",
         });
       scene.addLayer(posLayer);