heyang

src/views/comprehensive/message/warningNotice/index.vue

@@ -114,7 +114,7 @@
       return{
         pageType:1,
         selectListA:[{key:'0',value:"全部"},{key:"1",value:"算法识别"},{key:"2",value:"化学品"},{key:"3",value:"气瓶"}],
-        selectListB:[{key:"",value:"全部"},{key:"1",value:"系统通知"},{key:"2",value:"短信通知"},{key:"3",value:"声光报警"}],
+        selectListB:[{key:"",value:"全部"},{key:"1",value:"系统通知"},{key:"2",value:"短信通知"},{key:"3",value:"声光报警"},{key:"4",value:"语音播报"}],
         queryParams:{
           pageNum: 1,
           pageSize:20,
@@ -170,11 +170,8 @@
             if(response.data.records[i].warningWay!='' && response.data.records[i].warningWay!=null){
               response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/1/, "系统通知")
               response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/2/, "短信通知")
-              if( response.data.records[i].warningType==1){
-                response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/3/, "语音播报")
-              }else{
-                response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/3/, "声光报警")
-              }
+              response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/3/, "声光报警")
+              response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/4/, "语音播报")
               if (response.data.records[i].warningWay.endsWith(',')) {
                 response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/,/, " ")
               }

src/views/comprehensive/message/warningNotice/infoPage.vue

@@ -67,7 +67,7 @@
           <div class='info-box' v-if="infoData.warningSubType==2">
             <div>
               <p>申领人：</p>
-              <p>{{infoData.apply}}</p>
+              <p>{{infoData.applyUser}}</p>
             </div>
           </div>
           <div class='info-box' v-if="infoData.warningSubType==2">
@@ -115,7 +115,7 @@
           <div class='info-box' v-if="infoData.warningSubType==2">
             <div>
               <p>申领人：</p>
-              <p>{{infoData.apply}}</p>
+              <p>{{infoData.applyUser}}</p>
             </div>
           </div>
           <div class='info-box' v-if="infoData.warningSubType==2">
@@ -202,11 +202,8 @@
               if(this.infoData.warningWay!='' && this.infoData.warningWay!=null){
                 this.infoData.warningWay=this.infoData.warningWay.replace(/1/, "系统通知")
                 this.infoData.warningWay=this.infoData.warningWay.replace(/2/, "短信通知")
-                if( this.infoData.warningType==1){
-                  this.infoData.warningWay=this.infoData.warningWay.replace(/3/, "语音播报")
-                }else{
-                  this.infoData.warningWay=this.infoData.warningWay.replace(/3/, "声光报警")
-                }
+                response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/3/, "声光报警")
+                response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/4/, "语音播报")
                 if (this.infoData.warningWay.endsWith(',')) {
                   this.infoData.warningWay=this.infoData.warningWay.replace(/,/, " ")
                 }