diff --git a/src/assets/js/api/carManage.js b/src/assets/js/api/carManage.js
index 51491646..42358f0f 100644
--- a/src/assets/js/api/carManage.js
+++ b/src/assets/js/api/carManage.js
@@ -1,7 +1,7 @@
 /**
  * api接口统一管理
  */
-import {post, get} from '../http'
+import { post, get } from '../http'
 
 //车辆进出闸门信息
 export const addCarPassGateApi = data => post('xmgl/carPassGate/add', data);
@@ -14,7 +14,7 @@ export const getCarPassGateListApi = data => post('xmgl/carPassGate/selectCarPas
 export const addCarCameraApi = data => post('xmgl/carCamera/add', data);
 export const editCarCameraApi = data => post('xmgl/carCamera/edit', data);
 export const deleteCarCameraApi = data => post('xmgl/carCamera/delete', data);
-export const getCarCameraListApi = data => post('xmgl/carCamera/list', data,'false');
+export const getCarCameraListApi = data => post('xmgl/carCamera/list', data, 'false');
 
 
 //车辆黑白名单管理信息
@@ -31,19 +31,19 @@ export const getcarTypeListApi = data => post('xmgl/carType/list', data);
 
 
 //车辆数据统计
-export const getCarPassRecordStatistics = data => post('xmgl/carPassRecord/getCarPassRecordStatistics', data,'false');//车辆通行记录统计
+export const getCarPassRecordStatistics = data => post('xmgl/carPassRecord/getCarPassRecordStatistics', data, 'false'); //车辆通行记录统计
 // export const openGate = data => post('xmgl/carPassGate/openGate', data);//车辆进出闸门开闸操作
-export const openGate = data => post('xmgl/carCamera/openGate', data);//车辆进出闸门开闸操作
+export const openGate = data => post('xmgl/carCamera/openGate', data); //车辆进出闸门开闸操作
 
-export const selectCarStatisticsNumApi = data => post('xmgl/carInfo/countCarModuleType', data);//根据车辆统计数量
-export const selectCarStatisticsRecordApi = data => get('xmgl/carPassRecord/getTodayOutInNumber', data);//根据车辆统计数据
-export const selectCarStatisticsByCameraIdApi = data => post('xmgl/carCamera/selectCarStatisticsByCameraId', data);//根据车辆相机统计数据
-export const selectCarPassRecordInOutCountApi = data => post('xmgl/carPassRecord/selectCarPassRecordInOutCount', data);//24小时进出时间段统计
-export const getCarPassRecordListApi = data => post('xmgl/carPassRecord/getCarPassRecordList', data);//查询当日车辆通行记录列表
+export const selectCarStatisticsNumApi = data => post('xmgl/carInfo/countCarModuleType', data); //根据车辆统计数量
+export const selectCarStatisticsRecordApi = data => get('xmgl/carPassRecord/getTodayOutInNumber', data); //根据车辆统计数据
+export const selectCarStatisticsByCameraIdApi = data => post('xmgl/carCamera/selectCarStatisticsByCameraId', data); //根据车辆相机统计数据
+export const selectCarPassRecordInOutCountApi = data => post('xmgl/carPassRecord/selectCarPassRecordInOutCount', data); //24小时进出时间段统计
+export const getCarPassRecordListApi = data => post('xmgl/carPassRecord/getCarPassRecordList', data); //查询当日车辆通行记录列表
 
 
-export const getCarPassRecordListByPageApi = data => post('xmgl/carPassRecord/list', data);//分页列表查询车辆通行记录信息
-export const pullCarDataApi = data => post('xmgl/hikvision/getCrossRecords', data);//同步车辆通行数据
+export const getCarPassRecordListByPageApi = data => post('xmgl/carPassRecord/list', data); //分页列表查询车辆通行记录信息
+export const pullCarDataApi = data => post('xmgl/hikvision/getCrossRecords', data); //同步车辆通行数据
 
 
 
@@ -64,7 +64,7 @@ export const selectCarPassPageApi = data => post('xmgl/carPassRecord/selectCarPa
 
 
 //车牌识别统计
-export const selectCarTotal = data => post('/xmgl/carPassRecord/getCarPassRecordList',data);
+export const selectCarTotal = data => post('/xmgl/carPassRecord/getCarPassRecordList', data);
 
 
 
@@ -100,4 +100,14 @@ export const deleteBatchVehiclePositionFence = data => post('xmgl/vehiclePositio
 export const getFenceTypeTotal = data => post('xmgl/vehiclePositionDev/countVehiclePositionDev', data);
 
 // 查询车辆日行数据
-export const getVehiclePositionDayRecord = data => get('xmgl/vehiclePositionDayRecord/list', data);
\ No newline at end of file
+export const getVehiclePositionDayRecord = data => get('xmgl/vehiclePositionDayRecord/list', data);
+
+// 车辆违规监测
+// 分页列表查询车辆违规监测信息
+export const getVehicleViolationInfo = data => get('xmgl/vehicleViolationMonitor/page', data);
+// 添加车辆违规监测信息
+export const addVehicleViolationInfo = data => post('xmgl/vehicleViolationMonitor/add', data);
+// 编辑车辆违规监测信息
+export const editVehicleViolationInfo = data => post('xmgl/vehicleViolationMonitor/edit', data);
+// 删除车辆违规监测信息
+export const deleteVehicleViolationInfo = data => post('xmgl/vehicleViolationMonitor/delete', data);
\ No newline at end of file
diff --git a/src/assets/js/api/greenConstructionManage.js b/src/assets/js/api/greenConstructionManage.js
new file mode 100644
index 00000000..39a07f5f
--- /dev/null
+++ b/src/assets/js/api/greenConstructionManage.js
@@ -0,0 +1,14 @@
+/**
+ * api接口统一管理
+ */
+import { post, get } from '../http'
+
+// 绿色施工方案管理
+// 分页列表查询绿色施工方案管理信息
+export const getGreenConstructionManageInfo = data => get('xmgl/greenConstructionScheme/page', data);
+// 添加绿色施工方案管理信息
+export const addGreenConstructionManageInfo = data => post('xmgl/greenConstructionScheme/add', data);
+// 编辑绿色施工方案管理信息
+export const editGreenConstructionManageInfo = data => post('xmgl/greenConstructionScheme/edit', data);
+// 删除绿色施工方案管理信息
+export const deleteGreenConstructionManageInfo = data => post('xmgl/greenConstructionScheme/delete', data);
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 67929859..0d484285 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -683,9 +683,23 @@ const routes2 = [{
                     import ("@/views/projectFront/operationManage/confinedSpaceWorks.vue"),
             },
             // 作业管理--起重吊装作业
+            // {
+            //     path: "/project/operationManage/liftingErectionWorks",
+            //     name: "作业管理_起重吊装作业",
+            //     component: () =>
+            //         import ("@/views/projectFront/operationManage/liftingErectionWorks.vue"),
+            // },
+            // // 作业管理--土建工程作业
+            // {
+            //     path: "/project/operationManage/buildingProjectWorks",
+            //     name: "作业管理_土建工程作业",
+            //     component: () =>
+            //         import ("@/views/projectFront/operationManage/buildingProjectWorks.vue"),
+            // },
+            // 作业管理--无损作业
             {
                 path: "/project/operationManage/liftingErectionWorks",
-                name: "作业管理_起重吊装作业",
+                name: "作业管理_无损作业",
                 component: () =>
                     import ("@/views/projectFront/operationManage/liftingErectionWorks.vue"),
             },
@@ -1177,6 +1191,21 @@ const routes2 = [{
                 component: (resolve) =>
                     require(["@/views/projectFront/carManage/carStatictis.vue"], resolve),
             },
+            {
+                path: "/project/carManage/violationDetection",
+                name: "车辆管理_车辆违规检测",
+                component: (resolve) =>
+                    require(["@/views/projectFront/carManage/violationDetection.vue"], resolve),
+            },
+            // 绿色施工管理
+            // 绿色施工方案管理
+            {
+                path: "/project/greenConstructionManage/schemeManage",
+                name: "绿色施工管理_绿色施工方案管理",
+                component: (resolve) =>
+                    require(["@/views/projectFront/greenConstructionManage/schemeManage.vue"], resolve),
+            },
+
             {
                 path: "/project/carManage/carWashDevManage",
                 name: "车辆冲洗_设备管理1",
diff --git a/src/views/projectAdmin/dataBoard/index.vue b/src/views/projectAdmin/dataBoard/index.vue
index c8502e2e..1565e305 100644
--- a/src/views/projectAdmin/dataBoard/index.vue
+++ b/src/views/projectAdmin/dataBoard/index.vue
@@ -41,7 +41,7 @@
         </div>
         <video
           v-if="projectData.videoUrl && optionListIndex == 1"
-          :src="$store.state.FILEURL + projectData.videoUrl"
+          :src="projectData.videoUrl.includes('http://') ? projectData.videoUrl : $store.state.FILEURL + projectData.videoUrl"
           class="topInner videos"
           autoplay
           controls
@@ -77,7 +77,7 @@
               margin-top: 20px;
               height: 345px;
             "
-            :src="fileUrl + imgUrl"
+            :src="imgUrl.includes('http://') ? imgUrl : fileUrl + imgUrl"
             alt=""
           />
           <!--          <img style="width: 686px;;margin-left: 113px;margin-top: 16px;height: 430px" src="@/assets/images/aa5cd03a486a3faaeb9cf4b8d06405e.png" alt="">-->
diff --git a/src/views/projectFront/buildEquipToolManage/equipmentManage.vue b/src/views/projectFront/buildEquipToolManage/equipmentManage.vue
index a9852cea..84c7e5f3 100644
--- a/src/views/projectFront/buildEquipToolManage/equipmentManage.vue
+++ b/src/views/projectFront/buildEquipToolManage/equipmentManage.vue
@@ -1,18 +1,26 @@
 <template>
     <!-- 质量问题库 -->
-    <div class="qualityProblemBank">
-        <vue-scroll style="height: 100%; width: 100%" class="scroll">
+    <div class="qualityProblemBank" :class="{ 'qualityProblemBank2': !dialogFormVisible }">
+        <vue-scroll v-if="dialogFormVisible" style="height: 100%; width: 100%" class="scroll">
             <div class="flex content">
                 <div class="left">
-                    <div style="margin-bottom: 15px; display:flex; align-items: center">
-                        <el-input placeholder="请输入检查项名称" prefix-icon="el-icon-search" size="small"
-                            v-model="qualityCommonProblemName" clearable>
-                        </el-input>
+                    <div class="btn_wrap_box">
+                        <div class="btn_wrap">
+                            <el-button size="small" @click="setCheckedNodes">{{ $t('message.quality.add')
+                            }}{{ $t('message.quality.unfold') }}</el-button>
+                            <el-button size="small" @click="setCheckedKeys">{{ $t('message.quality.add')
+                            }}{{ $t('message.quality.close') }}</el-button>
+                        </div>
                         <el-button style="margin-left: 15px" type="primary" size="small" @click.stop="isAddPoint(1)">
                             添加
                         </el-button>
                     </div>
-                    <vue-scroll style="height: 87%; width: 100%; font-size: 14px">
+                    <div style="margin-bottom: 15px; display:flex; align-items: center">
+                        <el-input placeholder="请输入检查项名称" prefix-icon="el-icon-search" size="small"
+                            v-model="classificationName" clearable>
+                        </el-input>
+                    </div>
+                    <vue-scroll style="height: 88%; width: 100%; font-size: 14px; background-color: #F7F7F7;">
                         <el-tree class="filter-tree" :highlight-current="true" :data="listData" :props="defaultProps"
                             @node-click="getCheckedNode" :default-expand-all="showExpand" :filter-node-method="filterNode"
                             node-key="id" ref="tree">
@@ -21,27 +29,26 @@
                                 <el-tooltip v-else class="item" effect="dark" :content="node.label" placement="top">
                                     <span class="ellipsis">{{ node.label }}</span>
                                 </el-tooltip>
-                                <div>
-                                    <el-button type="text" size="mini" @click.stop="() => isAddPoint(1, node, data)">
+                                <div class="icon-box">
+                                    <!-- <el-button type="text" size="mini" >
                                         新增子级
                                     </el-button>
-                                    <el-button type="text" size="mini" @click.stop="() => isAddPoint(2, node, data)">
+                                    <el-button type="text" size="mini" >
                                         编辑
                                     </el-button>
-                                    <el-button type="text" size="mini" @click.stop="() => deleteTreeRow(data)">
+                                    <el-button type="text" size="mini" >
                                         删除
-                                    </el-button>
+                                    </el-button> -->
+                                    <i class="el-icon-plus" @click.stop="() => isAddPoint(1, node, data)"></i>
+                                    <i class="el-icon-edit" @click.stop="() => isAddPoint(2, node, data)"></i>
+                                    <i class="el-icon-delete" @click.stop="() => deleteTreeRow(data)"></i>
+
                                 </div>
                                 <!-- v-permission="{key: 'criterion_stop_open', menuPath: '/project/quality/criterion'}" -->
                             </span>
                         </el-tree>
                     </vue-scroll>
-                    <div class="btn_wrap">
-                        <el-button type="primary" size="small" @click="setCheckedNodes">{{ $t('message.quality.add')
-                        }}{{ $t('message.quality.unfold') }}</el-button>
-                        <el-button type="primary" size="small" @click="setCheckedKeys">{{ $t('message.quality.add')
-                        }}{{ $t('message.quality.close') }}</el-button>
-                    </div>
+
                 </div>
                 <div class="right">
                     <div class="title">
@@ -50,11 +57,22 @@
                         </div>
                         <div>
                             <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
-                                <el-form-item label="通病现象：">
+                                <el-form-item label="编码：">
                                     <el-input :placeholder="
-                                        $t('message.quality.pleaseEnter') +
-                                        $t('message.quality.content')
-                                    " v-model="formInline.content" clearable style="width: 200px">
+                                        $t('message.quality.pleaseEnter')
+                                    " v-model="formInline.projectEquipmentNumber" clearable style="width: 200px">
+                                    </el-input>
+                                </el-form-item>
+                                <el-form-item label="名称：">
+                                    <el-input :placeholder="
+                                        $t('message.quality.pleaseEnter')
+                                    " v-model="formInline.commonDiseasePhenomena" clearable style="width: 200px">
+                                    </el-input>
+                                </el-form-item>
+                                <el-form-item label="规格编号：">
+                                    <el-input :placeholder="
+                                        $t('message.quality.pleaseEnter')
+                                    " v-model="formInline.specificationModel" clearable style="width: 200px">
                                     </el-input>
                                 </el-form-item>
                                 <!-- <el-form-item :label="$t('message.quality.displayEnabledOnly') + '：'">
@@ -74,39 +92,48 @@
                             </el-form>
                         </div>
                     </div>
-                    <el-table :data="tableData" ref="multipleTable" class="tables" max-height="590px">
-                        <el-table-column align="center" prop="commonDiseasePhenomena" label="通病现象">
+                    <el-table :data="tableData" @cell-click="previewDetail" ref="multipleTable" class="tables"
+                        max-height="590px">
+                        <el-table-column label="序号" type="index" width="50">
+                        </el-table-column>
+                        <el-table-column align="center" prop="commonDiseasePhenomena" label="设备名称">
                             <template slot-scope="scope">{{
-                                scope.row.commonDiseasePhenomena
+                                scope.row.equipmentName
                             }}</template>
                         </el-table-column>
-                        <el-table-column align="center" prop="commonDiseasePicture" label="通病图片">
+                        <el-table-column align="center" prop="commonDiseasePicture" label="规格型号">
                             <template slot-scope="scope">
-                                <div style="display: flex; align-items: center; justify-content:center">
-                                    <!-- <img style="width: 100%; height: 100%" :src="require(@/assets/images/image-pre.png)" alt=""> -->
-                                    <el-image style="width: 20px; height: 20px"
-                                        :src="require('@/assets/images/image-pre.png')" fit="cover"
-                                        :preview-src-list="srcListUp(scope.row.commonDiseasePicture)"></el-image>
-                                    {{ scope.row.commonDiseasePicture.length }}
-                                </div>
+                                {{ scope.row.specificationModel }}
                             </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="controlPoint" label="控制要点和防治做法">
+                        <el-table-column align="center" prop="isSpecial" label="是否特种设备">
+                            <template slot-scope="scope">{{ scope.row.isSpecial == 1 ? '是' : '否' }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="projectEquipmentNumber" label="项目设备编码">
                             <template slot-scope="scope">{{
-                                scope.row.controlPoint
+                                scope.row.projectEquipmentNumber
                             }}</template>
                         </el-table-column>
-                        <el-table-column align="center" prop="commonDiseasePreventionMethodPicture" label="通病防治做法图片">
+                        <el-table-column align="center" prop="equipmentManagerName" label="设备管理员">
+                            <template slot-scope="scope">{{
+                                scope.row.equipmentManagerName
+                            }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="deviceUsed" label="使用装置">
+                            <template slot-scope="scope">{{
+                                scope.row.deviceUsed
+                            }}</template>
+                        </el-table-column>
+                        <!-- <el-table-column align="center" prop="commonDiseasePreventionMethodPicture" label="通病防治做法图片">
                             <template slot-scope="scope">
                                 <div style="display: flex; align-items: center; justify-content:center">
-                                    <!-- <img style="width: 100%; height: 100%" :src="require(@/assets/images/image-pre.png)" alt=""> -->
                                     <el-image style="width: 20px; height: 20px"
                                         :src="require('@/assets/images/image-pre.png')" fit="cover"
                                         :preview-src-list="srcListUp(scope.row.commonDiseasePreventionMethodPicture)"></el-image>
                                     {{ scope.row.commonDiseasePreventionMethodPicture.length }}
                                 </div>
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
                         <!-- 操作 -->
                         <el-table-column align="center" :label="$t('message.dangerousBigProject.operation')">
                             <template slot-scope="scope">
@@ -134,7 +161,7 @@
                 </div>
                 <!-- 添加卡片弹框 -->
                 <el-dialog :destroy-on-close="true" :modal-append-to-body="false" :title="cardDialogTitle"
-                    :visible.sync="cardDialog" width="1100px" :before-close="handleClose">
+                    :visible.sync="cardDialog" :width="isAdd == 1 || isAdd == 2 ? '600px' : '1100px'" :before-close="handleClose">
                     <div class="dialog_content">
                         <el-form size="medium" :model="cardForm" ref="cardForm" :rules="cardFormRules" label-width="170px"
                             class="dialogFormBox">
@@ -146,37 +173,129 @@
                                   </el-option>
                               </el-select>
                           </el-form-item> -->
-                            <el-form-item v-if="isAdd == 1 || isAdd == 2" label="通病名称" prop="qualityCommonProblemName">
-                                <el-input v-model="cardForm.qualityCommonProblemName"
+                            <el-form-item v-if="isAdd == 1 || isAdd == 2" label="施工机具名称" prop="classificationName">
+                                <el-input v-model="cardForm.classificationName"
                                     :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
                             </el-form-item>
-                            <el-form-item v-if="isAdd == 3 || isAdd == 4" label="通病现象" prop="commonDiseasePhenomena">
-                                <el-input v-model="cardForm.commonDiseasePhenomena"
-                                    :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
-                            </el-form-item>
-                            <el-form-item v-if="isAdd == 3 || isAdd == 4" label="控制要点和防治做法" prop="controlPoint">
-                                <el-input v-model="cardForm.controlPoint"
-                                    :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
-                            </el-form-item>
-                            <el-form-item v-if="isAdd == 3 || isAdd == 4" label="通病图片" prop="commonDiseasePicture">
-                                <el-upload class="upload-demo" name="files" :action="$store.state.UPLOADURL"
-                                    :on-remove="(file, fileList) => handleRemove(file, fileList, 1)" :multiple="false"
-                                    :on-success="(res, file) => handleSuccess(res, file, 1)"
-                                    :file-list="cardForm.commonDiseasePicture" accept=".png,.jpg,.jpeg">
-                                    <!-- .doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf -->
-                                    <el-button type="primary"> 上传附件 </el-button>
-                                </el-upload>
-                            </el-form-item>
-                            <el-form-item v-if="isAdd == 3 || isAdd == 4" label="通病防治做法图片"
-                                prop="commonDiseasePreventionMethodPicture">
-                                <el-upload class="upload-demo" name="files" :action="$store.state.UPLOADURL"
-                                    :on-remove="(file, fileList) => handleRemove(file, fileList, 2)" :multiple="false"
-                                    :on-success="(res, file) => handleSuccess(res, file, 2)"
-                                    :file-list="cardForm.commonDiseasePreventionMethodPicture" accept=".png,.jpg,.jpeg">
-                                    <!-- .doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf -->
-                                    <el-button type="primary"> 上传附件 </el-button>
-                                </el-upload>
-                            </el-form-item>
+                            <div class="addbox" v-if="isAdd == 3 || isAdd == 4">
+                                <el-form-item label="设备名称" prop="equipmentName">
+                                    <el-input v-model="cardForm.equipmentName"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="规格型号" prop="specificationModel">
+                                    <el-input v-model="cardForm.specificationModel"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="项目设备编号" prop="projectEquipmentNumber">
+                                    <el-input v-model="cardForm.projectEquipmentNumber"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="设备管理员" prop="equipmentManager">
+                                    <el-select filterable v-model="cardForm.equipmentManager"
+                                        :placeholder="$t('message.personnelPosition.please_select')" filterable>
+                                        <el-option :label="item.workerName" :value="item.id"
+                                            v-for="(item, index) in workerListOptions" :key="index">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="是否特种设备" prop="isSpecial">
+                                    <el-select filterable v-model="cardForm.isSpecial"
+                                        :placeholder="$t('message.personnelPosition.please_select')" filterable>
+                                        <el-option :label="item.specialEquipmentName" :value="item.id"
+                                            v-for="(item, index) in specialEquipmentList" :key="index">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="进场经办人" prop="onSiteHandler">
+                                    <el-select filterable v-model="cardForm.onSiteHandler"
+                                        :placeholder="$t('message.personnelPosition.please_select')" filterable>
+                                        <el-option :label="item.workerName" :value="item.id"
+                                            v-for="(item, index) in workerListOptions" :key="index">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="实际进场日期" prop="actualOnSiteDate">
+                                    <el-date-picker v-model="cardForm.actualOnSiteDate" type="date"
+                                        value-format="yyyy-MM-dd" placeholder="选择日期时间">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="出厂日期" prop="shipmentDate">
+                                    <el-date-picker v-model="cardForm.shipmentDate" type="date" value-format="yyyy-MM-dd"
+                                        placeholder="选择日期时间">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="状态" prop="status">
+                                    <el-input v-model="cardForm.status"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="生产厂商" prop="manufacturer">
+                                    <el-input v-model="cardForm.manufacturer"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="设备来源单位" prop="equipmentSourceUnit">
+                                    <el-input v-model="cardForm.equipmentSourceUnit"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="安装拆除单位" prop="installationRemovalUnit">
+                                    <el-input v-model="cardForm.installationRemovalUnit"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="使用装置" prop="deviceUsed">
+                                    <el-input v-model="cardForm.deviceUsed"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="设备位置" prop="equipmentLocation">
+                                    <el-input v-model="cardForm.equipmentLocation"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="产权编号" prop="ownershipNumber">
+                                    <el-input v-model="cardForm.ownershipNumber"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <el-form-item label="使用年限" prop="serviceLife">
+                                    <el-input v-model="cardForm.serviceLife"
+                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                </el-form-item>
+                                <div class="gasanalysis-table1" style="margin-bottom: 20px">
+                                    <table>
+                                        <thead>
+                                            <tr>
+                                                <th>序号</th>
+                                                <th>附件名称</th>
+                                                <th>上传附件</th>
+                                                <th>操作</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr v-for="(ele, eIndex) in cardForm.tableList" :key="ele.id">
+                                                <td>
+                                                    {{ eIndex + 1 }}
+                                                </td>
+                                                <td>
+                                                    <el-input v-model="ele.fileName"
+                                                        :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                                                </td>
+                                                <td>
+                                                    <el-upload style="display:flex; justify-content: center;"
+                                                        class="upload-demo" name="files" :action="$store.state.UPLOADURL"
+                                                        :on-remove="(file, fileList) => handleRemove(file, fileList, ele.id)"
+                                                        :multiple="false"
+                                                        :on-success="(res, file) => handleSuccess(res, file, ele.id)"
+                                                        :file-list="ele.fileList" :on-exceed="handleExceed" :limit="1"
+                                                        accept=".png,.jpg,.jpeg">
+                                                        <!-- .doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf -->
+                                                        <el-button type="primary"> 上传附件 </el-button>
+                                                    </el-upload>
+                                                </td>
+                                                <td>
+                                                    <el-button type="text" @click="onDeleteTable(ele)">删除</el-button>
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                    <el-button icon="el-icon-plus" plain @click="onAddTable">添加数据</el-button>
+                                </div>
+                            </div>
 
                         </el-form>
                         <div class="dialog-footer">
@@ -191,31 +310,128 @@
                 </el-dialog>
             </div>
         </vue-scroll>
+        <div style="height: 100%" v-else>
+            <el-page-header @back="goBack" :content="dialogTitle" class="backText"
+                :class="{ dark: styleType == 2 }"></el-page-header>
+            <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
+            <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="2" @cancleSave="goBack"
+                :workDetail="workDetail" v-if="isEdit">
+                <template v-slot:basicinfo>
+                    <div class="info-content">
+                        <div style="width: 75%">
+                            <div class="info-title">
+                            <div>
+                                {{ workDetail.equipmentName }}
+                            </div>
+                            <div class="info-title_right" v-if="workDetail.isSpecial == 1">
+                                特种设备
+                            </div>
+                        </div>
+                        <el-form class="form-box" :model="workDetail">
+                            <el-form-item label="规格型号：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.specificationModel }}
+                            </el-form-item>
+                            <el-form-item label="项目设备编号：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.projectEquipmentNumber ? workDetail.projectEquipmentNumber : '--' }}
+                            </el-form-item>
+                            <el-form-item label="设备管理员：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.equipmentManagerName }}
+                            </el-form-item>
+                            <el-form-item label="进场经办人：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.onSiteHandlerName }}
+                            </el-form-item>
+                            <el-form-item label="实际进场时间：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.actualOnSiteDate }}
+                            </el-form-item>
+                            <el-form-item label="出厂日期：" :label-width="formLabelWidthDetail">
+                               {{ workDetail.shipmentDate }}
+                            </el-form-item>
+                            <el-form-item label="状态：" :label-width="formLabelWidthDetail">
+                                <span style="color:#EA3941;">{{ workDetail.status }}</span>
+                            </el-form-item>
+                            <el-form-item label="生产厂商：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.manufacturer }}
+                            </el-form-item>
+                            <el-form-item label="设备来源单位：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.equipmentSourceUnit }}
+                                <!-- <el-tooltip class="item" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;" effect="dark" :content="workDetail.jobContent"
+                                      placement="top-start">
+                                      <div>{{ workDetail.jobContent }}</div>
+                                  </el-tooltip> -->
+                            </el-form-item>
+                            <el-form-item label="安装拆除单位：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.installationRemovalUnit }}
+                            </el-form-item>
+                            <el-form-item label="使用装置：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.deviceUsed }}
+                            </el-form-item>
+                            <el-form-item label="设备位置：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.equipmentLocation }}
+                            </el-form-item>
+                            <el-form-item label="产权编号：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.ownershipNumber }}
+                            </el-form-item>
+                            <el-form-item label="使用年限：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.serviceLife }}
+                            </el-form-item>
+                            <!-- <el-form-item label="现场作业环境：" :label-width="formLabelWidthDetail">
+                                <div class="img-show">
+                                    <el-image v-for="(item, index) in workDetail.fieldWorkingEnvironment" :key="index"
+                                        style="width: 100px; height: 100px; margin-right: 10px;margin-bottom: 10px"
+                                        :src="item.url" :preview-src-list="[item.url]">
+                                    </el-image>
+                                </div>
+                            </el-form-item> -->
+                        </el-form>
+                        </div>
+                        <div style="display: flex;flex-direction: column;justify-content: center;align-items: center; width: 25%">
+                            <div ref="qrCodeDiv">
+                                <img width="200" height="200" :src="$store.state.FILEURL + workDetail.qrCode" alt="">
+                            </div>
+                            <el-button style="margin-top: 20px" type="primary" @click="printBtn()" size="medium">打印方案二维码
+                            </el-button>
+                        </div>
+                        <!-- <div v-if="COMPANY != 'longguang'" class="qr-box">
+                                      <div id="qrCode" ref="qrCodeDiv"></div>
+                                      <el-button size="medium" class="print-btn" @click="printBtn">打印危大工程标识</el-button>
+                                  </div> -->
+                    </div>
+                </template>
+            </detail>
+        </div>
     </div>
 </template>
 <script>
+import detail from "./detail.vue";
 import {
-    getQualityCommonProblemLibraryTreeApi,
-    addQualityCommonProblemLibraryApi,
-    editQualityCommonProblemLibraryApi,
-    deleteQualityCommonProblemLibraryApi,
-    getQualityCommonProblemRecordPageApi,
-    addQualityCommonProblemRecordApi,
-    editQualityCommonProblemRecordApi,
-    deleteQualityCommonProblemRecordApi,
+    getConstructionEquipmentCategoryTreeApi,
+    addConstructionEquipmentCategoryApi,
+    editConstructionEquipmentCategoryApi,
+    deleteConstructionEquipmentCategoryApi,
 
-    editStateApi,
-    singleEditStateApi
-} from '@/assets/js/api/quality'
+    getConstructionEquipmentPageApi,
+    saveWithFileConstructionEquipmentApi,
+    editConstructionEquipmentApi,
+    deleteConstructionEquipmentApi,
+
+    getConstructionEquipmentByIdApi,
+    getConstructionEquipmentFileListApi,
+} from '@/assets/js/api/buildEquipToolManage'
+import { getWorkerInfoList } from '@/assets/js/api/laborPerson.js'
 import { isJSON } from "@/util/nowDate/index";
 export default {
     name: 'qualityProblemBank',
+    components: {
+        detail,
+    },
     data() {
         return {
-            qualityCommonProblemName: '',
+            formLabelWidthDetail: "140px",
+            styleType: 1,
+            classificationName: '',
             defaultProps: {
                 children: 'children',
-                label: 'qualityCommonProblemName',
+                label: 'classificationName',
                 id: 'id'
             },
             projectSn: '',
@@ -223,7 +439,9 @@ export default {
             showExpand: true,
             listData: [],
             formInline: {
-                content: '',
+                projectEquipmentNumber: '',
+                commonDiseasePhenomena: '',
+                specificationModel: '',
                 recordStatus: 0
             },
             tableData: [],
@@ -235,60 +453,117 @@ export default {
             cardDialog: false,
             cardForm: {},
             cardFormRules: {
-                qualityCommonProblemName: [
+                equipmentName: [
                     {
                         required: true,
                         message: this.$t("message.personnelPosition.required"),
                         trigger: "blur",
                     },
                 ],
-                commonDiseasePhenomena: [
+                specificationModel: [
                     {
                         required: true,
                         message: this.$t("message.personnelPosition.required"),
                         trigger: "blur",
                     },
                 ],
-                controlPoint: [
+                projectEquipmentNumber: [
                     {
                         required: true,
                         message: this.$t("message.personnelPosition.required"),
                         trigger: "blur",
                     },
                 ],
-                technicalOperation: [
+                equipmentManager: [
                     {
                         required: true,
                         message: this.$t("message.personnelPosition.mandatory"),
                         trigger: "change",
                     },
                 ],
+                actualOnSiteDate: [
+                    {
+                        required: true,
+                        message: this.$t("message.personnelPosition.mandatory"),
+                        trigger: "change",
+                    },
+                ],
+                shipmentDate: [
+                    {
+                        required: true,
+                        message: this.$t("message.personnelPosition.mandatory"),
+                        trigger: "change",
+                    },
+                ],
+                status: [
+                    {
+                        required: true,
+                        message: this.$t("message.personnelPosition.required"),
+                        trigger: "blur",
+                    },
+                ],
+                equipmentSourceUnit: [
+                    {
+                        required: true,
+                        message: this.$t("message.personnelPosition.required"),
+                        trigger: "blur",
+                    },
+                ],
             },
+            specialEquipmentList: [{
+                id: 1,
+                specialEquipmentName: "是",
+            }, {
+                id: 2,
+                specialEquipmentName: "否",
+            }],
             isAdd: -1,
             pageNo: 1,
             pageSize: 10,
             total: 10,
+            workerListOptions: [],
+            isSuperDanger: "",
+            workDetail: {},
+            detailId: '',
+            dialogTitle: '',
+            isEdit: false,
+            dialogFormVisible: true,
         }
     },
     watch: {
-        qualityCommonProblemName(val) {
+        classificationName(val) {
             this.$refs.tree.filter(val)
         }
     },
     created() {
         this.projectSn = this.$store.state.projectSn;
         this.projectInfo = isJSON(localStorage.getItem("projectInfo")) ? JSON.parse(localStorage.getItem("projectInfo")) : {};
-        this.getDangerTypeRecordList()
+        this.getDangerTypeRecordList();
+        this.getDutyPerson();
     },
     methods: {
+        printBtn() {
+            // setTimeout(() => {
+            //     console.log(this.$refs["qrCodeDiv"].innerHTML)
+            // },100)
+            // qrCode
+            setTimeout(() => {
+                let printDemo = this.$refs["qrCodeDiv"].innerHTML;
+                console.log(printDemo);
+                window.document.body.innerHTML = printDemo;
+                //没有图片直接打印
+                window.print();
+                window.location.reload();
+            }, 100);
+        },
         //获取左侧---列表信息
         getDangerTypeRecordList() {
             console.log(22)
             let data = {
                 projectSn: this.projectSn,
-                qualityCommonProblemName: this.qualityCommonProblemName
+                classificationName: this.classificationName
             }
-            getQualityCommonProblemLibraryTreeApi(data).then((res) => {
+            getConstructionEquipmentCategoryTreeApi(data).then((res) => {
                 if (res.code == 200) {
                     if (res.result.length > 0) {
                         this.listData = res.result
@@ -299,35 +574,30 @@ export default {
             })
         },
         // 删除文件
-        handleRemove(file, fileList, type) {
-            const fileTypeMap = {
-                1: 'commonDiseasePicture',
-                2: 'commonDiseasePreventionMethodPicture'
-            };
-            const key = fileTypeMap[type];
-            if (key) {
-                this.cardForm[key] = fileList;
+        handleRemove(file, fileList, id) {
+            const find = this.cardForm.tableList.find((item) => item.id == id);
+            if (find) {
+                find.fileList = fileList;
             }
         },
-        handleSuccess(res, file, type) {
+        handleSuccess(res, file, id) {
             if (res.status == "SUCCESS") {
-                const fileTypeMap = {
-                    1: 'commonDiseasePicture',
-                    2: 'commonDiseasePreventionMethodPicture'
-                };
-                const key = fileTypeMap[type];
-                if (key) {
-                    this.cardForm[key].push({
+                const find = this.cardForm.tableList.find((item) => item.id == id);
+                if (find) {
+                    find.fileList = [{
                         name: file.name,
                         url: file.response.data[0].imageUrl,
-                    });
+                    }]
                 }
             }
         },
+        handleExceed() {
+            this.$message.warning("文件超出最大限制,请删除上份文件!");
+        },
         //左边节点 输入筛选
         filterNode(value, data) {
             if (!value) return true
-            return data.qualityCommonProblemName.indexOf(value) !== -1
+            return data.classificationName.indexOf(value) !== -1
         },
         isAddPoint(type, node, data) {
             this.isAdd = type;
@@ -336,7 +606,7 @@ export default {
                 if (node) {
                     this.cardForm = {
                         parentId: data.id,
-                        qualityCommonProblemName: "",
+                        classificationName: "",
                     };
                     this.cardDialogTitle = "新增子级";
                 } else {
@@ -353,13 +623,7 @@ export default {
                     ...data,
                 };
             } else if (type == 3) {
-                this.cardForm = {
-                    commonDiseasePhenomena: "",
-                    commonDiseasePicture: [],
-                    controlPoint: "",
-                    commonDiseasePreventionMethodPicture: [],
-                    qualityCommonProblemLibraryId: this.checkedNodeData.id,
-                };
+                this.initCardFormData();
                 this.$nextTick(() => {
                     this.$refs["cardForm"] && this.$refs["cardForm"].resetFields();
                 });
@@ -367,10 +631,27 @@ export default {
             } else if (type == 4) {
                 this.cardDialogTitle = this.$t("message.laborDev.btn_edit"); //编辑卡片
                 console.log(node);
-                this.cardForm = {
-                    ...node,
-                    qualityCommonProblemLibraryId: this.checkedNodeData.id,
-                };
+
+                getConstructionEquipmentFileListApi({
+                    constructionEquipmentToolId: node.id,
+                    // projectSn: this.$store.state.projectSn,
+                }).then((res) => {
+
+                    this.cardForm = {
+                        ...node,
+                        tableList: res.result ? res.result.map(item => {
+                            return {
+                                id: item.id,
+                                fileName: item.name,
+                                constructionEquipmentToolId: item.constructionEquipmentToolId,
+                                fileList: [{
+                                    name: item.originName,
+                                    url: item.fileUrl,
+                                }]
+                            }
+                        }) : [],
+                    };
+                })
             }
         },
         //添加或编辑卡片
@@ -381,11 +662,35 @@ export default {
                         ...this.cardForm,
                         projectSn: this.$store.state.projectSn,
                     }
+                    if (this.isAdd == 3 || this.isAdd == 4) {
+                        const everyFlag = this.cardForm.tableList.every(item => item.fileName && item.fileList.length > 0);
+                        console.log(everyFlag, this.cardForm.tableList);
+                        if (!everyFlag) {
+                            this.$message.error("请上传附件和附件名称");
+                            return false;
+                        }
+                        result.files = this.cardForm.tableList.map(item => {
+                            let obj = {
+                                projectSn: this.$store.state.projectSn,
+                                name: item.fileName,
+                                originName: item.fileList[0].name,
+                                fileUrl: item.fileList[0].url,
+                            };
+                            if(item.constructionEquipmentToolId){
+                                obj.constructionEquipmentToolId = item.constructionEquipmentToolId;
+                                obj.id = item.id;
+                            }
+                            return {
+                                ...obj,
+                            }
+                        })
+                    }
                     console.log(result);
                     if (this.isAdd == 1) {
                         // this.cardForm.floorId = this.currentFloorDetail.floorId
-                        addQualityCommonProblemLibraryApi(result).then((res) => {
+                        addConstructionEquipmentCategoryApi(result).then((res) => {
                             this.cardDialog = false;
+                            this.handleClose();
                             this.getDangerTypeRecordList()
                             this.getDangerItemRecord()
                             this.$message.success(
@@ -393,35 +698,35 @@ export default {
                             ); //添加成功！
                         });
                     } else if (this.isAdd == 2) {
-                        editQualityCommonProblemLibraryApi(result).then((res) => {
+                        editConstructionEquipmentCategoryApi(result).then((res) => {
                             this.cardDialog = false;
+                            this.handleClose();
                             this.getDangerTypeRecordList()
                             this.getDangerItemRecord()
                             this.$message.success(
                                 this.$t("message.personnelPosition.edit_success")
                             ); //编辑成功！
                         });
-                    } else if (this.isAdd == 3) {
-                        result.commonDiseasePicture = JSON.stringify(result.commonDiseasePicture)
-                        result.commonDiseasePreventionMethodPicture = JSON.stringify(result.commonDiseasePreventionMethodPicture)
-                        addQualityCommonProblemRecordApi(result).then((res) => {
+                    } else if (this.isAdd == 3 || this.isAdd == 4) {
+                        saveWithFileConstructionEquipmentApi(result).then((res) => {
                             this.cardDialog = false;
+                            this.handleClose();
                             this.getDangerItemRecord()
                             this.$message.success(
                                 this.$t("message.personnelPosition.add_success")
                             ); //添加成功！
                         });
-                    } else if (this.isAdd == 4) {
-                        result.commonDiseasePicture = JSON.stringify(result.commonDiseasePicture)
-                        result.commonDiseasePreventionMethodPicture = JSON.stringify(result.commonDiseasePreventionMethodPicture)
-                        editQualityCommonProblemRecordApi(result).then((res) => {
-                            this.cardDialog = false;
-                            this.getDangerItemRecord()
-                            this.$message.success(
-                                this.$t("message.personnelPosition.add_success")
-                            ); //添加成功！
-                        });
-                    }
+                    } 
+                    // else if (this.isAdd == 4) {
+                    //     editConstructionEquipmentApi(result).then((res) => {
+                    //         this.cardDialog = false;
+                    //         this.handleClose();
+                    //         this.getDangerItemRecord()
+                    //         this.$message.success(
+                    //             this.$t("message.personnelPosition.edit_success")
+                    //         ); //编辑成功！
+                    //     });
+                    // }
                 } else {
                     console.log("error submit!!");
                     return false;
@@ -430,24 +735,45 @@ export default {
         },
         // 初始化
         initCardFormData() {
-            this.cardForm = {
-                qualityCommonProblemName: "",
-            };
+            if (this.isAdd == 1 || this.isAdd == 2) {
+                this.cardForm = {
+                    classificationName: "",
+                }
+            } else if (this.isAdd == 3 || this.isAdd == 4) {
+                this.cardForm = {
+                    constructionEquipmentToolClassificationId: this.checkedNodeData.id,
+                    equipmentName: "",
+                    isSpecial: "",
+                    specificationModel: "",
+                    projectEquipmentNumber: "",
+                    equipmentManager: "",
+                    onSiteHandler: "",
+                    actualOnSiteDate: "",
+                    shipmentDate: "",
+                    status: "",
+                    manufacturer: "",
+                    equipmentSourceUnit: "",
+                    installationRemovalUnit: "",
+                    deviceUsed: "",
+                    equipmentLocation: "",
+                    ownershipNumber: "",
+                    serviceLife: "",
+                    tableList: [],
+                    commonDiseasePicture: [],
+                    commonDiseasePreventionMethodPicture: [],
+                };
+            }
+        },
+        goBack() {
+            this.dialogFormVisible = true;
+            // this.initData()
+            this.isAdd = false;
+            this.isEdit = false;
+            this.isUpdate = false;
         },
         // 关闭前执行
         handleClose(done) {
-
-            if (this.isAdd == 1 || this.isAdd == 2) {
-                this.initCardFormData();
-            } else if (this.isAdd == 3 || this.isAdd == 4) {
-                this.cardForm = {
-                    commonDiseasePhenomena: "",
-                    commonDiseasePicture: [],
-                    controlPoint: "",
-                    commonDiseasePreventionMethodPicture: [],
-                    qualityCommonProblemLibraryId: this.checkedNodeData.id,
-                };
-            }
+            this.initCardFormData();
             this.$refs["cardForm"].resetFields();
             // console.log(this.$refs["cardForm"].resetFields())
             if (done && typeof done === "function") {
@@ -456,6 +782,36 @@ export default {
                 this.cardDialog = false;
             }
         },
+        // 添加作业人员数据(起吊作业)
+        onAddTable() {
+            this.cardForm.tableList.push({
+                id: "id-" + Math.random().toString(36).substr(2, 9),
+                fileName: "",
+                fileList: [],
+            });
+        },
+        // 删除作业人员数据(起吊作业)
+        onDeleteTable(row) {
+            this.$confirm('确定删除该行数据, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const findIndex = this.cardForm.tableList.findIndex(item => item.id === row.id);
+                if (findIndex !== -1) {
+                    this.cardForm.tableList.splice(findIndex, 1);
+                    this.$message({
+                        type: 'success',
+                        message: '删除成功!'
+                    });
+                }
+            }).catch(() => {
+                // this.$message({
+                //   type: 'info',
+                //   message: '已取消删除'
+                // });
+            });
+        },
         // 删除作业人员数据(起吊作业)
         deleteTreeRow(row) {
             console.log(row)
@@ -464,7 +820,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                deleteQualityCommonProblemLibraryApi({
+                deleteConstructionEquipmentCategoryApi({
                     id: row.id,
                     projectSn: this.projectSn
                 }).then((res) => {
@@ -489,7 +845,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                deleteQualityCommonProblemRecordApi({
+                deleteConstructionEquipmentApi({
                     id: row.id,
                     projectSn: this.projectSn
                 }).then((res) => {
@@ -506,22 +862,6 @@ export default {
                 // });
             });
         },
-        //左侧 --启用  禁用 按钮
-        singleEditState(node, data, type) {
-            let newData = {
-                projectSn: this.projectSn,
-                recordStatus: type,
-                id: data.id
-            }
-            singleEditStateApi(newData).then((res) => {
-                console.log(res)
-                if (res.code == 200) {
-                    this.$message.success(res.message)
-                    this.getDangerTypeRecordList()
-                    this.getDangerItemRecord()
-                }
-            })
-        },
         //获取选中的 节点
         getCheckedNode(data) {
             this.checkedNodeData = data;
@@ -548,12 +888,14 @@ export default {
         getDangerItemRecord() {
             let data = {
                 projectSn: this.projectSn,
-                qualityCommonProblemLibraryId: this.checkedNodeData.id,
-                content: this.formInline.content,
+                constructionEquipmentToolClassificationId: this.checkedNodeData.id,
+                projectEquipmentNumber: this.formInline.projectEquipmentNumber,
+                commonDiseasePhenomena: this.formInline.commonDiseasePhenomena,
+                specificationModel: this.formInline.specificationModel,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize,
             }
-            getQualityCommonProblemRecordPageApi(data).then((res) => {
+            getConstructionEquipmentPageApi(data).then((res) => {
                 if (res.code == 200) {
                     this.tableData = res.result.records.map(item => {
                         return {
@@ -576,22 +918,6 @@ export default {
         onSubmit() {
             this.getDangerItemRecord()
         },
-        // 批量启用  批量停用
-        editState(type) {
-            let data = {
-                projectSn: this.projectSn,
-                recordStatus: type,
-                idStr: this.checkboxId.join(',')
-            }
-            editStateApi(data).then((res) => {
-                console.log(data)
-                if (res.code == 200) {
-                    this.$message.success(res.message)
-                    this.getDangerItemRecord()
-                    this.getDangerTypeRecordList()
-                }
-            })
-        },
 
         //表格多选
         handleSelectionChange(value) {
@@ -606,7 +932,44 @@ export default {
                 this.checkboxId = value
                 this.showBatch = true
             }
-        }
+        },
+        //查询选择人员下拉
+        getDutyPerson() {
+            let data = {
+                projectSn: this.$store.state.projectSn,
+                // isFilterQualityRegionEnterprise: 1
+            }
+            getWorkerInfoList(data).then(res => {
+                if (res.code == 200) {
+                    this.workerListOptions = res.result.records
+                    console.log('获取施工人员下拉', this.workerListOptions)
+                } else {
+                    this.$message.error(res.message)
+                }
+            })
+        },
+        previewDetail(val) {
+            console.log("!!!!!!!!!!!!!!!!!!", val);
+            this.dialogFormVisible = false;
+            this.isEdit = true;
+            // 详细
+            this.dialogTitle = this.$t("message.dangerousBigProject.detailed");
+            this.detailId = val.id;
+
+            getConstructionEquipmentByIdApi({
+                id: val.id,
+            }).then((res) => {
+                if (res.result) {
+                    console.log(res.result, 1);
+                    this.workDetail = {
+                        ...val,
+                        ...res.result,
+                    };
+                }
+            });
+
+            this.isSuperDanger = val.issuperdanger;
+        },
     },
     computed: {
         srcListUp() {
@@ -620,6 +983,111 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.info-content {
+    display: flex;
+}
+.info-title {
+    display: flex;
+    align-items: center;
+    font-size: 18px;
+    margin-left: 10px;
+
+    .info-title_right {
+        margin-left: 10px;
+        background-color: #EA3941;
+        color: #fff;
+        font-size: 14px;
+        border-radius: 4px;
+        padding: 4px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+}
+
+.gasanalysis-table1 {
+    width: 100%;
+
+    table {
+        width: 100%;
+        // height: 100%;
+        font-size: 16px;
+        margin-bottom: 20px;
+    }
+
+    tr {
+        height: 50px;
+    }
+
+    td {
+        text-align: center;
+        min-width: 50px;
+
+        .el-select,
+        /deep/ .el-input {
+            width: 150px !important;
+        }
+    }
+
+    table,
+    td,
+    th {
+        border: 1px solid #CDCDCD;
+        border-collapse: collapse;
+        // color: white;
+    }
+
+    th {
+        background-color: #EEEEEE;
+    }
+}
+
+.form-box {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+
+    /deep/.el-form-item {
+        width: 25%;
+        padding-right: 10px;
+        box-sizing: border-box;
+    }
+
+    // /deep/.el-col-12{
+    //     padding-left: 20px;
+    // }
+    /deep/.el-input__inner {
+        width: 100%;
+    }
+
+    /deep/.el-select {
+        width: 100%;
+    }
+
+    /deep/.el-cascader {
+        width: 100%;
+    }
+}
+
+.dialogFormBox {
+    width: initial;
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap;
+
+    .addbox {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+    }
+}
+
+.icon-box {
+    >i:not(:first-child) {
+        margin-left: 10px;
+    }
+}
+
 .flex {
     display: flex;
 }
@@ -635,6 +1103,24 @@ export default {
     justify-content: space-between;
 }
 
+.backText {
+    padding: 0;
+    padding-left: 10px;
+
+    /deep/.el-page-header__content {
+        font-size: 14px;
+    }
+}
+
+.qualityProblemBank2 {
+    padding-bottom: 20px;
+    height: 100%;
+    background: #fff;
+    padding: 0 10px;
+    padding-top: 10px;
+    box-sizing: border-box;
+}
+
 .qualityProblemBank {
     width: 100%;
     height: 100%;
@@ -658,17 +1144,38 @@ export default {
         box-sizing: border-box;
         background-color: white;
 
-        .btn_wrap {
-            border-top: 1px solid @borderColor;
-            margin-top: 10px;
-            padding-top: 10px;
-            text-align: center;
-            position: absolute;
-            bottom: 16px;
-            right: 0;
-            left: 0;
+        .btn_wrap_box {
+            margin-bottom: 10px;
+            display: flex;
+            justify-content: space-between;
+
+            .btn_wrap {
+                // border-top: 1px solid @borderColor;
+
+                // padding-top: 10px;
+                text-align: center;
+                // position: absolute;
+                // bottom: 16px;
+                // right: 0;
+                // left: 0;
+                display: flex;
+
+                >.el-button {
+                    margin: 0;
+                }
+
+                >.el-button:first-child {
+                    border-radius: 2px 0 0 2px;
+                }
+
+                >.el-button:last-child {
+                    border-radius: 0 2px 2px 0;
+                    border-left: none;
+                }
+            }
         }
 
+
         .ellipsis {
             width: 150px;
             overflow: hidden;
diff --git a/src/views/projectFront/constructionManage/schemeLedger.vue b/src/views/projectFront/constructionManage/schemeLedger.vue
index 80c41546..f67e1015 100644
--- a/src/views/projectFront/constructionManage/schemeLedger.vue
+++ b/src/views/projectFront/constructionManage/schemeLedger.vue
@@ -268,7 +268,7 @@
                 </div>
                 <div style="width: 100%">
                     <el-table max-height="450" :data="personnelList">
-                        <el-table-column prop="realName" label="部门或成员" align="center">
+                        <el-table-column prop="realName" label="姓名" align="center">
                             <template slot-scope="scope">
                                 <div style="display: flex; justify-content: center; align-items: center;">
                                     <!-- <el-avatar size="small" icon="el-icon-user-solid"></el-avatar> -->
@@ -762,7 +762,7 @@ export default {
                 console.log(every);
                 // this.previewUrl = every ? `http://jxjzw.zhgdyun.com:8012/onlinePreview?url=${src}` : row.schemeAttachment[0].url;
                 let src = row.schemeAttachment[0].url;
-                this.previewUrl = every ? `https://view.xdocin.com/view?src=${encodeURIComponent(src)}` : row.schemeAttachment[0].url;
+                this.previewUrl = every ? `https://ofd.xdocin.com/view?src=${encodeURIComponent(src)}` : row.schemeAttachment[0].url;
                 console.log(this.previewUrl);
                 // https://view.xdocin.com/view?src=${encodeURIComponent(src)};
                 // http://42.180.188.17:9809/image/665e7d0dbe74b65b6b7c0619.docx
diff --git a/src/views/projectFront/firstModelManage/firstModelLedger.vue b/src/views/projectFront/firstModelManage/firstModelLedger.vue
index fbb231af..485b8f4d 100644
--- a/src/views/projectFront/firstModelManage/firstModelLedger.vue
+++ b/src/views/projectFront/firstModelManage/firstModelLedger.vue
@@ -525,7 +525,7 @@ export default {
             });
             console.log(every);
             let src = row.url.includes('http://') ? row.url : this.$store.state.FILEURL + row.url;
-            this.previewUrl = every ? `https://view.xdocin.com/view?src=${encodeURIComponent(src)}` : src;
+            this.previewUrl = every ? `https://ofd.xdocin.com/view?src=${encodeURIComponent(src)}` : src;
             console.log(this.previewUrl);
             this.cardDialog = true;
         },
diff --git a/src/views/projectFront/operationManage/fireWorks.vue b/src/views/projectFront/operationManage/fireWorks.vue
index 20b0943b..112a15a2 100644
--- a/src/views/projectFront/operationManage/fireWorks.vue
+++ b/src/views/projectFront/operationManage/fireWorks.vue
@@ -538,7 +538,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item v-if="cardForm.level == 2" label="安质环部安全经理批准人" prop="epcSiteManagerReviewer">
-                <el-select filterable v-model="cardForm.epcSiteManagerReviewer"
+                <el-select filterable v-model="cardForm.safetyQualityEnvironmentDepartmentManager"
                   :placeholder="$t('message.personnelPosition.please_select')" filterable>
                   <el-option :label="item.workerName" :value="item.id" v-for="(item, index) in workerListOptions"
                     :key="index">
@@ -946,7 +946,7 @@
                   {{ workDetail.projectConstructionManagerName }}
                 </el-form-item>
                 <el-form-item v-if="workDetail.level == 2" label="安质环部安全经理批准人：" :label-width="formLabelWidthDetail">
-                  {{ workDetail.epcSiteManagerReviewerName }}
+                  {{ workDetail.safetyQualityEnvironmentDepartmentManagerName }}
                 </el-form-item>
                 <el-form-item v-if="workDetail.level == 3" label="承包商施工经理审核人：" :label-width="formLabelWidthDetail">
                   {{ workDetail.contractorConstructionManagerReviewerName }}
@@ -1929,7 +1929,7 @@ export default {
         hotFireArea: "",
         hotFireContent: "",
         number: "",
-        level: 1,
+        level: -1,
         applicant1: "",
         applicant2: "",
         guardian1: "",
diff --git a/src/views/projectFront/operationManage/liftingErectionWorks.vue b/src/views/projectFront/operationManage/liftingErectionWorks.vue
index ca824f42..1e32f0b8 100644
--- a/src/views/projectFront/operationManage/liftingErectionWorks.vue
+++ b/src/views/projectFront/operationManage/liftingErectionWorks.vue
@@ -592,7 +592,7 @@
                                     {{ workDetail.safetyEngineerTimeOfSupervisionUnit }}
                                 </el-form-item>
                                 <el-form-item label="总监/总代：" :label-width="formLabelWidthDetail">
-                                    {{ workDetail.directorGeneralAgent }}
+                                    {{ workDetail.directorGeneralAgentName }}
                                 </el-form-item>
                                 <el-form-item label="总监/总代时间：" :label-width="formLabelWidthDetail">
                                     {{ workDetail.directorGeneralAgentTime }}
diff --git a/src/views/projectFront/quality/qualityProblems/qualityProblemBank.vue b/src/views/projectFront/quality/qualityProblems/qualityProblemBank.vue
index abd9ac45..3bb89eb8 100644
--- a/src/views/projectFront/quality/qualityProblems/qualityProblemBank.vue
+++ b/src/views/projectFront/quality/qualityProblems/qualityProblemBank.vue
@@ -95,7 +95,7 @@
                 scope.row.controlPoint
               }}</template>
             </el-table-column>
-            <el-table-column align="center" prop="commonDiseasePreventionMethodPicture" label="通病防治做法图片">
+            <el-table-column align="center" prop="commonDiseasePreventionMethodPicture" label="整改结果">
               <template slot-scope="scope">
                 <div style="display: flex; align-items: center; justify-content:center">
                   <!-- <img style="width: 100%; height: 100%" :src="require(@/assets/images/image-pre.png)" alt=""> -->
@@ -132,7 +132,7 @@
         </div>
         <!-- 添加卡片弹框 -->
         <el-dialog :destroy-on-close="true" :modal-append-to-body="false" :title="cardDialogTitle"
-          :visible.sync="cardDialog" width="1100px" :before-close="handleClose">
+          :visible.sync="cardDialog" width="600px" :before-close="handleClose">
           <div class="dialog_content">
             <el-form size="medium" :model="cardForm" ref="cardForm" :rules="cardFormRules" label-width="170px"
               class="dialogFormBox">