密码弹窗+广播

src/api/components/supermap.js

@@ -10,6 +10,7 @@ export function getSuperMap(codes) {
 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>
@@ -87,6 +87,9 @@ import Cookies from 'js-cookie'
           Cookies.set('nickName',response.data.nickName);
         });
       },
+      close(){
+        this.isResetPwd=false;
+      },
       resetPwd(){
         getUserProfile().then(response => {
           this.user = response.data;

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

@@ -477,7 +477,7 @@
                 let markersMap = {
                   lng: 124.59,
                   lat: 43.02,
-                  icon: "marker",
+                  icon: "big-horn",
                   bindPopupHtml: '<div class="map-tip">' +
                     "<span>" +
                     '                  <div class="d-l-con">' +
@@ -522,7 +522,11 @@
                   keepBindPopup: false,
                   isAggregation: false,
                 };
-                markersMap.icon = "big-horn";
+                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;

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");
     }
   }
 };