解决缺陷

src/api/resumption/protection.js

@@ -62,3 +62,10 @@ export function subSystemControl(data) {
     data: data
   });
 }
+
+export function updateSubSystemInBook(id,inBook) {
+  return request({
+    url: `/core/resumption/protection/inBook/${id}/${inBook}`,
+    method: "put",
+  });
+}

src/views/iot/subSystem/index.vue

@@ -193,6 +193,16 @@
               v-if="columns[5].visible"
             >
             </el-table-column>
+            <el-table-column label="关联到登记簿" align="center" width="130">
+              <template slot-scope="scope">
+                <el-switch
+                  v-model="scope.row.inBook"
+                  :active-value=1
+                  :inactive-value=0
+                  @change="handleInBookChange(scope.row)"
+                ></el-switch>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="操作">
               <template slot-scope="r">
                 <!-- <el-button
@@ -449,6 +459,17 @@ export default {
       this.selectedOrgName = data.shortName;
       this.getList();
     },
+    // 子系统关联登记簿修改
+    handleInBookChange(row) {
+      let text = row.inBook === 0 ? "取消关联到登记簿" : "关联到登记簿";
+      this.$modal.confirm('确认要报警控制器："' + row.name + '" ' + text + '吗？').then(function() {
+        return api.updateSubSystemInBook(row.id, row.inBook);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+         row.inBook = row.inBook === 0 ? 1 : 0;
+      });
+    },
   },
   mounted() {
     this.intervalId = setInterval(() => {

src/views/safetycheck/task/components/checkRegister.vue

@@ -251,6 +251,7 @@ import { getNamesByOrgId, getAllNames } from "@/api/system/role.js";
 import orgDropDown from "@/components/orgTree/orgDropDown.vue";
 import { arabicToChinese } from "@/utils/util.js";
 import {getRoles} from "@/api/system/public";
+import {getInfo} from "@/api/login";
 export default {
   name: "safetyCheckRegister",
   data() {
@@ -469,6 +470,16 @@ export default {
           }
         }
       }
+      if(!this.taskInfo.signImg)
+      {
+         await getInfo().then((res) => {
+          const user = res.user;     
+          this.taskInfo.signImg=user.signatureSeal;          
+        })
+        .catch((error) => {
+          this.$message.error("获取个人签名图片失败!");
+        });
+      }
       if (isOk) {
         //判断startTime大于endTime就返回
         if (dayjs(this.taskInfo.startTime).isAfter(dayjs(this.taskInfo.endTime))) {

src/views/system/user/extend.vue

@@ -23,7 +23,7 @@
         </h3>
         <el-form inline :model="formData" :rules="rules" ref="form" label-position="left" label-width="140px">
           <el-row>
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
 
               <el-form-item label="是否专职" prop="isFullTime">
                 <el-radio-group v-model="formData.isFullTime">
@@ -38,36 +38,15 @@
               </el-form-item>
 
             </el-col>
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
-              <el-form-item label="持证上岗通过情况" prop="certificateWork" label-width="180">
-                <el-switch v-model="formData.certificateWork" active-value="1" inactive-value="0"></el-switch>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+            
 
-              <el-form-item label="持证上岗未通过原因" v-if="formData.certificateWork == 0" label-width="240"
-                            prop="certificateFailReason">
-                <el-select style="width: 225px;" v-model="formData.certificateFailReason" placeholder="请选择未通过原因">
-                  <el-option v-for="dict in dict.type.post_no_pass" :key="dict.value" :label="dict.label"
-                             :value="dict.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
+           
 
-            <el-col :xs="24" :sm="12" :md="8" :lg="8">
-              <el-form-item label="专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240"
-                            prop="professionalQualifications">
-                <el-input style="width: 240px;" maxlength="50" v-model="formData.professionalQualifications"
-                          placeholder="请输入初级以上证书名称">
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-          </el-row>
-          <el-row>
+          <!-- </el-row>
+          <el-row> -->
 
 
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
               <el-form-item label="所属部门" prop="deptId">
                 <el-select style="width: 217px;" v-model="formData.deptId" placeholder="请选择所属部门">
                   <el-option v-for="dict in dict.type.department_name" :key="dict.value" :label="dict.label"
@@ -76,7 +55,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
               <el-form-item label="现任职务" prop="duties">
                 <el-select style="width: 217px;" v-model="formData.duties" @change="changeDuties" placeholder="请选择现任职务">
                   <el-option v-for="dict in dict.type.current_position" :key="dict.value" :label="dict.label"
@@ -85,8 +64,8 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
-              <el-form-item prop="entryTime" label="任现职日期" label-width="240">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item prop="entryTime" label="任现职日期">
                 <el-date-picker style="width: 270px;" v-model="formData.entryTime"  align="right"
                                 type="date" placeholder="选择任现职日期">
                 </el-date-picker>
@@ -94,10 +73,10 @@
             </el-col>
 
 
-          </el-row>
-          <el-row>
+          <!-- </el-row>
+          <el-row> -->
 
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
               <el-form-item label="用工形式" prop="workType">
                 <el-select style="width: 217px;" v-model="formData.workType" placeholder="请选择用工形式">
                   <el-option v-for="dict in dict.type.sys_work_type" :key="dict.value" :label="dict.label"
@@ -105,7 +84,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
               <el-form-item label="学历取得方式" prop="educationType">
                 <el-select style="width: 217px;" v-model="formData.educationType" placeholder="请选择学历取得方式">
                   <el-option v-for="dict in dict.type.sys_education_type" :key="dict.value" :label="dict.label"
@@ -114,8 +93,8 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
-              <el-form-item label="最高学历" prop="highestEducation" label-width="240">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item label="最高学历" prop="highestEducation">
                 <el-select style="width: 270px;" v-model="formData.highestEducation" placeholder="请选择最高学历">
                   <el-option v-for="dict in dict.type.sys_highest_education" :key="dict.value" :label="dict.label"
                              :value="dict.value" />
@@ -123,25 +102,25 @@
               </el-form-item>
             </el-col>
 
-          </el-row>
-          <el-row>
+          <!-- </el-row>
+          <el-row> -->
 
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
               <el-form-item prop="bornTime" label="出生日期">
                 <el-date-picker v-model="formData.bornTime" @change="startDateChanged"
                                 :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择出生日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
               <el-form-item label="参加工作时间" prop="workTime">
                 <el-date-picker style="width: 217px;" v-model="formData.workTime"
                                 align="right" type="date" placeholder="请选择参加工作时间">
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
-              <el-form-item label="身份证号码" prop="idCard" label-width="240">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item label="身份证号码" prop="idCard" >
                 <el-input maxlength="18" style="width: 270px;" v-model="formData.idCard"
                           placeholder="请输入身份证号码">
                 </el-input>
@@ -149,29 +128,64 @@
             </el-col>
 
 
-          </el-row>
-          <el-row>
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
-              <el-form-item  v-if ="formData.duties==1" label="分管领导姓名" prop="responsibilitiesLeaderName">
-                <el-input maxlength="50" style="width: 217px;" v-model="formData.responsibilitiesLeaderName"
-                          placeholder="请输入分管领导姓名">
+          <!-- </el-row>
+          <el-row> -->
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item label="专业技术职业资格" label-width="240"
+                            prop="professionalQualifications">
+                <el-input style="width: 240px;" maxlength="50" v-model="formData.professionalQualifications"
+                          placeholder="请输入初级以上证书名称">
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :md="8" :lg="6">
-              <el-form-item v-if ="formData.duties==1" label="分管领导职务" prop="responsibilitiesLeaderDuties">
-                <el-select style="width: 217px;" v-model="formData.responsibilitiesLeaderDuties" placeholder="请选择分管领导职务">
-                  <el-option v-for="dict in dict.type.sys_duties" :key="dict.value" :label="dict.label"
+
+
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item label="金融安全防范工程专家" prop="financialExperts" label-width="240">
+                <el-select style="width: 210px;" v-model="formData.financialExperts" placeholder="请选择金融安全防范工程专家">
+                  <el-option v-for="dict in dict.type.administrative_level" :key="dict.value" :label="dict.label"
                              :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
 
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item label="持证上岗通过情况" prop="certificateWork" label-width="180">
+                <!-- <el-switch v-model="formData.certificateWork" @change="certificateWorkChanged" active-value="1" inactive-value="0"></el-switch> -->
+               
+                <el-radio-group v-model="formData.certificateWork" @change="certificateWorkChanged">
+                  <el-radio
+                    v-for="dict in dict.type.sys_yes_no_num"
+                    :key="`${dict.value}`"
+                    :label="dict.value"
 
+                  >{{ dict.label }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :md="8" :lg="8">
-              <el-form-item label="金融安全防范工程专家" prop="financialExperts" label-width="240">
-                <el-select style="width: 210px;" v-model="formData.financialExperts" placeholder="请选择金融安全防范工程专家">
-                  <el-option v-for="dict in dict.type.administrative_level" :key="dict.value" :label="dict.label"
+
+              <el-form-item label="持证上岗未通过原因" v-if="formData.certificateWork == 0" label-width="240"
+                            prop="certificateFailReason">
+                <el-select style="width: 225px;" v-model="formData.certificateFailReason" placeholder="请选择未通过原因">
+                  <el-option v-for="dict in dict.type.post_no_pass" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item  v-if ="formData.duties==1" label="分管领导姓名" prop="responsibilitiesLeaderName">
+                <el-input maxlength="50" style="width: 217px;" v-model="formData.responsibilitiesLeaderName"
+                          placeholder="请输入分管领导姓名">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item v-if ="formData.duties==1" label="分管领导职务" prop="responsibilitiesLeaderDuties">
+                <el-select style="width: 217px;" v-model="formData.responsibilitiesLeaderDuties" placeholder="请选择分管领导职务">
+                  <el-option v-for="dict in dict.type.sys_duties" :key="dict.value" :label="dict.label"
                              :value="dict.value" />
                 </el-select>
               </el-form-item>
@@ -205,7 +219,7 @@ import { deptTreeList } from "@/api/system/public";
 
 import { extendUserInformation } from "@/api/system/information";
 export default {
-  dicts: ['administrative_level','sys_yes_no','sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
+  dicts: ['administrative_level','sys_yes_no','sys_yes_no_num','sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
   fillter: {},
   components: { TreeSelect ,ImgsUpload},
   props: [],
@@ -415,7 +429,19 @@ export default {
   methods: {
     changeDuties(val){
       console.log(val);
-      this.formData.aloneDept = 'N'
+      // this.formData.aloneDept = 'N'
+      if(val!=1)
+      {
+        this.formData.responsibilitiesLeaderName="";
+        this.formData.responsibilitiesLeaderDuties="";
+      }
+    },
+    certificateWorkChanged(value)
+    {
+      if(value!=0)
+      {
+        this.formData.certificateFailReason="";   
+      }      
     },
 //身份证
 checkIdCard(val){