JX.LI 1 ano atrás
pai
commit
793762abf9
4 arquivos alterados com 335 adições e 203 exclusões
  1. 8 0
      src/api/forest.js
  2. 162 102
      src/views/eventdetailsdialog.vue
  3. 163 100
      src/views/firespread.vue
  4. 2 1
      vue.config.js

+ 8 - 0
src/api/forest.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 搜索物资
+export function selectNearHorn(param) {
+  return request({
+    url:`/center-monitor/broadcast/selectNearHorn/${param.longitude}/${param.latitude}/${param.radius}/${param.type}`,
+    method: 'get'
+  })
+}
+
 // 获取消防左侧菜单列表
 export function selectByMenuId(data) {
   return request({

+ 162 - 102
src/views/eventdetailsdialog.vue

@@ -133,7 +133,7 @@
                     doubleClickZoom: false,
                     dragging: false,
                     scrollWheelZoom: false,
-                  }" :codes="['9fa5']" :isSideBySide="false" :isdynamicPlotting="true" @preview="preview"
+                  }" :codes="['9fa5']" :isSideBySide="false" :isdynamicPlotting="true" @preview="preview" @jump="jump"
                   :mapToolShowBH="mapToolShowBH" />
                 <!-- <supermapDialog ref="supermapDialog" -->
                 <!-- @preview="preview"/> -->
@@ -1410,6 +1410,7 @@
     eventExamine,
     eventHandling,
     initByCameras,
+    selectNearHorn,
   } from "@/api/forest";
   import {
     joinConferences
@@ -1749,6 +1750,13 @@
             icon: "sj-icon-jkzx",
             bg: "#f5ad1b",
           });
+          _this.resourcesList.push({
+            resourceName: "云广播",
+            type: "ygb",
+            count: "1",
+            icon: "sj-icon-big-horn",
+            bg: "#841bf5",
+          });
         });
       },
       /************************************责任制-开始****************************************/
@@ -2062,7 +2070,7 @@
             type: type,
             radius: this.radius,
           };
-          if (type != "sxt") {
+          if (type != "sxt" && type != 'ygb') {
             fireControlViewPoint(param).then((res) => {
               if (res.data != null && res.data.pointList.length > 0) {
                 this.resourcesListCheck.push(type);
@@ -2180,114 +2188,166 @@
             type: type,
             radius: this.radius,
           };
-          listResourceByWz(param).then((res) => {
-            if (res.data != null && res.data.length > 0) {
-              this.resourcesListCheck.push(type);
-              var markersList = [];
-              for (let i = 0; i < res.data.length; i++) {
-                let markersMap = {
-                  lng: 124.59,
-                  lat: 43.02,
-                  icon: "marker",
-                  bindPopupHtml: "",
-                  click: "",
-                  parameter: "",
-                  keepBindPopup: false,
-                  isAggregation: true,
-                };
-                if (type == "qsk") {
-                  markersMap.icon = "sj-icon-centerdata-t-forest-waterintake";
-                } else if (type == "sh") {
-                  markersMap.icon = "sj-icon-centerdata-t-forest-watercrane";
-                } else if (type == "xfs") {
-                  markersMap.icon = "sj-icon-centerdata-t-forest-firehydrant";
-                } else if (type == "qjd") {
-                  markersMap.icon = "sj-icon-landing";
-                } else if (type == "jcz") {
-                  markersMap.icon = "sj-icon-checkpoint";
-                } else if (type == "fhd") {
-                  markersMap.icon = "sj-icon-fireteam";
-                } else if (type == "zdqy") {
-                  markersMap.icon = "sj-icon-keyAreas";
-                } else if (type == "sxt") {
-                  if (res.data[i].cameraUse == 1) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
-                      markersMap.click = ''
-                    }
-
-                  } else if (res.data[i].cameraUse == 2) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = "camera";
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = "camera-not";
-                      markersMap.click = ''
-                    }
-                  } else if (res.data[i].cameraUse == 3) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
-                      markersMap.click = ''
-                    }
-
-                  } else if (res.data[i].cameraUse == 4) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
-                      markersMap.click = ''
+          if (type == 'sxt') {
+            listResourceByWz(param).then((res) => {
+              if (res.data != null && res.data.length > 0) {
+                this.resourcesListCheck.push(type);
+                var markersList = [];
+                for (let i = 0; i < res.data.length; i++) {
+                  let markersMap = {
+                    lng: 124.59,
+                    lat: 43.02,
+                    icon: "marker",
+                    bindPopupHtml: "",
+                    click: "",
+                    parameter: "",
+                    keepBindPopup: false,
+                    isAggregation: true,
+                  };
+                  if (type == "qsk") {
+                    markersMap.icon = "sj-icon-centerdata-t-forest-waterintake";
+                  } else if (type == "sh") {
+                    markersMap.icon = "sj-icon-centerdata-t-forest-watercrane";
+                  } else if (type == "xfs") {
+                    markersMap.icon = "sj-icon-centerdata-t-forest-firehydrant";
+                  } else if (type == "qjd") {
+                    markersMap.icon = "sj-icon-landing";
+                  } else if (type == "jcz") {
+                    markersMap.icon = "sj-icon-checkpoint";
+                  } else if (type == "fhd") {
+                    markersMap.icon = "sj-icon-fireteam";
+                  } else if (type == "zdqy") {
+                    markersMap.icon = "sj-icon-keyAreas";
+                  } else if (type == "sxt") {
+                    if (res.data[i].cameraUse == 1) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                        markersMap.click = ''
+                      }
+
+                    } else if (res.data[i].cameraUse == 2) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = "camera";
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = "camera-not";
+                        markersMap.click = ''
+                      }
+                    } else if (res.data[i].cameraUse == 3) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                        markersMap.click = ''
+                      }
+
+                    } else if (res.data[i].cameraUse == 4) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                        markersMap.click = ''
+                      }
+
+                    } else if (res.data[i].cameraUse == 5) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
+                        markersMap.click = ''
+                      }
                     }
