diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue
index 671220d8..5ec7d9c5 100644
--- a/src/views/projectFront/specialWork/fireWork.vue
+++ b/src/views/projectFront/specialWork/fireWork.vue
@@ -86,29 +86,6 @@
                     <!-- 操作 -->
                     <el-table-column align="center" :label="$t('message.dangerousBigProject.operation')" width="120">
                         <template slot-scope="scope">
-                            <!-- <el-button
-                          @click.native.prevent="viewData(scope.$index, tableData)"
-                          type="text"
-                          size="small">
-                              查看
-                          </el-button> -->
-                            <!-- <el-button
-                          @click.native.prevent="editData(scope.$index, tableData)"
-                          type="text"
-                          size="small">
-                              编辑
-                          </el-button> -->
-                            <!-- <el-button
-                v-permission="{key: 'wdgc_edit', menuPath: '/project/dangerousBigProject/parameter'}" 
-                  @click.stop="editRow(scope.$index, tableData)"
-                  type="text"
-                  size="small"
-                >
-                  <i class="el-icon-edit"></i>
-                </el-button> -->
-                            <!-- v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}"  -->
-                            <!-- {{$store.state.userInfo.accountType}} -->
-                            <!-- {{($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)}} -->
                             <el-button v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)" 
                                 v-permission="{key: 'fireWork_delete', menuPath: '/project/specialWork/fireWork'}"
                                 @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
@@ -124,170 +101,6 @@
                 </el-pagination>
             </div>
 
