ソースを参照

更新项目名称为四平市城市生命线

彭宇 1 ヶ月 前
コミット
4057091ab8

+ 2 - 2
.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 全域视联态势感知平台
+VUE_APP_TITLE = 四平市城市生命线
 
 # 开发环境配置
 ENV = 'development'
 
-# 全域视联态势感知平台/开发环境
+# 四平市城市生命线/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 全域视联态势感知平台
+VUE_APP_TITLE = 四平市城市生命线
 
 # 生产环境配置
 ENV = 'production'

+ 1 - 1
.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 全域视联态势感知平台
+VUE_APP_TITLE = 四平市城市生命线
 
 NODE_ENV = production
 

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.4.0",
-  "description": "全域视联态势感知平台",
+  "description": "四平市城市生命线",
   "author": "若依",
   "license": "MIT",
   "scripts": {

+ 3 - 3
src/App.vue

@@ -26,7 +26,7 @@ export default  {
   },
   mounted() {
     setTimeout(() => {
-      this.title = '全域视联态势感知平台'
+      this.title = '四平市城市生命线'
     }, 1000)
   },
 }
@@ -154,10 +154,10 @@ export default  {
 		0% {
 			transform: translateX(100px);
 		}
-	
+
 		100% {
 			transform: translateY(0);
 		}
 	}
 
-</style>
+</style>

+ 36 - 1
src/components/supermap-2.5d.vue

@@ -151,6 +151,7 @@ export default {
       pick: null,
       markerboxEntity: [], //地图落点实体
       connectBoxEntity: null, //地图线实体
+      connectBoxEntityMove: [], //地图线实体_移动
       graphicsBoxEntity: null, //地图面实体
       graphicsBoxEntityList: [], //地图面实体
       markerboxEntityRadius: [], //地图落点实体
@@ -360,7 +361,9 @@ export default {
 
 
       that.flyTo(longitude, latitude, height)
-
+      that.viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(
+        Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK
+      );
       setTimeout(() => {
         //   that.viewer.imageryLayers.addImageryProvider(new SuperMap3D.SuperMapImageryProvider({
         //     url:that.superMapRootUrl + '/map-RLyicierci-2/rest/maps/TD_all@erci'
@@ -2193,6 +2196,15 @@ export default {
         this.connectBoxEntityTwo = null
       }
     },
+    //移除之前添加的线_移动
+    clearCM() {
+      if (this.connectBoxEntityMove != null && this.connectBoxEntityMove.length > 0) {
+        for (let i = 0; i < this.connectBoxEntityMove.length; i++) {
+          this.viewer.entities.remove(this.connectBoxEntityMove[i])
+        }
+        this.connectBoxEntityMove = []
+      }
+    },
     /**
      * 地图落点-覆盖范围
      */
@@ -2456,6 +2468,29 @@ export default {
       })
     },
     /**
+     * 地图画线(贴地)_批量_图标移动
+     */
+    setConnectListsMarkerMove(connectList, color, withAlpha) {
+      let that = this
+      // 确保场景正确初始化
+      let material = SuperMap3D.Color.fromCssColorString(color).withAlpha(withAlpha);
+      that.connectBoxEntityMove.push(
+        that.viewer.entities.add({
+          Type: 'Polyline',
+          polyline: {
+            positions: new SuperMap3D.Cartesian3.fromDegreesArray(connectList),
+            // clampToGround: true, //贴地 true,不贴地  false
+            width: 10,
+            material: new SuperMap3D.PolylineDynamicMaterialProperty({
+              color: material,
+              outlineWidth: 0.2,
+              outlineColor: SuperMap3D.Color.BLACK
+            })
+          }
+        })
+      );
+    },
+    /**
      * 地图图形(贴地)
      */
     setGraphicsList(graphicsList, color, withAlpha) {

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '全域视联态势感知平台',
+      title: '四平市城市生命线',
       logo: logoImg
     }
   }

+ 3 - 3
src/views/Cockpit.vue

