yf_zd hace 4 años
padre
commit
a564bfa026

BIN
dist.zip


+ 6 - 4
src/components/highStand/sidebar.vue

@@ -77,10 +77,12 @@ export default {
         "5":[{
         "5":[{
           name:"qxzCtrl",
           name:"qxzCtrl",
           label:"设备控制",
           label:"设备控制",
-        },{
-          name:"qxzMsgWarn",
-          label:"短信预警",
-        }],
+        },
+        // {
+        //   name:"qxzMsgWarn",
+        //   label:"短信预警",
+        // }
+        ],
         "7":[{
         "7":[{
           name:"bzyCtrl",
           name:"bzyCtrl",
           label:"设备控制",
           label:"设备控制",

+ 3 - 2
src/pages/plantGuard/monitor/Monitor.vue

@@ -190,7 +190,7 @@
             class="playBack"
             class="playBack"
             @click="playBackDialogVisible = true"
             @click="playBackDialogVisible = true"
           ></div>
           ></div>
-          <div @click="addEquipDialogVisible = true" class="addequip"></div>
+          <!-- <div @click="addEquipDialogVisible = true" class="addequip"></div> -->
           <div @click="fScreenFun()" class="fSBtn1"></div>
           <div @click="fScreenFun()" class="fSBtn1"></div>
         </div>
         </div>
       </div>
       </div>
@@ -354,7 +354,8 @@ export default {
   filters: {
   filters: {
     formatName: function (value) {
     formatName: function (value) {
       //设备名字
       //设备名字
-      if (value.device_name) {
+      var name = value.device_name.trim()
+      if (name) {
         return `${value.device_name}-${value.jktype}`;
         return `${value.device_name}-${value.jktype}`;
       }else{
       }else{
         return `${value.device_id}`;
         return `${value.device_id}`;

+ 7 - 0
src/pages/plantGuard/plantProtection/base.vue

@@ -68,6 +68,7 @@
                     </div>
                     </div>
                     <div class="equipTime">{{item.addtime*1000 | formatTime}}</div>
                     <div class="equipTime">{{item.addtime*1000 | formatTime}}</div>
                   </div>
                   </div>
+                  <div class="notEquipList" v-if="!equipListCurr.length">暂无设备</div>
                 </div>
                 </div>
               </el-scrollbar>
               </el-scrollbar>
           </div> 
           </div> 
@@ -1539,6 +1540,12 @@ export default {
                 border: 1px dashed #0195ff;
                 border: 1px dashed #0195ff;
                 box-shadow: 0px 0px 5px 1px #39acff;
                 box-shadow: 0px 0px 5px 1px #39acff;
               }
               }
+              .notEquipList{
+                line-height: 55px;
+                font-size: 0.175rem;
+                color: #92c2f3;
+                text-align: center;
+              }
             }
             }
         }
         }
         .scroll {
         .scroll {

+ 2 - 1
src/pages/plantGuard/plantProtection/warn/cbdMsgWarn.vue

@@ -212,6 +212,7 @@ methods: {
 		var plantName = []
 		var plantName = []
 		var plantNums = []
 		var plantNums = []
 		var plantObj = {}
 		var plantObj = {}
+		
 		for (var i = 0; i < that.planKind.length; i++) {
 		for (var i = 0; i < that.planKind.length; i++) {
 			plantName.push(that.planKind[i].value)
 			plantName.push(that.planKind[i].value)
 			plantNums.push(that.planKind[i].nums)
 			plantNums.push(that.planKind[i].nums)
@@ -265,7 +266,7 @@ methods: {
 	warningData() {
 	warningData() {
 		let that = this
 		let that = this
 		let postData = that.qs.stringify({
 		let postData = that.qs.stringify({
-			device_id: that.$route.params.id,
+			device_id: that.equipId,
 			conf: ''
 			conf: ''
 		})
 		})
 		that
 		that

+ 2 - 1
src/pages/plantGuard/sysManage/userManage.vue

@@ -705,7 +705,8 @@ export default {
 							message: '操作成功!'
 							message: '操作成功!'
 						})
 						})
 						localStorage.setItem('cUsername',username) //修改当前登录的用户名
 						localStorage.setItem('cUsername',username) //修改当前登录的用户名
-						this.reload() //整体刷新
+						window.sessionStorage.clear();
+						window.location.reload() //整体刷新
 						window.sessionStorage.removeItem("menuTabs");
 						window.sessionStorage.removeItem("menuTabs");
           				window.sessionStorage.removeItem("menuTabsValue");
           				window.sessionStorage.removeItem("menuTabsValue");
 						// this.$EventBus.$on('firstPage', (data) => {
 						// this.$EventBus.$on('firstPage', (data) => {