工程现场 大屏界面修改

src/views/pad/engineering/currentArea.vue

@@ -186,7 +186,7 @@ export default {
   beforeDestroy() {
     clearTimeout(this.scrollTimeout);
   },
-  mounted() {this.startAutoScroll()},
+  mounted() {},
   methods: {
     startAutoScroll() {
       const scrollContainer = this.$refs.scrollContainer;
@@ -209,6 +209,9 @@ export default {
           this.getProList.forEach((item, index) => {
             item.name = item.createTime;
             item.num = item.title;
+            if (this.getProList.length > 6){
+              this.startAutoScroll()
+            }
           });
         }
       });

src/views/pad/map/map.vue

@@ -726,6 +726,7 @@ export default {
                 coordinate.push(it.ordinate)
                 obj.coordinate = coordinate
                 obj.name = it.projectName
+                obj.appOrg = it.appOrg
                 this.projectList.push(obj)
               }
               this.sign = 1

src/views/screen/engineering/currentArea.vue

@@ -186,7 +186,7 @@ export default {
   beforeDestroy() {
     clearTimeout(this.scrollTimeout);
   },
-  mounted() {this.startAutoScroll()},
+  mounted() {},
   methods: {
     startAutoScroll() {
       const scrollContainer = this.$refs.scrollContainer;
@@ -210,6 +210,9 @@ export default {
             item.name = item.createTime;
             item.num = item.title;
           });
+          if (this.getProList.length > 6){
+            this.startAutoScroll()
+          }
         }
       });
     },

src/views/screen/map/map.vue

@@ -489,6 +489,7 @@ export default {
                   coordinate.push(it.ordinate)
                   obj.coordinate = coordinate
                   obj.name = it.projectName
+                  obj.appOrg = it.appOrg
                   this.projectList.push(obj)
                 }
                 this.sign = 1
@@ -574,15 +575,28 @@ export default {
             type: "scatter", // 散点图（用于标注特殊位置）
             coordinateSystem: "geo", // 使用 `geo` 作为坐标系
             symbol: 'circle', // 自定义标记
-            symbolSize: 10, // 标记的大小
+            symbolSize: 15, // 标记的大小
             itemStyle: {
-              color: 'yellow'
+              color: 'red'
             },
-            data: this.projectList.map(({ name, coordinate }) => ({
+            data: this.projectList.filter(({ appOrg }) => appOrg === this.appOrg).map(({ name, coordinate }) => ({
               name, // 点名称
               value: coordinate // 经纬度坐标
             })),
           },
+          {
+            type: "scatter", // 散点图（用于标注特殊位置）
+            coordinateSystem: "geo", // 使用 `geo` 作为坐标系
+            symbol: 'circle', // 自定义标记
+            symbolSize: 15, // 标记的大小
+            itemStyle: {
+              color: 'yellow'
+            },
+            data: this.projectList.filter(({ appOrg }) => appOrg !== this.appOrg).map(({ name, coordinate }) => ({
+              name, // 点名称
+              value: coordinate // 经纬度坐标
+            })),
+          }
         ]
       };
       echarts.registerMap("child", this.dataSource[cityName])
@@ -726,6 +740,7 @@ export default {
                 coordinate.push(it.ordinate)
                 obj.coordinate = coordinate
                 obj.name = it.projectName
+                obj.appOrg = it.appOrg
                 this.projectList.push(obj)
               }
               this.sign = 1