heyang преди 8 месеца
родител
ревизия
d2b3b439bc

+ 17 - 2
src/views/chemicalManage/earlyWarningEvent/infoPage.vue

@@ -18,7 +18,7 @@
           </div>
           <div class="text-right-box">
             <p>实验室负责人:</p>
-            <p v-for="(item,index) in infoData.adminInfoList">{{item.userName}}-{{item.mobile}}</p>
+            <p>{{infoData.adminInfo}}</p>
           </div>
         </div>
         <div class="text-max-box">
@@ -32,7 +32,7 @@
           </div>
           <div class="text-right-box">
             <p>安全员:</p>
-            <p v-for="(item,index) in infoData.safeInfoList">{{item.userName}}-{{item.mobile}}</p>
+            <p>{{infoData.safeInfo}}</p>
           </div>
         </div>
         <div class="text-max-box" v-if="infoData.chemicalWarnType==6">
@@ -283,6 +283,21 @@
       //初始化
       initialize(){
         this.$set(this,'infoData',this.propsData);
+        if (this.infoData.adminInfoList[0]){
+          let list=[];
+          this.infoData.adminInfoList.forEach(function(item) {
+            list.push(item.userName+'-'+item.mobile)
+          })
+          this.infoData.adminInfo=list.join(',')
+        }
+        if (this.infoData.safeInfoList[0]){
+          let list=[];
+          this.infoData.safeInfoList.forEach(function(item) {
+            list.push(item.userName+'-'+item.mobile)
+          })
+          this.infoData.safeInfo=list.join(',')
+        }
+
         this.$set(this.infoDataForm,'noticeId',this.propsData.noticeId);
       },
       // 返回按钮

+ 16 - 3
src/views/integratedManagement/messageNotice/warningNotice/infoPage.vue

@@ -18,7 +18,7 @@
           </div>
           <div class="text-right-box">
             <p>实验室负责人:</p>
-            <p v-for="(item,index) in infoData.adminInfoList">{{item.userName}}-{{item.mobile}}</p>
+            <p>{{infoData.adminInfo}}</p>
           </div>
         </div>
         <div class="text-max-box">
@@ -32,7 +32,7 @@
           </div>
           <div class="text-right-box">
             <p>安全员:</p>
-            <p v-for="(item,index) in infoData.safeInfoList">{{item.userName}}-{{item.mobile}}</p>
+            <p>{{infoData.safeInfo}}</p>
           </div>
         </div>
         <div class="text-max-box" v-if="infoData.chemicalWarnType==6">
@@ -283,7 +283,20 @@ export default {
     //初始化
     initialize(){
       this.infoData=this.propsData;
-      console.log(this.infoData)
+      if (this.infoData.adminInfoList[0]){
+        let list=[];
+        this.infoData.adminInfoList.forEach(function(item) {
+          list.push(item.userName+'-'+item.mobile)
+        })
+        this.infoData.adminInfo=list.join(',')
+      }
+      if (this.infoData.safeInfoList[0]){
+        let list=[];
+        this.infoData.safeInfoList.forEach(function(item) {
+          list.push(item.userName+'-'+item.mobile)
+        })
+        this.infoData.safeInfo=list.join(',')
+      }
       this.$set(this.infoDataForm,'noticeId',this.propsData.noticeId);
     },
     // 返回按钮