zc

src/views/emergencyManagement/plan/index.vue

@@ -94,7 +94,9 @@
     <association-page v-if="pageType == 4" :associationData="associationData"></association-page>
     <!--  关联记录  -->
     <el-dialog title='关联记录' @close="handleClose"  :visible.sync="dialogVisible2" width="80%">
-      <relevance-record-page v-if="pageType == 3" :pageData3="pageData3"></relevance-record-page>
+      <div class="scrollbar-box" style="padding:0;margin:0 auto;height:700px;overflow-y: scroll;display: flex;flex-direction: column;flex:1;">
+        <relevance-record-page v-if="pageType == 3" :pageData3="pageData3" style="display: flex;flex-direction: column;flex:1;"></relevance-record-page>
+      </div>
     </el-dialog>
   </div>
 </template>

src/views/emergencyManagement/smartLoT/sensor/index.vue

@@ -50,7 +50,7 @@
       <el-table-column label="学院" align="left" prop="deptName" />
       <el-table-column label="实验室" align="left" prop="subjectName" />
       <el-table-column label="路由" align="left" prop="routeNum" />
-      <el-table-column label="状态" align="left" prop="senseState.name" />
+      <el-table-column label="状态" align="left" prop="senseState" />
       <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
         <template slot-scope="scope">
           <div class="button-box">

src/views/gasManage_syd/manage/gasUseManage/gasUseManage.vue

@@ -189,7 +189,6 @@ export default {
               if(response.code==200){
                 _this.dialogVisible=false;
                 _this.getList()
-
               }
             });
           }

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/msds/addPage.vue

@@ -12,7 +12,7 @@
         <el-form-item label="化学品编号" prop="code" style="width:498px;">
           <el-input v-model="form.code" placeholder="请输入化学品编号" maxLength="20" style="width:500px;"/>
         </el-form-item>
-        <el-form-item label="化学品详情" prop="content" style="color:#606266;font-size:16px;font-weight:500;">
+        <el-form-item label="化学品详情" prop="content" style="color:#606266;font-size:16px;font-weight:500;" class="wang-editor-form-item-box">
           <wangEditor :content="form.content" placeholder="请输入化学品详情" @change="change" :min-height="192" style="width:1000px;"/>
         </el-form-item>
       </el-form>
@@ -129,3 +129,10 @@
     }
   }
 </style>
+<style lang="scss">
+  .wang-editor-form-item-box{
+    .el-form-item__content{
+      z-index:0;
+    }
+  }
+</style>

src/views/securityCheck/checkRecord/unsubmittedInfo.vue

@@ -320,6 +320,9 @@
           name: [
             { required: true, message: "请输入检查项名称", trigger: "blur" }
           ],
+          checkName: [
+            { required: true, message: "请输入检查名称", trigger: "blur" }
+          ],
           idList: [
             { required: true, message: "请选择目录", trigger: "blur" }
           ],