zc

src/views/chemicalManage/earlyWarningEvent/infoPage.vue

@@ -80,11 +80,11 @@
         <!--列表 化学品3化学品过期。4化学品即将过期-->
         <div class="table-max-big-box" v-if="infoData.chemicalWarnType==3 || infoData.chemicalWarnType==4">
           <el-table class="table-box" v-loading="loading" border :data="infoData.chemicalExpireList">
-            <el-table-column label="化学品名称" prop="chemicalName" fixed show-overflow-tooltip/>
-            <el-table-column label="规格" prop="normsNum" width="180" fixed show-overflow-tooltip/>
-            <el-table-column label="余量" prop="surplus" width="180" fixed show-overflow-tooltip/>
-            <el-table-column label="归属人" prop="belongName" width="220" fixed show-overflow-tooltip/>
-            <el-table-column label="过期时间" prop="expireTime" width="220" fixed show-overflow-tooltip>
+            <el-table-column label="化学品名称" prop="chemicalName" show-overflow-tooltip/>
+            <el-table-column label="规格" prop="normsNum" width="180"  show-overflow-tooltip/>
+            <el-table-column label="余量" prop="surplus" width="180"  show-overflow-tooltip/>
+            <el-table-column label="归属人" prop="belongName" width="220"  show-overflow-tooltip/>
+            <el-table-column label="过期时间" prop="expireTime" width="220"  show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.expireTime,"{y}-{m}-{d} {h}:{i}") }}</span>
               </template>
@@ -95,17 +95,17 @@
         <!--列表 化学品3化学品过期。4化学品即将过期-->
         <div class="table-max-big-box" v-if="infoData.chemicalWarnType==5">
           <el-table class="table-box" v-loading="loading" border :data="infoData.chemicalOverdueStockList">
-            <el-table-column label="化学品名称" prop="chemicalName" fixed show-overflow-tooltip/>
-            <el-table-column label="CAS" prop="casNum" fixed show-overflow-tooltip/>
-            <el-table-column label="类别" prop="chemicalCategory" fixed show-overflow-tooltip/>
-            <el-table-column label="纯度" prop="chemicalPurity" fixed show-overflow-tooltip/>
-            <el-table-column label="规格" prop="normsNum"  fixed show-overflow-tooltip/>
-            <el-table-column label="数量" prop="applyNum"  fixed show-overflow-tooltip/>
-            <el-table-column label="归属人" prop="belongName"  fixed show-overflow-tooltip/>
-            <el-table-column label="学院" prop="deptName"  fixed show-overflow-tooltip/>
-            <el-table-column label="实验室" prop="subName"  fixed show-overflow-tooltip/>
-            <el-table-column label="类型" prop="source"  fixed show-overflow-tooltip/>
-            <el-table-column label="创建时间" prop="createTime"  fixed show-overflow-tooltip>
+            <el-table-column label="化学品名称" prop="chemicalName"  show-overflow-tooltip/>
+            <el-table-column label="CAS" prop="casNum"  show-overflow-tooltip/>
+            <el-table-column label="类别" prop="chemicalCategory"  show-overflow-tooltip/>
+            <el-table-column label="纯度" prop="chemicalPurity"  show-overflow-tooltip/>
+            <el-table-column label="规格" prop="normsNum"   show-overflow-tooltip/>
+            <el-table-column label="数量" prop="applyNum"   show-overflow-tooltip/>
+            <el-table-column label="归属人" prop="belongName"   show-overflow-tooltip/>
+            <el-table-column label="学院" prop="deptName"   show-overflow-tooltip/>
+            <el-table-column label="实验室" prop="subName"   show-overflow-tooltip/>
+            <el-table-column label="类型" prop="source"   show-overflow-tooltip/>
+            <el-table-column label="创建时间" prop="createTime"   show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
               </template>
@@ -157,12 +157,12 @@
         <p class="title-p">通知记录</p>
         <div class="table-max-big-box">
           <el-table class="table-box" v-loading="loading" border :data="infoData.warningNoticeLogVoList">
-            <el-table-column label="通知时间" prop="createTime" width="200" fixed show-overflow-tooltip>
+            <el-table-column label="通知时间" prop="createTime" width="200"  show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.noticeTime,"{y}-{m}-{d} {h}:{i}") }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="通知方式" prop="noticeType" width="180" fixed show-overflow-tooltip/>
+            <el-table-column label="通知方式" prop="noticeType" width="180"  show-overflow-tooltip/>
             <el-table-column label="报警级别" prop="warningLevel" width="120" show-overflow-tooltip/>
             <el-table-column label="通知人" prop="noticePreson" show-overflow-tooltip/>
           </el-table>
@@ -241,10 +241,10 @@
     },
     created(){
       this.initialize();
+      this.$set(this,'infoData',this.propsData);
+      this.$set(this.infoDataForm,'noticeId',this.propsData.noticeId);
     },
     mounted(){
-      this.infoData=this.propsData;
-      this.$set(this.infoDataForm,'noticeId',this.propsData.noticeId);
     },
     methods:{
       //初始化