部分问题调整

public/config.js

@@ -96,28 +96,28 @@ const client_appconfig = {
       'groupname': '天地图在线矢量服务',
       'type': 'webTiled',
       'config': [
-        { 'name': '矢量地图', 'url': 'http://172.16.0.2/{subDomain}.tianditu.com/DataServer?T=vec_c&x={col}&y={row}&l={level}&tk=' }
+        { 'name': '矢量地图', 'url': 'http://172.16.0.2:11020/{subDomain}.tianditu.com/DataServer?T=vec_c&x={col}&y={row}&l={level}&tk=' }
       ]
     },
     'tian_online_raster': {
       'groupname': '天地图在线影像服务',
       'type': 'webTiled',
       'config': [
-        { 'name': '影像地图', 'url': 'http://172.16.0.2/{subDomain}.tianditu.com/DataServer?T=img_c&x={col}&y={row}&l={level}&tk=' }
+        { 'name': '影像地图', 'url': 'http://172.16.0.2:11020/{subDomain}.tianditu.com/DataServer?T=img_c&x={col}&y={row}&l={level}&tk=' }
       ]
     },
     'tian_online_vector_label': {
       'groupname': '天地图在线矢量标注服务',
       'type': 'webTiled',
       'config': [
-        { 'name': '矢量标注图', 'url': 'http://172.16.0.2/{subDomain}.tianditu.com/DataServer?T=cva_c&x={col}&y={row}&l={level}&tk=' }
+        { 'name': '矢量标注图', 'url': 'http://172.16.0.2:11020/{subDomain}.tianditu.com/DataServer?T=cva_c&x={col}&y={row}&l={level}&tk=' }
       ]
     },
     'tian_online_raster_label': {
       'groupname': '天地图在线影像标注服务',
       'type': 'webTiled',
       'config': [
-        { 'name': '影像标注图', 'url': 'http://172.16.0.2/{subDomain}.tianditu.com/DataServer?T=cia_c&x={col}&y={row}&l={level}&tk=' }
+        { 'name': '影像标注图', 'url': 'http://172.16.0.2:11020/{subDomain}.tianditu.com/DataServer?T=cia_c&x={col}&y={row}&l={level}&tk=' }
       ]
     },
     'tian_offline_raster_label': {
@@ -163,6 +163,14 @@ const client_appconfig = {
         { 'name': '业务地图', 'url': 'http://172.16.0.2:6080/arcgis/rest/services/MSSW/PIPE_JS_MEISHAN/MapServer' }
       ]
     },
+    'business_bigmap': {
+      'groupname': '离线业务地图服务大屏',
+      'type': 'dynamic',
+      'config': [{
+        'name': '离线业务地图服务大屏',
+        'url': `http://172.16.0.2:6080/arcgis/rest/services/MSSW/PIPE_JS_MEISHAN/MapServer`
+      }]
+    },
     'print': {
       'groupname': '打印服务',
       'config': [

src/views/currentSystem/regionalMetering/components/DMAsettingDialog.vue

@@ -741,7 +741,9 @@ export default {
                       dw.isout = (dr.isout == '1')
                       if (this.type == 2) this.dmatableList.push({ id: dr.tableId, schName: dr.tableName, select: true, isout: dw.isout, lgtd: dw.lgtd, lttd: dw.lttd })
                     } else {
-                      this.dmatableList.push({ id: dr.tableId, schName: dr.tableName, select: true, isout: dr.isout == '1', lgtd: dw.lgtd, lttd: dw.lttd })
+                      // var dw = index[dr.tableId]
+                      // this.dmatableList.push({ id: dr.tableId, schName: dr.tableName, select: true, isout: dr.isout == '1', lgtd: dw.lgtd, lttd: dw.lttd })
+                      this.dmatableList.push({ id: dr.tableId, schName: dr.tableName, select: true, isout: dr.isout == '1', lgtd: dr.lgtd, lttd: dr.lttd })
                     }
                     watchIndex[dr.tableId].TF_outText.symbol = symbol(text)
                   }

src/views/dataBoard/smartOverview/rightPage/third.vue

@@ -58,8 +58,9 @@ export default {
                 //     legData: ['新增'],
                 //     legTotal: [1000],
                 //     xData: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
-                //     seriesData: [300, 450, 500, 650, 580, 560, 700, 800, 760, 650, 590, 750]
+                //     seriesData: [300, 450, 500, 650, 580, 560, 918, 2053, 6554, 0, 553, 1594]
                 // }
+
                 this.setChart(this.$refs.theChart, chartData)
                 this.loading = false
             })