@@ -741,7 +741,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -759,7 +759,7 @@
 			// 初始化地图数据
 			this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
 		},
 		data() {
@@ -1354,4 +1354,4 @@
 			/* 确保三角形中心对齐链接的中心 */
 		}
 	}
-</style>
+</style>

+ 3 - 3
src/views/Cockpit2.vue

@@ -875,7 +875,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -893,7 +893,7 @@
 			// 初始化地图数据
 			this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
 			this.sjChart();
 			this.hyChart();
@@ -4196,4 +4196,4 @@
 			/* 确保三角形中心对齐链接的中心 */
 		}
 	}
-</style>
+</style>

+ 49 - 49
src/views/Database.vue

@@ -298,7 +298,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -315,7 +315,7 @@
 		mounted() {
 			// 初始化地图数据
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
 			this.sjChart01();
 			this.sjChart02();
@@ -479,7 +479,7 @@
 				let pieSource = {
 				    '铁东区': 653,
 				    '铁西区': 335,
-				    
+
 				  },
 				  legendColor = [
 				    "#3471fd",
@@ -492,7 +492,7 @@
 				    "#5fc6fc",
 				  ],
 				  richStyle = {};
-				
+
 				function initData(source) {
 				  legendColor.map((item, index) => {
 				    richStyle["style" + index] = {};
@@ -674,7 +674,7 @@
 				    color: "#ffc72b",
 				    fontSize:16 * scale,
 				    align: "center",
-				    
+
 				  },
 				  white: {
 				    color: "#fff",
@@ -1231,7 +1231,7 @@
 				      stack: "总量",
 				      symbol: "circle",
 				      symbolSize: 8,
-				
+
 				      itemStyle: {
 				        normal: {
 				          color: "#00d4c7",
@@ -1481,7 +1481,7 @@
 				      stack: "总量",
 				      symbol: "circle",
 				      symbolSize: 8,
-				
+
 				      itemStyle: {
 				        normal: {
 				          color: "#00d4c7",
@@ -1765,7 +1765,7 @@
 				    name: "室内",
 				    value: 650,
 				  },
-				
+
 				];
 				var rich = {
 				  white: {
@@ -1789,9 +1789,9 @@
 				};
 				var data = [];
 				var color = [
-				  
+
 				  "#00cfff",
-				   
+
 				  "#006ced",
 				 "#7af0aa",
 				];
@@ -1892,7 +1892,7 @@
 
 				myChart.setOption(option);
 			},
-			
+
 			//各管线类别数量统计(管道年限)
 			sjChart10() {
 				var myChart = echarts.init(document.getElementById("sjChart10"));
@@ -2101,7 +2101,7 @@
 				          axisLine: {
 				            lineStyle: {
 				              color: 'white'
-				
+
 				            }
 				          },
 				          axisLabel: {
@@ -2112,7 +2112,7 @@
 				            }
 				          },
 				        },
-				
+
 				        yAxis: {
 				          type: 'value',
 				          max:'1200',
@@ -2143,7 +2143,7 @@
 				          handleSize: '110%',
 				          handleStyle:{
 				            color:"#d3dee5",
-				
+
 				          },
 				          textStyle:{
 				            color:"#fff"},
@@ -2188,7 +2188,7 @@
 				                }]),
 				                barBorderRadius: 11,
 				            }
-				            
+
 				          },
 				          data: [400, 500, 500, 500, 500, 400,400, 500, 500]
 				        },
@@ -2211,13 +2211,13 @@
 				          data: [400, 600, 700, 700, 1000, 400, 400, 600, 700]
 				        }]
 				      };
-				
+
 				      var app = {
 				        currentIndex: -1,
 				      };
 				      setInterval(function () {
 				        var dataLen = option.series[0].data.length;
-				
+
 				        // 取消之前高亮的图形
 				        myChart.dispatchAction({
 				          type: 'downplay',
@@ -2238,8 +2238,8 @@
 				          seriesIndex: 0,
 				          dataIndex: app.currentIndex
 				        });
-				
-				
+
+
 				      }, 1000);
 				myChart.setOption(option);
 			},
@@ -2673,8 +2673,8 @@
 
 				myChart.setOption(option);
 			},
