zc

src/views/emergencyManagement/functionManage/deviceFunction/index.vue

@@ -19,7 +19,7 @@
               <el-option label="物联设备" :value="2"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="typeKey">
+          <el-form-item label="" prop="typeKey" v-if="queryParams.typeSource">
             <el-select v-model="queryParams.typeKey" placeholder="请选择设备类型" style="width: 200px">
               <el-option
                 v-for="dict in queryOptionList"

src/views/integratedManagement/laboratoryManagement/subject/associationConfiguration.vue

@@ -34,8 +34,8 @@
                       v-model="form.checkCount" style="width:250px;">
               <template slot="prepend" style="height:20px;">次</template>
               <div slot="append" style="display: flex;flex-direction: column;">
-                <p class="el-icon-arrow-up" @click="addNum" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
-                <p class="el-icon-arrow-down" @click="reduceNum" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>
+                <p class="el-icon-arrow-up" @click="addCheckCount" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
+                <p class="el-icon-arrow-down" @click="reduceCheckCount" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>
               </div>
             </el-input>
           </el-form-item>
@@ -62,8 +62,8 @@
                       v-model="form.signTime" style="width:250px;">
               <template slot="prepend" style="height:20px;">小时</template>
               <div slot="append" style="display: flex;flex-direction: column;">
-                <p class="el-icon-arrow-up" @click="addNumOne" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
-                <p class="el-icon-arrow-down" @click="reduceNumOne" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>
+                <p class="el-icon-arrow-up" @click="addSignTime" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
+                <p class="el-icon-arrow-down" @click="reduceSignTime" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>
               </div>
             </el-input>
           </el-form-item>
@@ -94,8 +94,8 @@
                       v-model="form.inspectCheckCount" style="width:250px;">
               <template slot="prepend" style="height:20px;">次</template>
               <div slot="append" style="display: flex;flex-direction: column;">
-                <p class="el-icon-arrow-up" @click="addNum" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
-                <p class="el-icon-arrow-down" @click="reduceNum" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>
+                <p class="el-icon-arrow-up" @click="addInspectCheckCount" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
+                <p class="el-icon-arrow-down" @click="reduceInspectCheckCount" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>
               </div>
             </el-input>
           </el-form-item>
@@ -106,8 +106,8 @@
                       v-model="form.inspectSignTime" style="width:250px;">
               <template slot="prepend" style="height:20px;">小时</template>
               <div slot="append" style="display: flex;flex-direction: column;">
-                <p class="el-icon-arrow-up" @click="addNumOne" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
-                <p class="el-icon-arrow-down" @click="reduceNumOne" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>
+                <p class="el-icon-arrow-up" @click="addInspectSignTime" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
+                <p class="el-icon-arrow-down" @click="reduceInspectSignTime" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>
               </div>
             </el-input>
           </el-form-item>
@@ -470,22 +470,42 @@
           }
         }
       },
-      addNum(){
+      addCheckCount(){
         if(this.form.checkCount<99){
           this.form.checkCount++
         }
       },
-      reduceNum(){
+      reduceCheckCount(){
         if(this.form.checkCount>2){
           this.form.checkCount--
         }
       },
-      addNumOne(){
+      addSignTime(){
+        if(this.form.signTime<99){
+          this.form.signTime++
+        }
+      },
+      reduceSignTime(){
+        if(this.form.signTime>2){
+          this.form.signTime--
+        }
+      },
+      addInspectCheckCount(){
+        if(this.form.inspectCheckCount<99){
+          this.form.inspectCheckCount++
+        }
+      },
+      reduceInspectCheckCount(){
+        if(this.form.inspectCheckCount>2){
+          this.form.inspectCheckCount--
+        }
+      },
+      addInspectSignTime(){
         if(this.form.inspectSignTime<99){
           this.form.inspectSignTime++
         }
       },
-      reduceNumOne(){
+      reduceInspectSignTime(){
         if(this.form.inspectSignTime>2){
           this.form.inspectSignTime--
         }

src/views/integratedManagement/laboratoryManagement/subject/index.vue

@@ -101,7 +101,7 @@
               </template>
             </el-table-column>
             <el-table-column label="实验室责任人" align="left" prop="adminName" width="120" show-overflow-tooltip/>
-            <el-table-column label="安全责任人" align="left" prop="safeUserNames" width="120" show-overflow-tooltip/>
+            <el-table-column label="安全员" align="left" prop="safeUserNames" width="120" show-overflow-tooltip/>
             <el-table-column label="操作" align="left" width="140">
               <template slot-scope="scope">
                 <div class="table-button-box">

src/views/integratedManagement/laboratoryManagement/subject/infoPage.vue

@@ -46,8 +46,8 @@
               </div>
             </div>
             <div class="for-text-box">
-              <p class="info-title">灭火要点：{{!subjectData.outfire?'未配置':''}}</p>
-              <div class="for-box" v-for="(item,index1) in subjectData.outfire" :key="index1">
+              <p class="info-title">灭火要点：{{!subjectData.outFire?'未配置':''}}</p>
+              <div class="for-box" v-for="(item,index1) in subjectData.outFire" :key="index1">
                 <p class="for-info-p" v-for="(minItem,index2) in extinguishingKeyPoints" :key="index2" v-if="minItem.value == item">● {{minItem.label}}</p>
               </div>
             </div>

src/views/systemManagement/organizationalStructure/index.vue

@@ -102,7 +102,9 @@
         </el-form-item>
         <el-form-item label="部门编号" prop="deptNum" label-width="90px" v-if="treeForm.parentId != 0">
           <el-input v-model="treeForm.deptNum" maxlength="15"
-                    onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" placeholder="请输入部门编号"/>
+                    onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
+                    @blur="treeForm.deptNum = $event.target.value"
+                    placeholder="请输入部门编号"/>
         </el-form-item>
         <el-form-item label="部门名称" prop="deptName" label-width="90px">
           <el-input v-model="treeForm.deptName" maxlength="15" placeholder="请输入部门名称"/>
@@ -143,7 +145,10 @@
                v-for="(item,index) in treeAddForm.teaCherDpetList" :key="index">
             <div style="width:490px;">
               <el-form-item label="部门编号" :prop="'teaCherDpetList.' + index + '.deptNum'" :rules="rules.deptNum" label-width="90px">
-                <el-input v-model="item.deptNum" onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" maxlength="15" placeholder="请输入部门编号"/>
+                <el-input v-model="item.deptNum"
+                          onkeyup="value=value.replace(/[^\d]/g,'')"
+                          @blur="item.deptNum = $event.target.value"
+                          maxlength="15" placeholder="请输入部门编号"/>
               </el-form-item>
               <el-form-item label="部门名称" :prop="'teaCherDpetList.' + index + '.deptName'" :rules="rules.deptName" label-width="90px">
                 <el-input v-model="item.deptName" maxlength="15" placeholder="请输入部门名称"/>