密码弹窗+广播

src/api/components/supermap.js

@@ -17,6 +17,7 @@ export function getDeviceList(param) {
 export const iconList = {
   'marker': require('@/assets/images/cameraType/marker.png'),
   'big-horn': require('@/assets/images/cameraType/big-horn.png'),
+  'big-horn-emergency': require('@/assets/images/cameraType/big-horn-emergency.png'),
   'camera': require('@/assets/images/cameraType/camera.png'),
   'camera-not': require('@/assets/images/cameraType/camera-not.png'),
   'not-online': require('@/assets/images/cameraType/not-online.png'),

src/components/v-fastmenu.vue

@@ -30,7 +30,7 @@
 				</div>
 			</el-popover>
 		</div>
-    <el-dialog title="修改密码" :visible.sync="isResetPwd" v-if="isResetPwd" width="30%" append-to-body>
+    <el-dialog title="修改密码" :visible.sync="isResetPwd" v-if="isResetPwd" :close="close" width="30%" append-to-body>
       <resetPwd :user="user" />
     </el-dialog>
 	</div>
@@ -94,6 +94,9 @@ import Cookies from 'js-cookie';
           this.isResetPwd=true
         });
       },
+      close(){
+        this.isResetPwd=false;
+      },
       async logout() {
         this.$confirm('确定注销并退出系统吗？', '提示', {
           confirmButtonText: '确定',

src/views/eventdetailsdialog.vue

@@ -1014,7 +1014,7 @@
       </div>
     </el-dialog>
     <!-- 添加区域标记 -->
-    <el-dialog title="火灾区域" :visible.sync="regionalFlagOpen" width="1000px">
+    <el-dialog :title="title" :visible.sync="regionalFlagOpen" width="1000px">
       <areaSupermap ref="fireAreaSupermap" v-if="regionalFlagOpen" style="width: 100%;height:74vh"
                     :mapDiv="'fireAreaSuperMap'" :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"
                     :showAreaLatLng="showAreaLatLng"></areaSupermap>
@@ -1117,6 +1117,7 @@ export default {
   },
   data() {
     return {
+      title:"火灾区域\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000《双击选中区域获取数据》",
       isLoading: false,
       showFindUserByDept: false, //责任人选择框
       //海康

src/views/monitor.vue

@@ -31,7 +31,7 @@
                     <h5>传感器</h5>
                   </div>
                 </div>
-                <div class="icon-con w-33 m-btm-no" :class="{on:onLa}" @click="$refs.supermap.clearG()">
+                <div class="icon-con w-33 m-btm-no" :class="{on:onLa}" @click="laClick">
                   <div class="icon icon-dot"></div>
                   <div class="icon-text">
                     <h6>{{ loudspeakerNum }}</h6>
@@ -206,7 +206,7 @@
         this.deptId = Cookies.get("deptId")
         // this.chuanSet()
         this.getMonitorDeviceAndDataLists()
-        // this.getDlblistBydeptIds()
+        this.getDlblistBydeptIds(-1)
         this.selectDeviceType(-1)
         // this.getNotCoverPlaces(this.deptId);
 
@@ -440,7 +440,7 @@
         } else if (that.localMark == 'chuan') {
           that.getMonitorDeviceAndDataList()
         } else if (that.localMark == 'la') {
-          // that.getDlblistBydeptId()
+          that.getDlblistBydeptId()
         }
       },
       sheClick() {
@@ -488,94 +488,98 @@
         })
       },
       // 云广播
-      // getDlblistBydeptId() {
-      //   let that = this;
-      //   let markersList = [];
-      //   getDlblistBydeptId(that.deptId).then(function(res) {
-      //       that.loudspeakerNum = res.data.length
-      //       that.visuForestCloudCameraBOListSearch = []
-      //          that.tempList = []
-      //       if (res.data != null && res.data.length > 0) {
-      //         for (let j = 0; j < res.data.length; j++) {
-      //           let dat = {
-      //             cameraName: res.data[j].name,
-      //             longitude: res.data[j].longitude,
-      //             latitude: res.data[j].latitude,
-      //           }
-      //           that.visuForestCloudCameraBOListSearch.push(dat)
-      //         }
-      // that.tempList = that.visuForestCloudCameraBOListSearch
-      //         for (let i = 0; i < res.data.length; i++) {
-      //           let markersMap = {
-      //             lng: 124.59,
-      //             lat: 43.02,
-      //             icon: "marker",
-      //             bindPopupHtml: '<div class="map-tip">' +
-      //               "<span>" +
-      //               '                  <div class="d-l-con">' +
-      //               '                  <div class="d-l-l-text">' +
-      //               "                  <h4>名称：" +
-      //               (res.data[i].name ? res.data[i].name : "") +
-      //               "</h4>" +
-      //               "                </div>" +
-      //               "                </div>" +
-      //               "                </span>" +
-      //               "<span>" +
-      //               '                  <div class="d-l-con">' +
-      //               '                  <div class="d-l-l-text">' +
-      //               "                  <h4>位置：" +
-      //               (res.data[i].position ? res.data[i].position : "") +
-      //               "</h4>" +
-      //               "                </div>" +
-      //               "                </div>" +
-      //               "                </span>" +
-      //               "<span>" +
-      //               '                  <div class="d-l-con">' +
-      //               '                  <div class="d-l-l-text">' +
-      //               "                  <h4>备注：" +
-      //               (res.data[i].remark ? res.data[i].remark : "") +
-      //               "</h4>" +
-      //               "                </div>" +
-      //               "                </div>" +
-      //               "                </span>" +
-      //               "<span>" +
-      //               '                  <div class="d-l-con">' +
-      //               '                  <div class="d-l-l-text">' +
-      //               "                  <h4>经纬度：" +
-      //               res.data[i].longitude + "," + res.data[i].latitude +
-      //               "</h4>" +
-      //               "                </div>" +
-      //               "                </div>" +
-      //               "                </span>" +
-      //               "</div>",
-      //             click: "jump",
-      //             parameter: "",
-      //             name: "",
-      //             keepBindPopup: false,
-      //             isAggregation: false,
-      //           };
-      //           markersMap.icon = "big-horn";
-      //
-      //           markersMap.lng = res.data[i].longitude;
-      //           markersMap.lat = res.data[i].latitude;
-      //           markersList.push(markersMap);
-      //         }
-      //         setTimeout(() => {
-      //           that.$refs.supermap.clearM();
-      //           that.$refs.supermap.clearMRadius()
-      //           that.$refs.supermap.setMarkers(markersList);
-      //         }, 2000);
-      //       } else {
-      //         setTimeout(() => {
-      //           that.$refs.supermap.clearM();
-      //           that.$refs.supermap.clearMRadius()
-      //         }, 2000);
-      //       }
-      //     })
-      //     .catch(function(error) {
-      //       console.error(error);
-      //     });
-      // },
+      getDlblistBydeptId() {
+        let that = this;
+        let markersList = [];
+        getDlblistBydeptId(that.deptId).then(function(res) {
+            that.loudspeakerNum = res.data.length
+            that.visuForestCloudCameraBOListSearch = []
+               that.tempList = []
+            if (res.data != null && res.data.length > 0) {
+              for (let j = 0; j < res.data.length; j++) {
+                let dat = {
+                  cameraName: res.data[j].name,
+                  longitude: res.data[j].longitude,
+                  latitude: res.data[j].latitude,
+                }
+                that.visuForestCloudCameraBOListSearch.push(dat)
+              }
+      that.tempList = that.visuForestCloudCameraBOListSearch
+              for (let i = 0; i < res.data.length; i++) {
+                let markersMap = {
+                  lng: 124.59,
+                  lat: 43.02,
+                  icon: "big-horn",
+                  bindPopupHtml: '<div class="map-tip">' +
+                    "<span>" +
+                    '                  <div class="d-l-con">' +
+                    '                  <div class="d-l-l-text">' +
+                    "                  <h4>名称：" +
+                    (res.data[i].name ? res.data[i].name : "") +
+                    "</h4>" +
+                    "                </div>" +
+                    "                </div>" +
+                    "                </span>" +
+                    "<span>" +
+                    '                  <div class="d-l-con">' +
+                    '                  <div class="d-l-l-text">' +
+                    "                  <h4>位置：" +
+                    (res.data[i].position ? res.data[i].position : "") +
+                    "</h4>" +
+                    "                </div>" +
+                    "                </div>" +
+                    "                </span>" +
+                    "<span>" +
+                    '                  <div class="d-l-con">' +
+                    '                  <div class="d-l-l-text">' +
+                    "                  <h4>备注：" +
+                    (res.data[i].remark ? res.data[i].remark : "") +
+                    "</h4>" +
+                    "                </div>" +
+                    "                </div>" +
+                    "                </span>" +
+                    "<span>" +
+                    '                  <div class="d-l-con">' +
+                    '                  <div class="d-l-l-text">' +
+                    "                  <h4>经纬度：" +
+                    res.data[i].longitude + "," + res.data[i].latitude +
+                    "</h4>" +
+                    "                </div>" +
+                    "                </div>" +
+                    "                </span>" +
+                    "</div>",
+                  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;
+                markersList.push(markersMap);
+              }
+              setTimeout(() => {
+                that.$refs.supermap.clearM();
+                that.$refs.supermap.clearMRadius()
+                that.$refs.supermap.setMarkers(markersList);
+              }, 2000);
+            } else {
+              setTimeout(() => {
+                that.$refs.supermap.clearM();
+                that.$refs.supermap.clearMRadius()
+              }, 2000);
+            }
+          })
+          .catch(function(error) {
+            console.error(error);
+          });
+      },
       getDlblistBydeptIds() {
         let that = this;
 

src/views/system/user/profile/resetPwd.vue

@@ -56,12 +56,13 @@ export default {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
             this.$modal.msgSuccess("修改成功");
+            this.$emit("close");
           });
         }
       });
     },
     close() {
-      this.$tab.closePage();
+      this.$emit("close");
     }
   }
 };