-			
-			
+
+
 			//保护材质和套管材质统计(埋设类型)
 			sjChart14() {
 				var myChart = echarts.init(document.getElementById("sjChart14"));
@@ -2720,7 +2720,7 @@
 							color: '#a8aab0',
 							fontStyle: 'normal',
 							fontFamily: '微软雅黑',
-							fontSize: 12,            
+							fontSize: 12,
 				        }
 				    },
 					xAxis: [
@@ -2778,7 +2778,7 @@
 									opacity:0.06
 								}
 							}
-				
+
 						}
 					],
 				    series : [
@@ -2796,7 +2796,7 @@
 				            //           color: '#a8aab0',
 				            //           fontStyle: 'normal',
 				            //           fontFamily: '微软雅黑',
-				            //           fontSize: 12,   
+				            //           fontSize: 12,
 				            //       },
 				            //     },
 				            // },
@@ -2829,7 +2829,7 @@
 				            //           color: '#a8aab0',
 				            //           fontStyle: 'normal',
 				            //           fontFamily: '微软雅黑',
-				            //           fontSize: 12,   
+				            //           fontSize: 12,
 				            //       },
 				            //     },
 				            // },
@@ -2858,7 +2858,7 @@
 				let pieSource = {
 				    'PE管': 776,
 				    '钢管': 122,
-				    
+
 				  },
 				  legendColor = [
 				    "#8679ff",
@@ -2868,7 +2868,7 @@
 				    "#5fc6fc",
 				  ],
 				  richStyle = {};
-				
+
 				function initData(source) {
 				  legendColor.map((item, index) => {
 				    richStyle["style" + index] = {};
@@ -3033,8 +3033,8 @@
 				    value2: 233,
 				    value3: 123,
 				    value4: 153,
-				
-				
+
+
 				  },
 				  {
 				    name: "6月",
@@ -3072,7 +3072,7 @@
 				    value4: 183,
 				  },
 				];
-				
+
 				let xAxisData = echartData.map((v) => v.name);
 				//  ["1", "2", "3", "4", "5", "6", "7", "8"]
 				let yAxisData1 = echartData.map((v) => v.value1);
@@ -3091,16 +3091,16 @@
 				  }
 				  return rgbaColor;
 				};
