zc

src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue

@@ -74,8 +74,8 @@
     <!-- 添加或修改传感器对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body class="recognizer-dialog-box add-hardware-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" >
-        <el-form-item label="识别器编号" prop="hardwareNum">
-          <el-input v-model="form.hardwareNum" placeholder="请输入识别器编号" />
+        <el-form-item label="检测门编号" prop="hardwareNum">
+          <el-input v-model="form.hardwareNum" placeholder="请输入检测门编号" />
         </el-form-item>
         <el-form-item label="IP地址" >
           <el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
@@ -174,10 +174,10 @@ export default {
       // 表单校验
       rules: {
         name:[
-          {required: true, message: '识别器名称不能为空', trigger: 'blur'}
+          {required: true, message: '检测门名称不能为空', trigger: 'blur'}
         ],
         hardwareNum:[
-          {required: true, message: '识别器编号不能为空', trigger: 'blur'}
+          {required: true, message: '检测门编号不能为空', trigger: 'blur'}
         ],
         subjectId:[
           {required: true, message: '所属实验室不能为空', trigger: 'blur'}
@@ -281,12 +281,12 @@ export default {
       this.reset();
 
       this.open = true;
-      this.title = "新增识别器";
+      this.title = "新增检测门";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.open = true;
-      this.title = "修改识别器";
+      this.title = "修改检测门";
       this.form.id=row.id
       this.form.type='RFID_RECOGNIZER'
       this.form.hardwareNum=row.hardwareNum

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

@@ -5,7 +5,7 @@
       <p>{{addPropsData.id?'编辑化学品':'新增化学品'}}</p>
       <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
     </div>
-    <div class="listPage-min">
+    <div class="listPage-min scrollbar-box">
       <el-form :model="formData" ref="form" :inline="true" :rules="rules" label-width="120px">
         <div class="form-min-box">
           <el-form-item label="化学品名：" prop="chemicalName">
@@ -89,9 +89,9 @@
             </el-select>
           </el-form-item>
         </div>
-        <div>
+        <div class="form-el-checkbox-group">
           <el-form-item label="属性：" prop="classifyAttribute">
-            <el-checkbox-group v-model="formData.classifyAttribute" style="margin-top:2px;">
+            <el-checkbox-group v-model="formData.classifyAttribute" style="margin-top:2px;flex:1;">
               <el-checkbox v-for="item in optionsListTwo" :label="item.dictValue"
                            :key="item.dictValue">{{item.dictLabel}}</el-checkbox>
             </el-checkbox-group>
@@ -333,7 +333,6 @@
       flex:1;
       display: flex;
       flex-direction: column;
-      overflow: hidden;
       padding:20px;
       .form-min-box{
         display: inline-block;
@@ -359,7 +358,7 @@
       .bottom-button-box{
         display: flex;
         width:160px;
-        margin:40px auto;
+        margin:40px auto 20px;
         .left-button{
           margin-right:20px;
         }
@@ -368,14 +367,32 @@
   }
 </style>
 <style lang="scss">
-  .criticality-input{
-    .el-input-number__decrease,.el-input-number__increase{
-      display: none;
-    }
-    .el-input-number .el-input{
-      input{
-        padding:0 15px;
-        text-align: left;
+  .listPage{
+    .listPage-min{
+      .criticality-input{
+        .el-input-number__decrease,.el-input-number__increase{
+          display: none;
+        }
+        .el-input-number .el-input{
+          input{
+            padding:0 15px;
+            text-align: left;
+          }
+        }
+      }
+      .form-el-checkbox-group{
+        .el-form-item{
+          display: flex;
+          .el-form-item__label{
+            width:120px;
+          }
+          .el-form-item__content{
+            flex:1;
+          }
+          .el-checkbox{
+            display: inline-block;
+          }
+        }
       }
     }
   }

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/rfidIdentifier/index.vue

@@ -1,4 +1,4 @@
-<!--RFID识别器-->
+<!--RFID检测门-->
 <template>
   <div class="app-container rfidIdentifier">
     <el-form :model="queryParamsData" class="form-box" ref="queryForm" :inline="true">
@@ -58,7 +58,7 @@
       </el-form-item>
     </el-form>
     <el-table  border :data="tableList" ref="multipleTable">
-      <el-table-column label="RFID识别器编号" align="center" prop="hardwareNum"/>
+      <el-table-column label="RFID检测门编号" align="center" prop="hardwareNum"/>
       <el-table-column label="学院" align="center" prop="deptName" width="250"/>
       <el-table-column label="位置" align="center" prop="posi" width="250" show-overflow-tooltip/>
       <el-table-column label="设备状态" align="center" prop="status" width="100">
@@ -120,7 +120,7 @@
     <!--新增/编辑-->
     <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="540px" append-to-body class="add-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
-        <el-form-item label="RFID识别器编号：" prop="hardwareNum">
+        <el-form-item label="RFID检测门编号：" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="最大20个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>
         </el-form-item>
         <el-form-item label="实验室：" prop="subjectId">