徐明浩

危害工作票-B栏后续、C栏安全保护设备的施工未实现多选框

master/src/main/java/com/ruoyi/project/ticket/controller/TDelayPermitController.java

@@ -10,6 +10,7 @@ import com.ruoyi.project.ticket.domain.TDelayPermitOther;
 import com.ruoyi.project.ticket.domain.TDelayPermitVo;
 import com.ruoyi.project.ticket.service.ITDelayPermitOtherService;
 import com.ruoyi.project.ticket.service.ITDelayPermitService;
+import com.ruoyi.project.ticket.service.ITHazardWorkPermitService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,6 +34,9 @@ public class TDelayPermitController extends BaseController {
     @Autowired
     private ITDelayPermitOtherService tDelayPermitOtherService;
 
+    @Autowired
+    private ITHazardWorkPermitService itHazardWorkPermitService;
+
     /**
      * 查询延期票主体对象列表
      */
@@ -62,11 +66,11 @@ public class TDelayPermitController extends BaseController {
     @Log(title = "延期票主体对象", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TDelayPermitVo vo) {
-        //TODO 保存延期票附属数据，返回附属ID
+        // 保存延期票附属数据，返回附属ID
         TDelayPermitOther other = new TDelayPermitOther();
         BeanUtils.copyProperties(vo, other);
         this.tDelayPermitOtherService.insertTDelayPermitOther(other);
-        //TODO 保存延期票主体数据，返回延期票ID
+        // 保存延期票主体数据，返回延期票ID
         TDelayPermit delay = new TDelayPermit();
         BeanUtils.copyProperties(vo, delay);
         delay.setOtherId(other.getId());

master/src/main/java/com/ruoyi/project/ticket/domain/THazardWorkPermit.java

@@ -128,6 +128,11 @@ public class THazardWorkPermit extends BaseEntity {
      */
     @Excel(name = "装置设备名称")
     private String bDeviceName;
+    /**
+     * 装置设备后续
+     */
+    @Excel(name = "装置设备后续")
+    private String bDeviceWork;
     /**
      * 工作内容描述
      */
@@ -270,6 +275,21 @@ public class THazardWorkPermit extends BaseEntity {
      */
     @Excel(name = "施工对生产单位的危害内容")
     private String cIsHazardsProdContent;
+    /**
+     * 是否电仪安全保护设备
+     */
+    @Excel(name = "是否电仪安全保护设备")
+    private String cIsDy;
+    /**
+     * 是否安全阀
+     */
+    @Excel(name = "是否安全阀")
+    private String cIsAqf;
+    /**
+     * 是否冷却系统
+     */
+    @Excel(name = "是否冷却系统")
+    private String cIsLq;
     /**
      * 是否火灾或爆炸危害
      */
@@ -3210,6 +3230,38 @@ public class THazardWorkPermit extends BaseEntity {
         return mOtherLicenceThree;
     }
 
+    public String getbDeviceWork() {
+        return bDeviceWork;
+    }
+
+    public void setbDeviceWork(String bDeviceWork) {
+        this.bDeviceWork = bDeviceWork;
+    }
+
+    public String getcIsDy() {
+        return cIsDy;
+    }
+
+    public void setcIsDy(String cIsDy) {
+        this.cIsDy = cIsDy;
+    }
+
+    public String getcIsAqf() {
+        return cIsAqf;
+    }
+
+    public void setcIsAqf(String cIsAqf) {
+        this.cIsAqf = cIsAqf;
+    }
+
+    public String getcIsLq() {
+        return cIsLq;
+    }
+
+    public void setcIsLq(String cIsLq) {
+        this.cIsLq = cIsLq;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

master/src/main/resources/mybatis/configuration/TMatterMapper.xml

@@ -30,10 +30,8 @@
                d.matter_name,
                d.matter_type,
                d.matter_features,
-               d.matter_protects,
-               s.dept_name
+               d.matter_protects
         from t_matter d
-                 left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
     <sql id="selectTMatterVo2">

master/src/main/resources/mybatis/ticket/THazardWorkPermitMapper.xml

@@ -24,6 +24,7 @@
         <result property="aSafeLiaisonTel" column="a_safe_liaison_tel"/>
         <result property="aSafeLiaisonOffice" column="a_safe_liaison_office"/>
         <result property="bDeviceName" column="b_device_name"/>
+        <result property="bDeviceWork" column="b_device_work"/>
         <result property="bWorkContent" column="b_work_content"/>
         <result property="bValidityStartTime" column="b_validity_start_time"/>
         <result property="bValidityEndTime" column="b_validity_end_time"/>
@@ -52,6 +53,9 @@
         <result property="cOtherDangerContent" column="c_other_danger_content"/>
         <result property="cIsHazardsProd" column="c_is_hazards_prod"/>
         <result property="cIsHazardsProdContent" column="c_is_hazards_prod_content"/>
+        <result property="cIsDy" column="c_is_dy"/>
+        <result property="cIsAqf" column="c_is_aqf"/>
+        <result property="cIsLq" column="c_is_lq"/>
         <result property="cIsFire" column="c_is_fire"/>
         <result property="cHId" column="c_h_id"/>
         <result property="bAreaNo" column="b_area_no"/>
@@ -267,6 +271,7 @@
                d.a_safe_liaison_tel,
                d.a_safe_liaison_office,
                d.b_device_name,
+               d.b_device_work,
                d.b_work_content,
                d.b_validity_start_time,
                d.b_validity_end_time,
@@ -295,6 +300,9 @@
                d.c_other_danger_content,
                d.c_is_hazards_prod,
                d.c_is_hazards_prod_content,
+               d.c_is_dy,
+               d.c_is_aqf,
+               d.c_is_lq,
                d.c_is_fire,
                d.c_h_id,
                d.b_area_no,
@@ -525,6 +533,7 @@
             <if test="aSafeLiaisonTel != null">a_safe_liaison_tel,</if>
             <if test="aSafeLiaisonOffice != null">a_safe_liaison_office,</if>
             <if test="bDeviceName != null">b_device_name,</if>
+            <if test="bDeviceWork != null">b_device_work,</if>
             <if test="bWorkContent != null">b_work_content,</if>
             <if test="bValidityStartTime != null">b_validity_start_time,</if>
             <if test="bValidityEndTime != null">b_validity_end_time,</if>
@@ -553,6 +562,9 @@
             <if test="cOtherDangerContent != null">c_other_danger_content,</if>
             <if test="cIsHazardsProd != null">c_is_hazards_prod,</if>
             <if test="cIsHazardsProdContent != null">c_is_hazards_prod_content,</if>
+            <if test="cIsDy != null">c_is_dy,</if>
+            <if test="cIsAqf != null">c_is_aqf,</if>
+            <if test="cIsLq != null">c_is_lq,</if>
             <if test="cIsFire != null">c_is_fire,</if>
             <if test="cHId != null">c_h_id,</if>
             <if test="bAreaNo != null">b_area_no,</if>
@@ -767,6 +779,7 @@
             <if test="aSafeLiaisonTel != null">#{aSafeLiaisonTel},</if>
             <if test="aSafeLiaisonOffice != null">#{aSafeLiaisonOffice},</if>
             <if test="bDeviceName != null">#{bDeviceName},</if>
+            <if test="bDeviceWork != null">#{bDeviceWork},</if>
             <if test="bWorkContent != null">#{bWorkContent},</if>
             <if test="bValidityStartTime != null">#{bValidityStartTime},</if>
             <if test="bValidityEndTime != null">#{bValidityEndTime},</if>
@@ -795,6 +808,9 @@
             <if test="cOtherDangerContent != null">#{cOtherDangerContent},</if>
             <if test="cIsHazardsProd != null">#{cIsHazardsProd},</if>
             <if test="cIsHazardsProdContent != null">#{cIsHazardsProdContent},</if>
+            <if test="cIsDy != null">#{cIsDy},</if>
+            <if test="cIsAqf != null">#{cIsAqf},</if>
+            <if test="cIsLq != null">#{cIsLq},</if>
             <if test="cIsFire != null">#{cIsFire},</if>
             <if test="cHId != null">#{cHId},</if>
             <if test="bAreaNo != null">#{bAreaNo},</if>
@@ -1012,6 +1028,7 @@
             <if test="aSafeLiaisonTel != null">a_safe_liaison_tel = #{aSafeLiaisonTel},</if>
             <if test="aSafeLiaisonOffice != null">a_safe_liaison_office = #{aSafeLiaisonOffice},</if>
             <if test="bDeviceName != null">b_device_name = #{bDeviceName},</if>
+            <if test="bDeviceWork != null">b_device_work = #{bDeviceWork},</if>
             <if test="bWorkContent != null">b_work_content = #{bWorkContent},</if>
             <if test="bValidityStartTime != null">b_validity_start_time = #{bValidityStartTime},</if>
             <if test="bValidityEndTime != null">b_validity_end_time = #{bValidityEndTime},</if>
@@ -1040,6 +1057,9 @@
             <if test="cOtherDangerContent != null">c_other_danger_content = #{cOtherDangerContent},</if>
             <if test="cIsHazardsProd != null">c_is_hazards_prod = #{cIsHazardsProd},</if>
             <if test="cIsHazardsProdContent != null">c_is_hazards_prod_content = #{cIsHazardsProdContent},</if>
+            <if test="cIsDy != null">c_is_dy = #{cIsDy},</if>
+            <if test="cIsAqf != null">c_is_aqf = #{cIsAqf},</if>
+            <if test="cIsLq != null">c_is_lq = #{cIsLq},</if>
             <if test="cIsFire != null">c_is_fire = #{cIsFire},</if>
             <if test="cHId != null">c_h_id = #{cHId},</if>
             <if test="bAreaNo != null">b_area_no = #{bAreaNo},</if>

ui/src/views/configuration/matter/index.vue

@@ -8,7 +8,7 @@
       </el-form-item>
       <el-form-item label="危害物质名称" prop="matterName">
         <el-input v-model="queryParams.matterName" placeholder="请输入危害物质名称" clearable size="small"
-                  @keyup.enter.native="handleQuery" />
+                  @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -56,12 +56,12 @@
 
     <el-table v-loading="loading" :data="matterList" @selection-change="handleSelectionChange" :height="clientHeight"
               border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="id" :show-overflow-tooltip="true" />
-      <el-table-column label="危害物质名称" align="center" prop="matterName" :show-overflow-tooltip="true" />
-      <el-table-column label="相关危害集合" align="center" prop="matterFeatures" :show-overflow-tooltip="true" />
-      <el-table-column label="相关防护措施集合" align="center" prop="matterProtects" :show-overflow-tooltip="true" />
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="编号" align="center" prop="id" :show-overflow-tooltip="true"/>
+      <el-table-column label="危害物质名称" align="center" prop="matterName" :show-overflow-tooltip="true"/>
+      <el-table-column label="相关危害集合" align="center" prop="matterFeatures" :show-overflow-tooltip="true"/>
+      <el-table-column label="相关防护措施集合" align="center" prop="matterProtects" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -75,13 +75,13 @@
     </el-table>
 
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-                @pagination="getList" />
+                @pagination="getList"/>
 
     <!-- 添加或修改危害物质数据关联对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="危害物质名称" prop="matterName">
-          <el-input v-model="form.matterName" placeholder="请输入危害物质名称" style="width: 200px;" />
+          <el-input v-model="form.matterName" placeholder="请输入危害物质名称" style="width: 200px;"/>
         </el-form-item>
         <el-form-item label="请选择相关危害">
           <table>
@@ -127,31 +127,31 @@
             </tr>
             <tr style="text-align: center;">
               <td style="width: 50px;">毒性<br>
-                <el-checkbox v-model="cIsToxic" true-label="1" false-label="0" />
+                <el-checkbox v-model="cIsToxic" true-label="1" false-label="0"/>
               </td>
               <td style="width: 50px;">易燃性<br>
-                <el-checkbox v-model="cIsFlammable" true-label="1" false-label="0" />
+                <el-checkbox v-model="cIsFlammable" true-label="1" false-label="0"/>
               </td>
               <td style="width: 50px;">氧化性<br>
-                <el-checkbox v-model="cIsOxidizing" true-label="1" false-label="0" />
+                <el-checkbox v-model="cIsOxidizing" true-label="1" false-label="0"/>
               </td>
               <td style="width: 50px;">爆炸性<br>
-                <el-checkbox v-model="cIsExplosive" true-label="1" false-label="0" />
+                <el-checkbox v-model="cIsExplosive" true-label="1" false-label="0"/>
               </td>
               <td style="width: 50px;">腐蚀性<br>
-                <el-checkbox v-model="cIsCorrosive" true-label="1" false-label="0" />
+                <el-checkbox v-model="cIsCorrosive" true-label="1" false-label="0"/>
               </td>
               <td style="width: 120px;">刺激性/致敏性/毒性<br>
-                <el-checkbox v-model="cIsIrritantToxic" true-label="1" false-label="0" />
+                <el-checkbox v-model="cIsIrritantToxic" true-label="1" false-label="0"/>
               </td>
               <td style="width: 70px;">健康危害<br>
-                <el-checkbox v-model="cIsHealthHazard" true-label="1" false-label="0" />
+                <el-checkbox v-model="cIsHealthHazard" true-label="1" false-label="0"/>
               </td>
               <td style="width: 70px;">压力下气体<br>
-                <el-checkbox v-model="cIsCompressedGas" true-label="1" false-label="0" />
+                <el-checkbox v-model="cIsCompressedGas" true-label="1" false-label="0"/>
               </td>
               <td style="width: 90px;">危害水生环境<br>
-                <el-checkbox v-model="cIsEnvironmentalHazard" true-label="1" false-label="0" />
+                <el-checkbox v-model="cIsEnvironmentalHazard" true-label="1" false-label="0"/>
               </td>
             </tr>
           </table>
@@ -227,7 +227,7 @@
           <el-input v-model="form.matterProtects" placeholder="请输入相关防护措施集合" />
         </el-form-item> -->
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" style="width: 500px;" />
+          <el-input v-model="form.remarks" placeholder="请输入备注" style="width: 500px;"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -246,7 +246,7 @@
           <em>点击上传</em>
         </div>
         <div class="el-upload__tip" slot="tip">
-          <el-checkbox v-model="upload.updateSupport" />
+          <el-checkbox v-model="upload.updateSupport"/>
           是否更新已经存在的用户数据
           <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
         </div>
@@ -294,22 +294,22 @@ export default {
         protectType: '2',
       },
       protectGloves: [], //防护眼镜
-      safeGoggle:null,
+      safeGoggle: null,
       safeGogglesParams: {
         protectType: '1',
       },
       safeGoggles: [], //防护手套
-      resProtect:null,
+      resProtect: null,
       resProtectsParams: {
         protectType: '3',
       },
       resProtects: [], //防护面罩
-      rubberBoot:null,
+      rubberBoot: null,
       rubberBootsParams: {
         protectType: '4',
       },
       rubberBoots: [], //防护靴
-      protectSuit:null,
+      protectSuit: null,
       protectSuitsParams: {
         protectType: '5',
       },
@@ -323,6 +323,8 @@ export default {
       cIsHealthHazard: null,
       cIsCompressedGas: null,
       cIsEnvironmentalHazard: null,
+      matterFeatures: [],
+      matterProtects: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -438,6 +440,15 @@ export default {
     },
     // 表单重置
     reset() {
+      this.cIsToxic = null;
+      this.cIsFlammable = null;
+      this.cIsOxidizing = null;
+      this.cIsExplosive = null;
+      this.cIsCorrosive = null;
+      this.cIsIrritantToxic = null;
+      this.cIsHealthHazard = null;
+      this.cIsCompressedGas = null;
+      this.cIsEnvironmentalHazard = null;
       this.form = {
         id: null,
         delFlag: null,
@@ -478,10 +489,111 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改危害物质数据关联";
+
+        if (this.form.matterFeatures != null) {
+          var mf = this.form.matterFeatures.split(",");
+          mf.forEach(t => {
+            if (t == 1) {
+              this.cIsToxic = "1";
+            }
+            if (t == 2) {
+              this.cIsFlammable = "1";
+            }
+            if (t == 3) {
+              this.cIsOxidizing = "1";
+            }
+            if (t == 4) {
+              this.cIsExplosive = "1";
+            }
+            if (t == 5) {
+              this.cIsCorrosive = "1";
+            }
+            if (t == 6) {
+              this.cIsIrritantToxic = "1";
+            }
+            if (t == 7) {
+              this.cIsHealthHazard = "1";
+            }
+            if (t == 8) {
+              this.cIsCompressedGas = "1";
+            }
+            if (t == 9) {
+              this.cIsEnvironmentalHazard = "1";
+            }
+          })
+        }
       });
     },
+    //处理选择框
+    handleCheck() {
+      var a = 0;
+      for (let i = 0; i < 9; i++) {
+        if (i == 0 && this.cIsToxic != null) {
+          this.matterFeatures[a] = "1";
+          a++;
+        }
+        if (i == 1 && this.cIsFlammable != null) {
+          this.matterFeatures[a] = "2";
+          a++;
+        }
+        if (i == 2 && this.cIsOxidizing != null) {
+          this.matterFeatures[a] = "3";
+          a++;
+        }
+        if (i == 3 && this.cIsExplosive != null) {
+          this.matterFeatures[a] = "4";
+          a++;
+        }
+        if (i == 4 && this.cIsCorrosive != null) {
+          this.matterFeatures[a] = "5";
+          a++;
+        }
+        if (i == 5 && this.cIsIrritantToxic != null) {
+          this.matterFeatures[a] = "6";
+          a++;
+        }
+        if (i == 6 && this.cIsHealthHazard != null) {
+          this.matterFeatures[a] = "7";
+          a++;
+        }
+        if (i == 7 && this.cIsCompressedGas != null) {
+          this.matterFeatures[a] = "8";
+          a++;
+        }
+        if (i == 8 && this.cIsEnvironmentalHazard != null) {
+          this.matterFeatures[a] = "9";
+          a++;
+        }
+      }
+      var b = 0;
+      for (let i = 0; i < 5; i++) {
+        if (i == 0 && this.protectGlove != null) {
+          this.matterProtects[b] = this.protectGlove;
+          b++;
+        }
+        if (i == 1 && this.safeGoggle != null) {
+          this.matterProtects[b] = this.safeGoggle;
+          b++;
+        }
+        if (i == 2 && this.resProtect != null) {
+          this.matterProtects[b] = this.resProtect;
+          b++;
+        }
+        if (i == 3 && this.rubberBoot != null) {
+          this.matterProtects[b] = this.rubberBoot;
+          b++;
+        }
+        if (i == 4 && this.protectSuit != null) {
+          this.matterProtects[b] = this.protectSuit;
+          b++;
+        }
+      }
+    },
     /** 提交按钮 */
     submitForm() {
+      this.handleCheck();
+      this.form.matterFeatures = this.matterFeatures.join(",");
+      this.form.matterProtects = this.matterProtects.join(",");
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -507,7 +619,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return delMatter(ids);
       }).then(() => {
         this.getList();
@@ -521,7 +633,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return exportMatter(queryParams);
       }).then(response => {
         this.download(response.msg);

ui/src/views/invoicing/hazardwork/index.vue

@@ -152,7 +152,7 @@
                         <el-option v-for="item in bDevices" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                       </el-select>
-                      <el-input style="width: 350px;" placeholder="请输入后续"/>
+                      <el-input style="width: 350px;" v-model="form.bDeviceWork" placeholder="请输入后续"/>
                     </td>
                     <td>位置/区域号：
                       <el-input style="width: 200px;" v-model="form.bAreaNo"/>
@@ -339,11 +339,14 @@
                       <el-checkbox v-model="form.cIsWorkProtective" true-label="1" false-label="0"/>
                     </td>
                     <td colspan="5">安全保护设备的施工(
-                      <el-checkbox/>
+                      <el-checkbox v-model="form.cIsDy" true-label="1" false-label="0"
+                                   :disabled="form.cIsWorkProtective==1?false:true"/>
                       电仪安全保护设备
-                      <el-checkbox/>
+                      <el-checkbox v-model="form.cIsAqf" true-label="1" false-label="0"
+                                   :disabled="form.cIsWorkProtective==1?false:true"/>
                       安全阀
-                      <el-checkbox/>
+                      <el-checkbox v-model="form.cIsLq" true-label="1" false-label="0"
+                                   :disabled="form.cIsWorkProtective==1?false:true"/>
                       冷却系统)
                     </td>
                   </tr>
@@ -1512,7 +1515,8 @@
                     <td>签名：
                       <el-input style="width: 60px;" v-model="form.hSafeMesSign">
                       </el-input>
-                      <el-button type="primary" slot="append" @click="signCard('hSafeMesSign')" icon="el-icon-edit"></el-button>
+                      <el-button type="primary" slot="append" @click="signCard('hSafeMesSign')"
+                                 icon="el-icon-edit"></el-button>
 
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" v-model="form.hSafeMesDate" type="datetime">
@@ -1792,7 +1796,7 @@
         </el-col>
       </el-row>
     </div>
-  <sign-card v-if="signCardVisible" v-on:signRes="getSignRes" ref="signCard"></sign-card>
+    <sign-card v-if="signCardVisible" v-on:signRes="getSignRes" ref="signCard"></sign-card>
   </el-form>
 </template>
 <script>
@@ -1806,8 +1810,9 @@ import {
 } from "@/api/invoicing/hazardwork";
 import {listDept} from "@/api/system/dept"
 import SignCard from "../signcard/index"
+
 export default {
-  components: { SignCard},
+  components: {SignCard},
   data() {
     return {
       signCardVisible: false,
@@ -1914,6 +1919,7 @@ export default {
         aSafeLiaisonOffice: null,
         //B 工作内容
         bDeviceName: null,
+        bDeviceWork: null,
         bWorkContent: null,
         bAreaNo: null,
         bValidityStartTime: null,
@@ -1944,6 +1950,9 @@ export default {
         cIsFire: null,
         cHId: null,
         cIsWorkProtective: null,
+        cIsDy: null,
+        cIsAqf: null,
+        cIsLq: null,
         cIsOtherDanger: null,
         cOtherDangerContent: null,
         //D 施工前的安全措施
@@ -2191,8 +2200,8 @@ export default {
             var pro = mf.protects;
             if (ff != null && ff.length > 0) {
               this.trueCheckbox(ff);
-              this.cIsDanger = "1";
-              this.cIsAttention = "1";
+              this.form.cIsDanger = "1";
+              this.form.cIsAttention = "1";
               this.isYesDanger = "1";
             } else {
               console.log("没有需要选中的多选框");
@@ -2202,6 +2211,8 @@ export default {
               pro.forEach(p => {
                 this[p.conservatoryMeasureCode] = "1";
                 if (p.conservatoryMeasureContent != null) {
+                  console.log(p.conservatoryMeasureContent);
+                  console.log(p.conservatoryMeasureName);
                   this[p.conservatoryMeasureContent] = p.conservatoryMeasureName;
                 }
               })
@@ -2253,7 +2264,7 @@ export default {
     },
 
     allExpand() {
-      this.activeNames = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15'];
+      this.activeNames = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14'];
     },
     allShrink() {
       this.activeNames = [];
@@ -2409,6 +2420,9 @@ export default {
       this.eIsProtectSuit = this.form.eIsProtectSuit;
       this.eIsResProtect = this.form.eIsResProtect;
       this.eIsFallArrest = this.form.eIsFallArrest;
+      this.eProtectGlovesContent = this.form.eProtectGlovesContent;
+      this.eResProtectContent = this.form.eResProtectContent;
+      this.eProtectSuitContent = this.form.eProtectSuitContent;
     },
     //数据提交时保存的数据处理
     dataSet() {
@@ -2433,10 +2447,12 @@ export default {
       this.form.eIsProtectSuit = this.eIsProtectSuit;
       this.form.eIsResProtect = this.eIsResProtect;
       this.form.eIsFallArrest = this.eIsFallArrest;
-
+      this.form.eProtectGlovesContent = this.eProtectGlovesContent;
+      this.form.eResProtectContent = this.eResProtectContent;
+      this.form.eProtectSuitContent = this.eProtectSuitContent;
     },
     //IC卡签名
-    signCard(type){
+    signCard(type) {
       console.log('签名类型：' + type)
       this.signCardVisible = true
       this.$nextTick(() => {
@@ -2444,7 +2460,7 @@ export default {
       })
     },
     //获取签名结果
-    getSignRes(res){
+    getSignRes(res) {
       console.log(res)
       if (res.signType == 'hSafeMesSign') {
         this.form.hSafeMesSign = res.cardId