-            <!-- <el-dialog :modal-append-to-body="false" :title="dialogTitle" :visible.sync="dialogFormVisible" class="add-dialog">
-              <div class="form-title">基础信息</div>
-              <el-form :model="addForm">
-                  <el-row :gutter="40">
-                      <el-col :span="12">
-                          <el-form-item label="危大工程名称：" required :label-width="formLabelWidth">
-                              <el-input v-model="addForm.name" :disabled="isEditDisabled" placeholder="请输入危大工程名称" autocomplete="off"></el-input>
-                          </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                          <el-form-item label="危大工程类别：" required :label-width="formLabelWidth">
-                              <el-select v-model="addForm.category" :disabled="isEditDisabled" @change="changeType" placeholder="请选择危大工程类别">
-                                  <el-option v-for="item in typeOptions"
-                                      :key="item.value"
-                                      :label="item.label"
-                                      :value="item.value"
-                                      >
-                                  </el-option>
-                              </el-select>
-                          </el-form-item>
-                      </el-col>
-                  </el-row>
-                  <el-row :gutter="40">
-                      <el-col :span="12">
-                          <el-form-item label="危大工程概况："  :label-width="formLabelWidth">
-                              <el-input v-model="addForm.points" :disabled="isDisabled" placeholder="请输入危大工程概况" autocomplete="off"></el-input>
-                          </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                          <el-form-item label="类别描述：" required :label-width="formLabelWidth">
-                              <el-select v-model="addForm.describe" :disabled="isEditDisabled" placeholder="请选择类别描述">
-                                  <el-option v-for="item in describeOptions"
-                                      :key="item.value"
-                                      :label="item.label"
-                                      :value="item.value">
-                                  </el-option>
-                              </el-select>
-                          </el-form-item>
-                      </el-col>
-                  </el-row>
-                  <el-row :gutter="40">
-                      <el-col :span="12">
-                          <el-form-item label="施工部位：" :label-width="formLabelWidth">
-                              <el-input v-model="addForm.address" :disabled="isDisabled" placeholder="请输入施工部位" autocomplete="off"></el-input>
-                          </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                          <el-form-item label="施工计划：" :label-width="formLabelWidth">
-                              <el-date-picker
-                                  :disabled="isDisabled"
-                                  v-model="addForm.date"
-                                  type="daterange"
-                                  range-separator="至"
-                                  value-format="yyyy-MM-dd"
-                                  start-placeholder="开始日期"
-                                  end-placeholder="结束日期">
-                              </el-date-picker>
-                          </el-form-item>
-                      </el-col>
-                  </el-row>
-                  <el-row :gutter="40">
-                      <el-col :span="12">
-                          <el-form-item label="责任人：" :label-width="formLabelWidth">
-                              <el-input v-model="addForm.people" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input>
-                          </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                          <el-form-item label="责任分包单位：" :label-width="formLabelWidth">
-                              <el-cascader
-                                  :disabled="isDisabled"
-                                  v-model="addForm.unit"
-                                  placeholder="请选择责任分包单位"
-                                  :options="options"
-                                  :props="props"
-                                  clearable>
-                              </el-cascader>
-                          </el-form-item>
-                      </el-col>
-                  </el-row>
-              </el-form>
-              <div class="form-title">危大工程资料</div>
-              <div class="upload-box">
-                  <div class="upload-file">
-                      <div class="upload-item">
-                          <span>安全技术交底：</span>
-                          <el-switch v-model="safeStatus" :disabled="isDisabled" >
-                          </el-switch>
-                              <span v-if="safeStatus" class="switch-check">已完成</span>
-                              <span v-else class="switch-uncheck">未完成</span>
-                      </div>
-                      <div v-if="dialogTitle == '查看' && file1">{{fileName1}}<a :href="file1">下载</a></div>
-                      <el-upload
-                          class="uploadBox"
-                          :action='$store.state.UPLOADURL'
-                          :on-preview="handlePreview"
-                          :on-remove="handleRemove"
-                          :before-remove="beforeRemove"
-                          :on-success="uploadSuccess"
-                          :on-error="uploadError"
-                          :limit="1"
-                          multiple
-                          name="files"
-                          accept=".doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf"
-                          :file-list="fileList">
-                          <el-button v-if="dialogTitle == '新增' || dialogTitle == '编辑'" size="small" type="primary">点击上传</el-button>
-                      </el-upload>
-                  </div>
-                  <div class="upload-file">
-                      <div class="upload-item">
-                          <span>安全专项施工方案及附件：</span>
-                          <el-switch v-model="safeStatus2" :disabled="isDisabled">
-                          </el-switch>
-                              <span v-if="safeStatus2" class="switch-check">已完成</span>
-                              <span v-else class="switch-uncheck">未完成</span>
-  
-                      </div>
-                      <div v-if="dialogTitle == '查看' && fileName2">{{fileName2}}<a :href="file2">下载</a></div>
-                      <el-upload
-                          class="uploadBox"
-                          :action='$store.state.UPLOADURL'
-                          :on-preview="handlePreview2"
-                          :on-remove="handleRemove2"
-                          :before-remove="beforeRemove2"
-                          :on-success="uploadSuccess2"
-                          :on-error="uploadError2"
-                          :limit="1"
-                          multiple
-                          name="files"
-                          accept=".doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf"
-                          :file-list="fileList2">
-                          <el-button v-if="dialogTitle == '新增' || dialogTitle == '编辑'" size="small" type="primary">点击上传</el-button>
-                      </el-upload>
-                  </div>
-                  <div class="upload-file">
-                      <div class="upload-item">
-                          <span>专项施工方案交底：</span>
-                          <el-switch v-model="safeStatus3" :disabled="isDisabled">
-                          </el-switch>
-                              <span v-if="safeStatus3" class="switch-check">已完成</span>
-                              <span v-else class="switch-uncheck">未完成</span>
-                      </div>
-                      <div v-if="dialogTitle == '查看' && fileName3">{{fileName3}}<a :href="file3">下载</a></div>
-                      <el-upload
-                          class="uploadBox"
-                          :action='$store.state.UPLOADURL'
-                          :on-preview="handlePreview3"
-                          :on-remove="handleRemove3"
-                          :before-remove="beforeRemove3"
-                          :on-success="uploadSuccess3"
-                          :on-error="uploadError3"
-                          :limit="1"
-                          multiple
-                          name="files"
-                          accept=".doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf"
-                          :file-list="fileList3">
-                          <el-button v-if="dialogTitle == '新增' || dialogTitle == '编辑'" size="small" type="primary">点击上传</el-button>
-                      </el-upload>
-                  </div>
-              </div>
-              <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogFormVisible = false">取 消</el-button>
-                  <el-button type="primary" @click="addData()">确 定</el-button>
-              </div>
-          </el-dialog> -->
             <!-- 提示 -->
             <el-dialog :modal-append-to-body="false" :title="$t('message.dangerousBigProject.hint')"
                 :visible.sync="deleteDialog" width="30%">