-
-                  } else if (res.data[i].cameraUse == 5) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = 'sj-icon-map-centerdata-river_camera'
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
-                      markersMap.click = ''
+                    if (res.data[i].cameraCode != null) {
+                      markersMap.parameter = {
+                        code: res.data[i].cameraCode,
+                        type: res.data[i].cameraFactory ?
+                          res.data[i].cameraFactory : 1,
+                        name: res.data[i].cameraName,
+                      };
                     }
                   }
-                  if (res.data[i].cameraCode != null) {
-                    //markersMap.click = "preview";
-                    // markersMap.parameter = res.data[i].cameraCode
-                    markersMap.parameter = {
-                      code: res.data[i].cameraCode,
-                      type: res.data[i].cameraFactory ?
-                        res.data[i].cameraFactory : 1,
-                      name: res.data[i].cameraName,
-                    };
+                  markersMap.lng = res.data[i].longitude;
+                  markersMap.lat = res.data[i].latitude;
+                  markersMap.bindPopupHtml =
+                    '<div class="map-tip">' +
+                    "<span>" +
+                    '                  <div class="d-l-con">' +
+                    '                  <div class="d-l-l-text">' +
+                    "                  <h4>资源名称:" +
+                    res.data[i].cameraName +
+                    "</h4>" +
+                    "                </div>" +
+                    "                </div>" +
+                    "                </span>" +
+                    "</div>";
+                  markersList.push(markersMap);
+                }
+                setTimeout(() => {
+                  this.$refs.supermapDialog.setMarkersByType(markersList, type);
+                }, 1000);
+              }
+            });
+          } else if (type == 'ygb') {
+            let param = {
+              longitude: this.longitude,
+              latitude: this.latitude,
+              radius: this.radius,
+              type: '6'
+            };
+            selectNearHorn(param).then((res) => {
+              if (res.data != null && res.data.length > 0) {
+                this.resourcesListCheck.push(type);
+                var markersList = [];
+                for (let i = 0; i < res.data.length; i++) {
+                  let markersMap = {
+                    lng: 124.59,
+                    lat: 43.02,
+                    icon: "big-horn",
+                    click: "jump",
+                    parameter: "",
+                    name: "",
+                    keepBindPopup: false,
+                    isAggregation: false,
+                  };
+                  if (res.data[i].broadcastUse == '1') {
+                    markersMap.icon = "big-horn-emergency";
+                  } else if (res.data[i].broadcastUse == '2') {
+                    markersMap.icon = "big-horn";
                   }
+                  markersMap.lng = res.data[i].longitude;
+                  markersMap.lat = res.data[i].latitude;
+                  markersMap.bindPopupHtml =
+                    '<div class="map-tip">' +
+                    "<span>" +
+                    '                  <div class="d-l-con">' +
+                    '                  <div class="d-l-l-text">' +
+                    "                  <h4>资源名称:" +
+                    res.data[i].name +
+                    "</h4>" +
+                    "                </div>" +
+                    "                </div>" +
+                    "                </span>" +
+                    "</div>";
+                  markersList.push(markersMap);
                 }
-                markersMap.lng = res.data[i].longitude;
-                markersMap.lat = res.data[i].latitude;
-                markersMap.bindPopupHtml =
-                  '<div class="map-tip">' +
-                  "<span>" +
-                  '                  <div class="d-l-con">' +
-                  '                  <div class="d-l-l-text">' +
-                  "                  <h4>资源名称:" +
-                  res.data[i].cameraName +
-                  "</h4>" +
-                  "                </div>" +
-                  "                </div>" +
-                  "                </span>" +
-                  "</div>";
-                markersList.push(markersMap);
               }
               setTimeout(() => {
                 this.$refs.supermapDialog.setMarkersByType(markersList, type);
               }, 1000);
-            }
-          });
+            });
+          }
         }
       },