src/views/zhpt/scada/scadaMonitor/components/scadaMapCom.vue

@@ -162,8 +162,8 @@ export default {
       const that = this
       if (newTab == 'scadaMonitor') {
         const view = this.mapView
-        that.layer = view.map.findLayerById('scadatool')
-        that.hitlayer = view.map.findLayerById('scadatoolhit')
+        that.layer = view.map.findLayerById('scada')
+        that.hitlayer = view.map.findLayerById('scadahit')
         if (that.layer !== null && that.layer !== undefined) {
           that.layer.visible = false
         }
@@ -469,6 +469,7 @@ export default {
             funclosePanel: that.closePanel,
             funScadaHistory: that.showScadaHistory,
             funClick: that.menuClick,
+            funSVideo:that.funSVideo,
           }
         }).$mount()
         divItem.appendChild(component.$el)
@@ -478,6 +479,9 @@ export default {
 
       this.addWatch()
     },
+    funSVideo(searchText){
+      this.searchText=searchText;
+    },
     /**
      * 功能：div监听移动
      */
@@ -577,35 +581,38 @@ export default {
         // 设置历史标题
         this.siteTitle = siteFilter[0].scadaEntity.name
       }
+      this.$nextTick(e=>{
+        getScadaMonitor({ deviceId: stid }).then((res) => {
+          if (res.code == 1) {
+            res = res.result[0]
+            this.selectSite = res
+            var index = (this.selectZBXIndex = {})
+            const allocations = res.allocations.sort((a, b) => { return parseInt(a.sortNumber) - parseInt(b.sortNumber) })
+            this.sites = allocations.map((e) => {
+              index[e.variableCode] = [e.displayName, e.unit]
+              return { value: e.variableCode, label: e.displayName }
+            })
+            if(this.sites&&this.sites.length>0){
+              this.siteType = zbx || this.sites[0].value
+              this.showResult()
+            }
 
-      getScadaMonitor({ deviceId: stid }).then((res) => {
-        if (res.code == 1) {
-          res = res.result[0]
-          this.selectSite = res
-          var index = (this.selectZBXIndex = {})
-          const allocations = res.allocations.sort((a, b) => { return parseInt(a.sortNumber) - parseInt(b.sortNumber) })
-          this.sites = allocations.map((e) => {
-            index[e.variableCode] = [e.displayName, e.unit]
-            return { value: e.variableCode, label: e.displayName }
-          })
-          if(this.sites&&this.sites.length>0){
-            this.siteType = zbx || this.sites[0].value
-            this.showResult()
-          }
-
-          // this.$nextTick(() => {
-          //   this.historychart = this.$echarts.init(
-          //     this.$nextTick(() => { this.$refs.chart })
-          //   );
-          // });
+            // this.$nextTick(() => {
+            //   this.historychart = this.$echarts.init(
+            //     this.$nextTick(() => { this.$refs.chart })
+            //   );
+            // });
 
-  
-        } else {
-          this.$message.error('获取测站失败！')
-          console.error(res)
-          this.siteVisible = false
-        }
+    
+          } else {
+            this.$message.error('获取测站失败！')
+            console.error(res)
+            this.siteVisible = false
+          }
+        })
       })
+  
+    
     },
 
     /**

src/views/zhpt/scada/scadaMonitor/widget.vue

@@ -246,20 +246,38 @@ export default {
     sidePanelOn(newTab, oldTab) {
       if (newTab == oldTab) return;
       if (newTab == "scadaMonitor") {
-        this.$nextTick(() => {
-          this.layer.visible = true;
-          for (var i = 0, il = this.divs, ii = il.length; i < ii; i++) {
-            il[i].div.style.display = "";
+          this.$nextTick(() => {
+          const scadalayer = this.data.mapView.map.findLayerById("scada");
+          const scadahitlayer = this.data.mapView.map.findLayerById("scadahit");
+          if (scadalayer !== null && scadalayer !== undefined) {
+            scadalayer.visible = true;
           }
-          this.addWatch();
-          if (this.ids.length > 0) this.loadRealTimeSiteValue();
+          if (scadahitlayer !== null && scadahitlayer !== undefined) {
+            scadahitlayer.visible = true;
+          }
+          if(this.$refs.scadaMapCom&&this.$refs.scadaMapCom.divs){
+            for (var i = 0, il = this.$refs.scadaMapCom.divs, ii = il.length; i < ii; i++) {
+              il[i].div.style.display = ''
+            }
+          }
+          this.addWatch&&this.addWatch();
+          if (this.ids&&this.ids.length > 0) this.loadRealTimeSiteValue();
         });
       }
       if (oldTab == "scadaMonitor") {
-        this.layer.visible = false;
-        for (var i = 0, il = this.divs, ii = il.length; i < ii; i++) {
-          il[i].div.style.display = "none";
+        const scadalayer = this.data.mapView.map.findLayerById("scada");
+        const scadahitlayer = this.data.mapView.map.findLayerById("scadahit");
+        if (scadalayer !== null && scadalayer !== undefined) {
+          scadalayer.visible = false;
         }
+        if (scadahitlayer !== null && scadahitlayer !== undefined) {
+          scadahitlayer.visible = false;
+        }
+        if(this.$refs.scadaMapCom&&this.$refs.scadaMapCom.divs){
+            for (var i = 0, il = this.$refs.scadaMapCom.divs, ii = il.length; i < ii; i++) {
+              il[i].div.style.display = 'none'
+            }
+          }
         if (this.watch) {
           this.watch.remove();
           this.watch = undefined;
@@ -287,8 +305,8 @@ export default {
     var view = (this.mapView = this.data.mapView);
     this.floatDiv = view.TF_floatPanel;
 
-    const scadalayer = view.map.findLayerById("scadatool");
-    const scadahitlayer = view.map.findLayerById("scadatoolhit");
+    const scadalayer = view.map.findLayerById("scada");
+    const scadahitlayer = view.map.findLayerById("scadahit");
     if (scadalayer !== null && scadalayer !== undefined) {
       scadalayer.visible = false;
     }
@@ -303,8 +321,8 @@ export default {
     if (this.queryTimeOut) window.clearTimeout(this.queryTimeOut);
     // this.clearSiteDiv();
     var view = this.mapView;
-    const scadalayer = view.map.findLayerById("scadatool");
-    const scadahitlayer = view.map.findLayerById("scadatoolhit");
+    const scadalayer = view.map.findLayerById("scada");
+    const scadahitlayer = view.map.findLayerById("scadahit");
     if (scadalayer !== null && scadalayer !== undefined) {
       scadalayer.visible = true;
     }

src/views/zhpt/scada/scadaMonitorAll/components/scadaMapCom.vue

@@ -163,10 +163,10 @@ export default {
     sideEditOn(newTab, oldTab) {
       console.log('sideEditOn', newTab, oldTab)
       const that = this
-      if (newTab == 'scadaMonitor') {
+      if (newTab == 'scadaMonitorAll') {
         const view = this.mapView
-        that.layer = view.map.findLayerById('scadatool')
-        that.hitlayer = view.map.findLayerById('scadatoolhit')
+        that.layer = view.map.findLayerById('scadaAll')
+        that.hitlayer = view.map.findLayerById('scadaAllhit')
         if (that.layer !== null && that.layer !== undefined) {
           that.layer.visible = false
         }
@@ -174,10 +174,10 @@ export default {
           that.hitlayer.visible = false
         }
       }
-      if (oldTab == 'scadaMonitor') {
+      if (oldTab == 'scadaMonitorAll') {
         const view = this.mapView
-        that.layer = view.map.findLayerById('scada')
-        that.hitlayer = view.map.findLayerById('scadahit')
+        that.layer = view.map.findLayerById('scadaAll')
+        that.hitlayer = view.map.findLayerById('scadaAllhit')
         if (that.layer !== null && that.layer !== undefined) {
           that.layer.visible = false
         }

src/views/zhpt/scada/scadaMonitorAll/widget.vue

@@ -105,12 +105,12 @@
     </el-dialog>
 
     <ScadaMapCom
-      ref="scadaMapCom"
+      ref="scadaMapComAll"
       :map-view="mapView"
       :site-data="siteData"
       :isscadashow="true"
       :ismapok="false"
-      maplayer-name="scada"
+      maplayer-name="scadaAll"
     />
   </div>
 </template>
@@ -183,20 +183,42 @@ export default {
   watch: {
     sidePanelOn(newTab, oldTab) {
       if (newTab == oldTab) return
-      if (newTab == 'scadaMonitor') {
+      if (newTab == 'scadaMonitorAll') {
         this.$nextTick(() => {
-          this.layer.visible = true
-          for (var i = 0, il = this.divs, ii = il.length; i < ii; i++) {
-            il[i].div.style.display = ''
+          // if(this.layer){
+          //   this.layer.visible = true
+          // }
+          
+          const scadalayer = this.data.mapView.map.findLayerById('scadaAll')
+          const scadahitlayer = this.data.mapView.map.findLayerById('scadaAllhit')
+          if (scadalayer !== null && scadalayer !== undefined) {
+            scadalayer.visible = true
           }
-          this.addWatch()
-          if (this.ids.length > 0) this.loadRealTimeSiteValue()
+          if (scadahitlayer !== null && scadahitlayer !== undefined) {
+            scadahitlayer.visible = true
+          }
+          if(this.$refs.scadaMapComAll&&this.$refs.scadaMapComAll.divs){
+            for (var i = 0, il =this.$refs.scadaMapComAll.divs, ii = il.length; i < ii; i++) {
+              il[i].div.style.display = ''
+            }
+          }
+          this.addWatch&&this.addWatch()
+          if (this.ids&&this.ids.length > 0) this.loadRealTimeSiteValue()
         })
       }
-      if (oldTab == 'scadaMonitor') {
-        this.layer.visible = false
-        for (var i = 0, il = this.divs, ii = il.length; i < ii; i++) {
-          il[i].div.style.display = 'none'
+      if (oldTab == 'scadaMonitorAll') {
+        const scadalayer = this.data.mapView.map.findLayerById('scadaAll')
+          const scadahitlayer = this.data.mapView.map.findLayerById('scadaAllhit')
+          if (scadalayer !== null && scadalayer !== undefined) {
+            scadalayer.visible = false
+          }
+          if (scadahitlayer !== null && scadahitlayer !== undefined) {
+            scadahitlayer.visible = false
+          }
+        if(this.$refs.scadaMapComAll&&this.$refs.scadaMapComAll.divs){
+          for (var i = 0, il = this.$refs.scadaMapComAll.divs, ii = il.length; i < ii; i++) {
+            il[i].div.style.display = 'none'
+          }
         }
         if (this.watch) {
           this.watch.remove()
@@ -217,8 +239,8 @@ export default {
     var view = (this.mapView = this.data.mapView)
     this.floatDiv = view.TF_floatPanel
 
-    const scadalayer = view.map.findLayerById('scadatool')
-    const scadahitlayer = view.map.findLayerById('scadatoolhit')
+    const scadalayer = view.map.findLayerById('scadaAll')
+    const scadahitlayer = view.map.findLayerById('scadaAllhit')
     if (scadalayer !== null && scadalayer !== undefined) {
       scadalayer.visible = false
     }
@@ -233,8 +255,8 @@ export default {
     if (this.queryTimeOut) window.clearTimeout(this.queryTimeOut)
     // this.clearSiteDiv();
     var view = this.mapView
-    const scadalayer = view.map.findLayerById('scadatool')
-    const scadahitlayer = view.map.findLayerById('scadatoolhit')
+    const scadalayer = view.map.findLayerById('scadaAll')
+    const scadahitlayer = view.map.findLayerById('scadaAllhit')
     if (scadalayer !== null && scadalayer !== undefined) {
       scadalayer.visible = true
     }
@@ -285,7 +307,6 @@ export default {
                 const allocationsFilter = site.allocations.filter(item => {
                   return item.isAlarm == '1'
                 })
-                debugger
                 if (allocationsFilter.length > 0) {
                   isError = true;
                   this.existWarnig=true;
@@ -403,7 +424,7 @@ export default {
       }
     },
     getSiteHistroty(e) {
-      this.$refs.scadaMapCom.getSiteHistroty(e)
+      this.$refs.scadaMapComAll.getSiteHistroty(e)
 
       // var stid, zbx;
       // stid = e.id;