@@ -555,8 +368,6 @@ export default {
     created() {
         this.projectSn = this.$store.state.projectSn
         this.styleType = this.$store.state.userInfo.styleType;
-        // this.getCooperatorList()
-        // this.getType()
         this.initData();
         this.getEnterpriseInfoList();
     },
@@ -571,20 +382,6 @@ export default {
         },
     },
     methods: {
-        editRow(index, rows) {
-            if (rows[index].finalAcceptanceStatus === 2) {
-                this.$message.warning('该项危大工程已闭合，请勿操作')
-                return
-            }
-            // console.log(index,rows[index].id)
-            this.editId = rows[index].id
-            this.operateTitle = "编辑"
-            this.dialogTitle = "编辑"
-            this.dialogFormVisible = false
-            this.isEdit = false
-            this.isAdd = false
-            this.isUpdate = true;
-        },
         goBack() {
             this.dialogFormVisible = true
             // this.initData()
@@ -592,21 +389,6 @@ export default {
             this.isEdit = false
             this.isUpdate = false;
         },
-        showAddDialog() {
-            this.dialogFormVisible = false
-            this.isEdit = false
-            this.isUpdate = false;
-            this.isAdd = true
-            // "新增"
-            this.dialogTitle = this.$t('message.dangerousBigProject.add')
-            // this.clearData()
-            // if(this.isDisabled){
-            //     this.isDisabled = false
-            // }
-            // if(this.isEditDisabled){
-            //     this.isEditDisabled = false
-            // }
-        },
         onSubmit() {
             this.pageNo = 1;
             this.initData();
@@ -642,227 +424,17 @@ export default {
             getFireSafetyPageApi(data).then((res) => {
                 if (res.result) {
                     console.log(res.result.records, 1)
-                    // res.result.records.forEach((item) => {
-                    //     if (item.planStartTime && item.planEndTime) {
-                    //         item.plan = item.planStartTime + "至" + item.planEndTime
-                    //     }
-                    //     if (item.responsibilityCompany.split(",").length > 0 && item.responsibilityCompany !== "") {
-                    //         let arr = []
-                    //         for (let i = 0; i < this.options.length; i++) {
-                    //             let itm = this.options[i].value
-                    //             for (let j = 0; j < item.responsibilityCompany.split(",").length; j++) {
-                    //                 if (itm == item.responsibilityCompany.split(",")[j]) {
-                    //                     arr.push(this.options[i].label)
-                    //                 }
-                    //             }
-                    //         }
-                    //         item.subpackageUnit = arr.join(",")
-                    //     }
-                    // })
-                    // console.log(this.options)
-                    this.tableData = res.result.records;
+                    this.tableData = res.result.records.map(item => {
+                        const firemanAndCertificateNo = item.firemanAndCertificateNo.includes("[") && item.firemanAndCertificateNo.includes("]") ? JSON.parse(item.firemanAndCertificateNo).join("、") : item.firemanAndCertificateNo;
+                        return {
+                            ...item,
+                            firemanAndCertificateNo,
+                        }
+                    });
                     this.total = res.result.total;
                 }
             });
         },
-        editData(index, val) {
-            this.viewData(index, val)
-            // "编辑"
-            this.dialogTitle = this.$t('message.dangerousBigProject.edit')
-            this.editParms = val[index]
-            if (this.file1) {
-                let obj = {
-                    name: this.file1.split("/")[this.file1.split("/").length - 1],
-                    url: this.file1
-                }
-                this.fileList.push(obj)
-            }
-            if (this.file2) {
-                let obj2 = {
-                    name: this.file2.split("/")[this.file2.split("/").length - 1],
-                    url: this.file2
-                }
-                this.fileList2.push(obj2)
-            }
-            if (this.file3) {
-                let obj3 = {
-                    name: this.file3.split("/")[this.file3.split("/").length - 1],
-                    url: this.file3
-                }
-                this.fileList3.push(obj3)
-            }
-            this.isDisabled = false
-            this.isEditDisabled = true
-            // console.log(this.editId)
-        },
-        viewData(index, val) {
-            this.clearData()
-            this.dialogFormVisible = true
-            // "查看"
-            this.dialogTitle = this.$t('message.dangerousBigProject.view')
-            this.isDisabled = true
-            this.isEditDisabled = true
-            this.addForm = {
-                name: val[index].engineeringName,
-                category: val[index].engineeringTypeId,
-                points: val[index].engineeringSurvey,
-                describe: val[index].describeName,
-                address: val[index].constructionLocation,
-                date: [val[index].planStartTime, val[index].planEndTime],
-                people: val[index].personLiable,
-                unit: val[index].responsibilityCompany
-            }
-            this.safeStatus = val[index].securityConstructionSchemeType == 2 ? true : false
-            this.safeStatus2 = val[index].specialConstructionSchemeType == 2 ? true : false
-            this.safeStatus3 = val[index].technicalDisclosureType == 2 ? true : false
-            this.file1 = val[index].securityConstructionSchemeFile
-            this.file2 = val[index].specialConstructionSchemeFile
-            this.file3 = val[index].technicalDisclosureFile
-            this.fileName1 = this.file1 ? this.file1.split("/")[this.file1.split("/").length - 1] : ""
-            this.fileName2 = this.file2 ? this.file2.split("/")[this.file2.split("/").length - 1] : ""
-            this.fileName3 = this.file3 ? this.file3.split("/")[this.file3.split("/").length - 1] : ""
-        },
-        clearData() {
-            this.addForm = {
-                name: "",
-                category: "",
-                points: "",
-                describe: "",
-                address: "",
-                date: [],
-                people: "",
-                unit: ""
-            },
-                this.safeStatus = false
-            this.safeStatus2 = false
-            this.safeStatus3 = false
-            this.file1 = ""
-            this.file2 = ""
-            this.file3 = ""
-            this.fileList = []
-            this.fileList2 = []
-            this.fileList3 = []
-        },
-        // 选择类别
-        changeType(value) {
-            this.typeOptions.forEach(item => {
-                if (item.id == value) {
-                    item.describeList.forEach(item => {
-                        item.value = item.id
-                        if (item.describeName.length > 40) {
-                            item.label = item.describeName.substring(0, 40) + '...'
-                        } else {
-                            item.label = item.describeName
-                        }
-                    })
-                    this.describeOptions = item.describeList
-                }
-            })
-            console.log(value)
-        },
-        //获取责任分包单位
-        getCooperatorList() {
-            let data = {
-                projectSn: this.projectSn,
-                pageNo: this.pageNo,
-                pageSize: this.pageSize,
-                enterpriseTypeId: this.enterpriseTypeId,
-                enterpriseName: "",
-            };
-            getCooperatorListApi(data).then((res) => {
-                if (res.code == 200) {
-
-                    if (res.result.records.length > 0) {
-                        this.cooperatorList = JSON.parse(JSON.stringify(res.result.records));
-                        this.cooperatorList.forEach((item) => {
-                            item.value = item.enterpriseLegalPerson
-                            item.label = item.enterpriseName
-                        })
-                        this.options = this.cooperatorList
-                        // console.log(this.options)
-                    }
-                }
-            });
-        },
-        // 获取类别
-        getType() {
-            selectDangerousEngineeringTypeApi({ sn: JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.headquartersSn }).then((res) => {
-                if (res.result) {
-                    // console.log(res.result)
-                    res.result.forEach(item => {
-                        item.label = item.typeName
-                        item.value = item.id
-                    })
-                    this.typeOptions = res.result
-                }
-            })
-        },
-        addData() {
-            if (this.addForm.name == "") {
-                // 请输入危大工程名称
-                this.$message.error(this.$t('message.dangerousBigProject.verifyMessage1'))
-                return
-            } else if (this.addForm.category == "") {
-                // 请选择危大工程类别
-                this.$message.error(this.$t('message.dangerousBigProject.verifyMessage2'))
-                return
-            } else if (this.addForm.describe == "") {
-                // 请选择类别描述
-                this.$message.error(this.$t('message.dangerousBigProject.verifyMessage3'))
-                return
-            }
-            // console.log(this.addForm)
-            let nowDate = new Date()
-            let data = {
-                constructionLocation: this.addForm.address,
-                createTime: moment(nowDate).format('YYYY-MM-DD HH:mm:ss'),
-                engineeringName: this.addForm.name,
-                engineeringSurvey: this.addForm.points,
-                engineeringTypeId: this.addForm.category,
-                personLiable: this.addForm.people,
-                planEndTime: this.addForm.date[1],
-                planStartTime: this.addForm.date[0],
-                projectSn: this.projectSn,
-                securityConstructionSchemeFile: this.fileList.length > 0 ? this.file1 : "", //安全专项施工方案附件
-                securityConstructionSchemeType: this.safeStatus ? 2 : 1,//是否完成安全专项施工方案交底，1未完成，2完成
-                specialConstructionSchemeFile: this.fileList2.length > 0 ? this.file2 : '',//专项施工方案附件
-                specialConstructionSchemeType: this.safeStatus2 ? 2 : 1,//是否完成专项施工方案交底，1未完成，2完成
-                technicalDisclosureFile: this.fileList3.length > 0 ? this.file3 : '',//技术交底文件
-                technicalDisclosureType: this.safeStatus3 ? 2 : 1,//是否完成安全技术交底，1未完成，2完成
-                typeDescribeId: this.addForm.describe,//危大工程类别描述
-                addForm: this.addForm
-            }
-            // "新增"
-            if (this.dialogTitle == this.$t('message.dangerousBigProject.add')) {
-                console.log(data)
-                data.responsibilityCompany = this.addForm.unit ? this.addForm.unit.join(',') : ""
-                addDangerousEngineeringRecordApi(data).then((res) => {
-                    if (res.code = 200) {
-                        this.$message.success(this.$t('message.dangerousBigProject.add') + this.$t('message.dangerousBigProject.success') + "！")
-                        this.initData()
-                    }
-                    console.log(res)
-                })
-            } else if (this.dialogTitle == this.$t('message.dangerousBigProject.edit')) {
-                // "编辑"
-                data.id = this.editParms.id
-                data.typeDescribeId = this.editParms.typeDescribeId
-                if (this.addForm.unit && Array.isArray(this.addForm.unit)) {
-                    data.responsibilityCompany = this.addForm.unit.join(',')
-                } else {
-                    data.responsibilityCompany = this.addForm.unit
-                }
-                editDangerousEngineeringRecordApi(data).then((res) => {
-                    if (res.code = 200) {
-                        // "修改成功！"
-                        this.$message.success(this.$t('message.dangerousBigProject.editSuccess'))
-                        this.initData()
-                    }
-                    console.log(res)
-                })
-            }
-            this.dialogFormVisible = false
-        },
         handleSelectionChange(val) {
             this.multipleSelection = val;
         },
@@ -891,69 +463,7 @@ export default {
         handleCurrentChange() {
             this.initData()
         },
-        handleRemove(file, fileList) {
-            console.log(fileList);
-            this.fileList = fileList;
-        },
-        handlePreview(file) {
-            console.log(file);
-        },
-        beforeRemove(file, fileList) {
-            // 确定移除
-            return this.$confirm(this.$t('message.dangerousBigProject.confirmRemove') + ` ${file.name}？`);
-        },
-        uploadSuccess(response, file, fileList) {
-            console.log('fileList')
-            console.log(fileList)
-            this.fileList = fileList;
-            this.file1 = this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl
-        },
-        uploadError(err, file, fileList) {
-            // 上传失败！
-            this.$message.error(this.$t('message.dangerousBigProject.uploadFail'));
-        },
-        handleRemove2(file, fileList) {
-            console.log(fileList);
-            this.fileList2 = fileList;
-        },
-        handlePreview2(file) {
-            console.log(file);
-        },
-        beforeRemove2(file, fileList) {
-            // 确定移除
-            return this.$confirm(this.$t('message.dangerousBigProject.confirmRemove') + `${file.name}？`);
-        },
-        uploadSuccess2(response, file, fileList) {
-            console.log('fileList')
-            console.log(fileList)
-            this.fileList2 = fileList;
-            this.file2 = this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl
-        },
-        uploadError2(err, file, fileList) {
-            // 上传失败！
-            this.$message.error(this.$t('message.dangerousBigProject.uploadFail'));
-        },
-        handleRemove3(file, fileList) {
-            console.log(fileList);
-            this.fileList3 = fileList;
-        },
-        handlePreview3(file) {
-            console.log(file);
-        },
-        beforeRemove3(file, fileList) {
-            // 确定移除
-            return this.$confirm(this.$t('message.dangerousBigProject.confirmRemove') + `${file.name}？`);
-        },
-        uploadSuccess3(response, file, fileList) {
-            console.log('fileList')
-            console.log(fileList)
-            this.fileList3 = fileList;
-            this.file3 = this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl
-        },
-        uploadError3(err, file, fileList) {
-            // 上传失败！
-            this.$message.error(this.$t('message.dangerousBigProject.uploadFail'));
-        },
+
         previewDetail(val) {
             console.log('!!!!!!!!!!!!!!!!!!', val)
             this.dialogFormVisible = false
@@ -973,7 +483,8 @@ export default {
                         ...val,
                         ...res.result,
                         // xzGasAnalyzeList: res.result.xzGasAnalyzeList,
-                        hotWorkExecutionTime: [res.result.hotWorkExecutionBeginTime, res.result.hotWorkExecutionEndTime]
+                        hotWorkExecutionTime: [res.result.hotWorkExecutionBeginTime, res.result.hotWorkExecutionEndTime],
+                        firemanAndCertificateNo:val.firemanAndCertificateNo,
                     };
                 }
             })