-				
+
 				var option = {
 				  color: color,
 				  legend: {
 				    left: 0,
 				    top: 0,
-				   textStyle: {  
-				        color: '#ffffff' , 
+				   textStyle: {
+				        color: '#ffffff' ,
 				        fontSize:'10px'
-				    }, 
+				    },
 				  },
 				  tooltip: {
 				    trigger: "axis",
@@ -3118,7 +3118,7 @@
 				                };font-weight:700;font-size: 18px">${v.value}</span>
 				                `;
 				      });
-				
+
 				      return html;
 				    },
 				    extraCssText:
@@ -3140,7 +3140,7 @@
 				    containLabel: true,
 				  },
 				  xAxis: [
-				      
+
 				    {
 				      type: "category",
 				      boundaryGap: false,
@@ -3151,7 +3151,7 @@
 				        },
 				      },
 				      axisLine: {
-				          
+
 				        lineStyle: {
 				          color: "#D9D9D9",
 				        },
@@ -3398,7 +3398,7 @@
 							color: '#a8aab0',
 							fontStyle: 'normal',
 							fontFamily: '微软雅黑',
-							fontSize: 12,            
+							fontSize: 12,
 				        }
 				    },
 					xAxis: [
@@ -3456,7 +3456,7 @@
 									opacity:0.06
 								}
 							}
-				
+
 						}
 					],
 				    series : [
@@ -3474,7 +3474,7 @@
 				            //           color: '#a8aab0',
 				            //           fontStyle: 'normal',
 				            //           fontFamily: '微软雅黑',
-				            //           fontSize: 12,   
+				            //           fontSize: 12,
 				            //       },
 				            //     },
 				            // },
@@ -3507,7 +3507,7 @@
 				            //           color: '#a8aab0',
 				            //           fontStyle: 'normal',
 				            //           fontFamily: '微软雅黑',
-				            //           fontSize: 12,   
+				            //           fontSize: 12,
 				            //       },
 				            //     },
 				            // },
@@ -4357,7 +4357,7 @@
 			top: 76px;
 			transform: translateX(-50%);
 			z-index: 999;
-			
+
 			li {
 				background: url(../assets/images/gangwei/navbj.png)no-repeat;
 				width: 105px;
@@ -4383,27 +4383,27 @@
 			li:nth-child(1) {
 				animation: btnmove 1s;
 			}
-			
+
 			li:nth-child(2) {
 				animation: btnmove 1.2s;
 			}
-			
+
 			li:nth-child(3) {
 				animation: btnmove 1.4s;
 			}
-			
+
 			li:nth-child(4) {
 				animation: btnmove 1.6s;
 			}
-			
+
 			li:nth-child(5) {
 				animation: btnmove 1.8s;
 			}
-			
+
 			li:nth-child(6) {
 				animation: btnmove 2s;
 			}
-			
+
 			li:nth-child(7) {
 				animation: btnmove 2.2s;
 			}
@@ -5536,4 +5536,4 @@
 			/* 确保三角形中心对齐链接的中心 */
 		}
 	}
-</style>
+</style>

+ 3 - 2
src/views/Operation.vue

@@ -523,7 +523,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -541,7 +541,7 @@
 			// 初始化地图数据
 			this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
 			this.khChart();
 			this.whChart();
@@ -3503,3 +3503,4 @@
 
 
 </style>
+

+ 2 - 2
src/views/Regulatory.vue

@@ -526,7 +526,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -544,7 +544,7 @@
 			// 初始化地图数据
 			this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
 			this.sjChart();
 			this.hyChart();

+ 2 - 2
src/views/homePage copy.vue

@@ -151,7 +151,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -169,7 +169,7 @@
 			// 初始化地图数据
 			// this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
 		},
 		data() {

+ 5 - 5
src/views/homePage.vue

@@ -72,7 +72,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -90,7 +90,7 @@
 			// 初始化地图数据
 			// this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
 		},
 		data() {
@@ -253,7 +253,7 @@
 		50% {
 			transform: translateY(-3px);
 			filter: brightness(110%) hue-rotate(-20deg) drop-shadow(4px 4px 20px #00aeff);
-			
+
 		}
 
 		100% {
@@ -371,7 +371,7 @@
     	animation:moverobot 2s  infinite;
     	animation-fill-mode: forwards;
     }
-	
+
 	.lifeline-con {
 		background: url('~@/assets/images/homePage/homePage.png') 0 0 no-repeat;
 		background-size: 100% 100%;
@@ -966,4 +966,4 @@
 			transform: translateY(-5px);
 		}
 	}
-</style>
+</style>

+ 45 - 45
src/views/industry/FengxianQd.vue

@@ -426,7 +426,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -444,7 +444,7 @@
 			// 初始化地图数据
 			this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 				this.jmysChart();
 				this.gdpsChart()
 				this.szgwChart()
@@ -459,7 +459,7 @@
 			this.hyChart();
 			this.ndChart();
 			this.fxChart();
-			
+
 		},
 		data() {
 			return {
@@ -2128,7 +2128,7 @@
 				  ],
 				};
 				myChart.setOption(option)
-				
+
 			},
 			// 排水普查
 			pspcChart(){
@@ -2155,7 +2155,7 @@
 				      triggerEvent: true,
 				    },
 				  ],
-				
+
 				  legend: {
 				    show: false,
 				  },
@@ -2228,7 +2228,7 @@
 				      },
 				      animationDuration: 4000,
 				    },
-				
+
 				    {
 				      name: "刻度尺",
 				      type: "gauge",
@@ -2413,7 +2413,7 @@
 				        show: false,
 				      },
 				    },
-				
+
 				    // 中间半圆装饰
 				    {
 				      type: "gauge",
@@ -2497,7 +2497,7 @@
 				      triggerEvent: true,
 				    },
 				  ],
-				
+
 				  legend: {
 				    show: false,
 				  },
@@ -2570,7 +2570,7 @@
 				      },
 				      animationDuration: 4000,
 				    },
-				
+
 				    {
 				      name: "刻度尺",
 				      type: "gauge",
@@ -2755,7 +2755,7 @@
 				        show: false,
 				      },
 				    },
-				
+
 				    // 中间半圆装饰
 				    {
 				      type: "gauge",
@@ -2839,7 +2839,7 @@
 				      triggerEvent: true,
 				    },
 				  ],
-				
+
 				  legend: {
 				    show: false,
 				  },
@@ -2912,7 +2912,7 @@
 				      },
 				      animationDuration: 4000,
 				    },
-				
+
 				    {
 				      name: "刻度尺",
 				      type: "gauge",
@@ -3097,7 +3097,7 @@
 				        show: false,
 				      },
 				    },
-				
+
 				    // 中间半圆装饰
 				    {
 				      type: "gauge",
@@ -3181,7 +3181,7 @@
 				      triggerEvent: true,
 				    },
 				  ],
-				
+
 				  legend: {
 				    show: false,
 				  },
@@ -3254,7 +3254,7 @@
 				      },
 				      animationDuration: 4000,
 				    },
-				
+
 				    {
 				      name: "刻度尺",
 				      type: "gauge",
@@ -3439,7 +3439,7 @@
 				        show: false,
 				      },
 				    },
-				
+
 				    // 中间半圆装饰
 				    {
 				      type: "gauge",
@@ -3517,7 +3517,7 @@
 				    borderWidth: 0,
 				  },
 				};
-				
+
 				var dataStyle = {
 				  normal: {
 				    formatter: "{c}%",
@@ -3530,7 +3530,7 @@
 				    },
 				  },
 				};
-				
+
 				var option = {
 				  // backgroundColor: "#142058",
 				  title: [
@@ -3651,7 +3651,7 @@
 				        },
 				      ],
 				    },
-				
+
 				    //外圈的边框
 				    {
 				      // name: '总人数',
@@ -3744,7 +3744,7 @@
 
 
 
-			
+
 			getSuperMapUrl() {
 				getUserProfile().then(response => {
 					let mapDeptId = response.mapDeptId
@@ -4734,7 +4734,7 @@
 				display: flex;
 				align-items: center;
 				justify-content: center;
-				
+
 				em{
 					font-family: Arial, Helvetica, sans-serif;
 					font-size: 14px;
@@ -4754,7 +4754,7 @@
 			div.time_tab{
 				width: 190px;
 				border: none;
-				
+
 				h4{
 					background: linear-gradient(90deg, #081a2f ,  #214d8c,  #081a2f);
 					border-radius: 5px;
@@ -5638,9 +5638,9 @@
 	.myddc{
 		display: flex;
 		justify-content: space-between;
-		
+
 		dl{
-			
+
 			dd{
 				width: 160px;
 				height: 42px;
@@ -5649,7 +5649,7 @@
 				justify-content: space-between;
 				padding: 0 20px;
 				margin: 12px 0;
-				
+
 				span{
 					font-size: 14px;
 					color: #52FFFF;
@@ -5665,11 +5665,11 @@
 	.pcfg{
 		display: flex;
 		justify-content: space-around;
-		
+
 		.pcChart{
 			width: 50%;
 			text-align: center;
-			
+
 			div{
 				width: 100%;
 				height: 150px;
@@ -5680,22 +5680,22 @@
 			}
 		}
 	}
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </style>

+ 2 - 2
src/views/industry/GangweiZx.vue

@@ -474,7 +474,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -492,7 +492,7 @@
 			// 初始化地图数据
 			this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
       let ListMarkersList = []
       for(let i = 0; i < 20; i++){

+ 8 - 8
src/views/industry/jcxt.vue

@@ -440,7 +440,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -458,7 +458,7 @@
 			// 初始化地图数据
 			this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
 			this.sblx_chart();
 			this.sbbj_div();
@@ -2030,17 +2030,17 @@
     		padding-left: 20px;
     		background: url("../../assets/index_img/jgpt_icon7.png") no-repeat 8px 12px;
     	}
-    
+
     	span:nth-child(2) {
     		width: 70%;
     		text-align: left;
-    
+
     	}
-    
+
     	span:nth-child(3) {
     		width: 65px;
     	}
-    
+
     	span:nth-child(2n) {
     		color: #fff;
     	}
@@ -2885,11 +2885,11 @@
 			.btn-span:nth-child(6) {
 				animation: btnmove 2s;
 			}
-			
+
 			.btn-span:nth-child(7) {
 				animation: btnmove 2.2s;
 			}
-			
+
             .btn-span7{
 				width: 120px !important;
 				background-size: contain !important;

+ 2 - 2
src/views/industry/jgpt.vue

@@ -515,7 +515,7 @@
 		},
 		metaInfo() {
 			return {
-				title: '全域视联态势感知平台',
+				title: '四平市城市生命线',
 				meta: [{
 						charset: "utf-8"
 					},
@@ -533,7 +533,7 @@
 			// 初始化地图数据
 			this.getSuperMapUrl();
 			setTimeout(() => {
-				this.title = '全域视联态势感知平台'
+				this.title = '四平市城市生命线'
 			}, 1000)
 			this.hysj_div_chart1();
 			this.hysj_div_chart2();

+ 2 - 2
src/views/industry/lookall.vue

@@ -217,7 +217,7 @@
 			  <div class="titleBar" data-text="预警列表"></div>
         <el-select v-model="currentEventType" placeholder="请选择事件类型" clearable style="position: absolute;right: 3.3%;top: 33%;">
           <el-option label="城市体检" value="1" />
-          <el-option label="日常监管" value="2" />
+          <el-option label="维护监管" value="2" />
           <el-option label="基础事件" value="3" />
           <el-option label="设备预警" value="4" />
         </el-select>
@@ -1622,7 +1622,7 @@ export default {
             ]
         }
     ]
-}       
+}
       const chartDom = this.$refs.divOption;
       const myChart = echarts.init(chartDom);
       myChart.setOption(option);

+ 7 - 4
src/views/industry/tableInfoHandler.vue

@@ -4131,12 +4131,15 @@
 			},
 			flyToSetConnectList() {
 				let connectList = [124.361964879589, 43.1601856342876, 124.360359386027, 43.1607561553213,
-					124.358625971586, 43.1614786115409, 124.359218406844, 43.1624825035453, 124.36280132925,
-					43.1680369063413, 124.363643248771, 43.1693361988817, 124.360137637565, 43.1705702621698,
-					124.360962067266, 43.1729528785854
-				]
+          124.358625971586, 43.1614786115409, 124.359218406844, 43.1624825035453, 124.36280132925,
+          43.1680369063413, 124.363643248771, 43.1693361988817, 124.360137637565, 43.1705702621698,
+          124.360962067266, 43.1729528785854
+        ]
 				connectList = connectList.map(num => Number(num.toFixed(5)))
+				this.$refs.supermap.clearC();
 				this.$refs.supermap.setConnectList(connectList, '#fe0000', 1);
+        // this.$refs.supermap.clearCM();
+        // this.$refs.supermap.setConnectListsMarkerMove(connectList, '#fe0000', 0.8)
 
 				this.$refs.supermap.dropLocation(connectList[1] * 1, connectList[0] * 1);
 			},

+ 1 - 1
src/views/system/login-sp.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">全域视联态势感知平台</h3>
+      <h3 class="title">四平市城市生命线</h3>
       <div class="login-container">
         <h4>请登录</h4>
         <el-form-item prop="username">

+ 1 - 1
src/views/system/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">全域视联态势感知平台</h3>
+      <h3 class="title">四平市城市生命线</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

+ 1 - 1
vue.config.js

@@ -44,8 +44,8 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://10.6.52.11:3031`,
 		// target: `http://192.168.4.5:3031`,
-		// target: `http://192.168.4.9:3031`,
 		target: `http://192.168.10.12:3041`,
+		// target: `http://192.168.10.12:3041`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''