+      jump() {
+        // 跳转云广播页面
+        window.open("https://sts.sty1818.com");
+      },
       // 返回图片列表
       assetTypeAnImage(filePath) {
         let imageList = [];
@@ -3451,9 +3511,9 @@
         let that = this;
         selectConfigKey('meeting_plugin_url').then(response => {
           that.$alert(
-            "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='"+response.data+"'>点击此处</ a>进行下载",
-            "该功能需要使用云会议客户端",
-            {
+            "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='" + response.data +
+            "'>点击此处</ a>进行下载",
+            "该功能需要使用云会议客户端", {
               confirmButtonText: "确定",
               dangerouslyUseHTMLString: true,
               callback: (action) => {

+ 163 - 100
src/views/firespread.vue

@@ -96,7 +96,8 @@
                 <!-- 地图 -->
                 <supermapDialog1 ref="supermapDialog1" style="position: absolute; top:0;left: 0;"
                   :mapDiv="'forestWarmSuperMap'" :mapSite="{doubleClickZoom:true,dragging:true,scrollWheelZoom:true}"
-                  :codes="['9fa5']" :isSideBySide="false" @preview="preview" :mapToolShowBH="mapToolShowBH" />
+                  :codes="['9fa5']" :isSideBySide="false" @preview="preview" @jump="jump"
+                  :mapToolShowBH="mapToolShowBH" />
                 <!-- 地图end -->
               </div>
             </el-col>
@@ -1074,6 +1075,7 @@
     fireControlViewList,
     fireControlViewPoint,
     sendMessage,
+    selectNearHorn,
   } from '@/api/forest'
   import {
     treeselectAll as deptTreeselect
@@ -1541,6 +1543,13 @@
             icon: "sj-icon-jkzx",
             bg: "#f5ad1b",
           });
+          _this.resourcesList1.push({
+            resourceName: "云广播",
+            type: "ygb",
+            count: "1",
+            icon: "sj-icon-big-horn",
+            bg: "#841bf5",
+          });
         });
       },
       fireControlViewPoint(type) {
@@ -1558,7 +1567,7 @@
             type: type,
             radius: that.radius
           }
-          if (type != 'sxt') {
+          if (type != 'sxt' && type != 'ygb') {
             fireControlViewPoint(param).then(res => {
               if (res.data != null && res.data.pointList.length > 0) {
                 that.resourcesListCheck.push(type)
@@ -1846,111 +1855,165 @@
             type: type,
             radius: that.radius
           }
-          listResourceByWz(param).then(res => {
-            if (res.data != null && res.data.length > 0) {
-              that.resourcesListCheck.push(type)
-              var markersList = []
-              for (let i = 0; i < res.data.length; i++) {
-                let markersMap = {
-                  lng: 124.59,
-                  lat: 43.02,
-                  icon: 'marker',
-                  bindPopupHtml: '',
-                  click: '',
-                  parameter: '',
-                  keepBindPopup: false,
-                  isAggregation: true
-                }
-                if (type == 'qsk') {
-                  markersMap.icon = 'sj-icon-waterintake'
-                } else if (type == 'sh') {
-                  markersMap.icon = 'sj-icon-watercrane'
-                } else if (type == 'xfs') {
-                  markersMap.icon = 'sj-icon-firehydrant'
-                } else if (type == 'qjd') {
-                  markersMap.icon = 'sj-icon-landing'
-                } else if (type == 'jcz') {
-                  markersMap.icon = 'sj-icon-checkpoint'
-                } else if (type == 'fhd') {
-                  markersMap.icon = 'sj-icon-fireteam'
-                } else if (type == 'zdqy') {
-                  markersMap.icon = 'sj-icon-keyAreas'
-                } else if (type == 'sxt') {
-                  if (res.data[i].cameraUse == 1) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
-                      markersMap.click = ''
-                    }
-
-                  } else if (res.data[i].cameraUse == 2) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = "camera";
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = "camera-not";
-                      markersMap.click = ''
-                    }
-                  } else if (res.data[i].cameraUse == 3) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
-                      markersMap.click = ''
+          if (type == 'sxt') {
+            listResourceByWz(param).then(res => {
+              if (res.data != null && res.data.length > 0) {
+                that.resourcesListCheck.push(type)
+                var markersList = []
+                for (let i = 0; i < res.data.length; i++) {
+                  let markersMap = {
+                    lng: 124.59,
+                    lat: 43.02,
+                    icon: 'marker',
+                    bindPopupHtml: '',
+                    click: '',
+                    parameter: '',
+                    keepBindPopup: false,
+                    isAggregation: true
+                  }
+                  if (type == 'qsk') {
+                    markersMap.icon = 'sj-icon-waterintake'
+                  } else if (type == 'sh') {
+                    markersMap.icon = 'sj-icon-watercrane'
+                  } else if (type == 'xfs') {
+                    markersMap.icon = 'sj-icon-firehydrant'
+                  } else if (type == 'qjd') {
+                    markersMap.icon = 'sj-icon-landing'
+                  } else if (type == 'jcz') {
+                    markersMap.icon = 'sj-icon-checkpoint'
+                  } else if (type == 'fhd') {
+                    markersMap.icon = 'sj-icon-fireteam'
+                  } else if (type == 'zdqy') {
+                    markersMap.icon = 'sj-icon-keyAreas'
+                  } else if (type == 'sxt') {
+                    if (res.data[i].cameraUse == 1) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                        markersMap.click = ''
+                      }
+
+                    } else if (res.data[i].cameraUse == 2) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = "camera";
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = "camera-not";
+                        markersMap.click = ''
+                      }
+                    } else if (res.data[i].cameraUse == 3) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                        markersMap.click = ''
+                      }
+
+                    } else if (res.data[i].cameraUse == 4) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                        markersMap.click = ''
+                      }
+
+                    } else if (res.data[i].cameraUse == 5) {
+                      if (res.data[i].workingStatus == 0) {
+                        markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                        markersMap.click = 'preview'
+                      } else if (res.data[i].workingStatus == 1) {
+                        markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
+                        markersMap.click = ''
+                      }
                     }
-
-                  } else if (res.data[i].cameraUse == 4) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
-                      markersMap.click = ''
+                    if (res.data[i].cameraCode != null) {
+                      // markersMap.click = 'preview'
+                      // markersMap.parameter = res.data[i].cameraCode
+                      markersMap.parameter = {
+                        code: res.data[i].cameraCode,
+                        type: res.data[i].cameraFactory ? res.data[i].cameraFactory : 1,
+                        name: res.data[i].cameraName
+                      }
                     }
 
-                  } else if (res.data[i].cameraUse == 5) {
-                    if (res.data[i].workingStatus == 0) {
-                      markersMap.icon = 'sj-icon-map-centerdata-river_camera'
-                      markersMap.click = 'preview'
-                    } else if (res.data[i].workingStatus == 1) {
-                      markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
-                      markersMap.click = ''
-                    }
                   }
-                  if (res.data[i].cameraCode != null) {
-                    // markersMap.click = 'preview'
-                    // markersMap.parameter = res.data[i].cameraCode
-                    markersMap.parameter = {
-                      code: res.data[i].cameraCode,
-                      type: res.data[i].cameraFactory ? res.data[i].cameraFactory : 1,
-                      name: res.data[i].cameraName
-                    }
+                  markersMap.lng = res.data[i].longitude
+                  markersMap.lat = res.data[i].latitude
+                  markersMap.bindPopupHtml = '<div class="map-tip">' +
+                    '<span>' +
+                    '                  <div class="d-l-con">' +
+                    '                  <div class="d-l-l-text">' +
+                    '                  <h4>资源名称:' + res.data[i].cameraName + '</h4>' +
+                    '                </div>' +
+                    '                </div>' +
+                    '                </span>' +
+                    '</div>'
+                  markersList.push(markersMap)
+                }
+                setTimeout(() => {
+                  that.$refs.supermapDialog1.setMarkersByType(markersList, type)
+                }, 1000)
+              }
+            })
+          } else if (type == 'ygb') {
+            let param = {
+              longitude: this.longitude,
+              latitude: this.latitude,
+              radius: this.radius,
+              type: '6'
+            };
+            selectNearHorn(param).then((res) => {
+              if (res.data != null && res.data.length > 0) {
+                this.resourcesListCheck.push(type);
+                var markersList = [];
+                for (let i = 0; i < res.data.length; i++) {
+                  let markersMap = {
+                    lng: 124.59,
+                    lat: 43.02,
+                    icon: "big-horn",
+                    click: "jump",
+                    parameter: "",
+                    name: "",
+                    keepBindPopup: false,
+                    isAggregation: false,
+                  };
+                  if (res.data[i].broadcastUse == '1') {
+                    markersMap.icon = "big-horn-emergency";
+                  } else if (res.data[i].broadcastUse == '2') {
+                    markersMap.icon = "big-horn";
                   }
-
+                  markersMap.lng = res.data[i].longitude;
+                  markersMap.lat = res.data[i].latitude;
+                  markersMap.bindPopupHtml =
+                    '<div class="map-tip">' +
+                    "<span>" +
+                    '                  <div class="d-l-con">' +
+                    '                  <div class="d-l-l-text">' +
+                    "                  <h4>资源名称:" +
+                    res.data[i].name +
+                    "</h4>" +
+                    "                </div>" +
+                    "                </div>" +
+                    "                </span>" +
+                    "</div>";
+                  markersList.push(markersMap);
                 }
-                markersMap.lng = res.data[i].longitude
-                markersMap.lat = res.data[i].latitude
-                markersMap.bindPopupHtml = '<div class="map-tip">' +
-                  '<span>' +
-                  '                  <div class="d-l-con">' +
-                  '                  <div class="d-l-l-text">' +
-                  '                  <h4>资源名称:' + res.data[i].cameraName + '</h4>' +
-                  '                </div>' +
-                  '                </div>' +
-                  '                </span>' +
-                  '</div>'
-                markersList.push(markersMap)
               }
               setTimeout(() => {
-                that.$refs.supermapDialog1.setMarkersByType(markersList, type)
-              }, 1000)
-            }
-          })
+                this.$refs.supermapDialog1.setMarkersByType(markersList, type);
+              }, 1000);
+            });
+          }
         }
       },
+      jump() {
+        // 跳转云广播页面
+        window.open("https://sts.sty1818.com");
+      },
       // 返回图片列表
       assetTypeAnImage(filePath) {
         let imageList = []
@@ -3012,9 +3075,9 @@
         let that = this;
         selectConfigKey('meeting_plugin_url').then(response => {
           that.$alert(
-            "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='"+response.data+"'>点击此处</ a>进行下载",
-            "该功能需要使用云会议客户端",
-            {
+            "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='" + response.data +
+            "'>点击此处</ a>进行下载",
+            "该功能需要使用云会议客户端", {
               confirmButtonText: "确定",
               dangerouslyUseHTMLString: true,
               callback: (action) => {

+ 2 - 1
vue.config.js

@@ -43,7 +43,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:3031`,
-        target: `http://192.168.31.235:3031`,
+        target: `http://121.36.228.66:3031`,
+        // target: `http://192.168.31.235:3031`,
         // target: `http://192.168.2.118:3031`,
         // target: `https://29613561xe.eicp.vip`,
         changeOrigin: true,