diff --git a/src/api/modules/project.ts b/src/api/modules/project.ts
index fa495d5..f03dc6a 100644
--- a/src/api/modules/project.ts
+++ b/src/api/modules/project.ts
@@ -713,3 +713,82 @@ export const engineerMainDetails = (params: any) => {
 export const dangerousEngineerPage = (params: any) => {
 	return http.post(BASEURL + `/project/dangerousEngineering/page`, params);
 };
+// 新增危大工程
+export const dangerousEngineerAdd = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineering/add`, params);
+};
+// 删除危大工程
+export const dangerousEngineerDelete = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineering/delete`, params);
+};
+// 根据id查询危大工程信息
+export const dangerousEngineerDetails = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineering/queryById`, params);
+};
+// 专项施工方案列表
+export const constructionSchemeList = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringProgramme/list`, params);
+};
+// 专项施工方案添加
+export const constructionSchemeAdd = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringProgramme/add`, params);
+};
+// 专项施工方案删除
+export const constructionSchemeDelete = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringProgramme/delete`, params);
+};
+// 专项施工方案附件信息
+export const constructionSchemeFile = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringProgramme/queryAnnexFile`, params);
+};
+
+// 施工进度列表
+export const constructionProgressList = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringProgress/list`, params);
+};
+// 施工进度添加
+export const constructionProgressAdd = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringProgress/add`, params);
+};
+// 施工进度编辑
+export const constructionProgressEdit = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringProgress/edit`, params);
+};
+// 施工进度删除
+export const constructionProgressDelete = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringProgress/delete`, params);
+};
+
+// 现场巡视列表
+export const localInspectList = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringInspect/list`, params);
+};
+// 现场巡视添加
+export const localInspectAdd = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringInspect/add`, params);
+};
+// 现场巡视编辑
+export const localInspectEdit = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringInspect/edit`, params);
+};
+// 现场巡视删除
+export const localInspectDelete = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringInspect/delete`, params);
+};
+
+// 危大工程验收列表
+export const engineerAcceptList = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringCheckAccept/list`, params);
+};
+// 危大工程验收添加
+export const engineerAcceptAdd = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringCheckAccept/add`, params);
+};
+// 危大工程验收编辑
+export const engineerAcceptEdit = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringCheckAccept/edit`, params);
+};
+// 危大工程验收删除
+export const engineerAcceptDelete = (params: any) => {
+	return http.post(BASEURL + `/project/dangerousEngineeringCheckAccept/delete`, params);
+};
diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
index 49bd1a3..01cf19d 100644
--- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
+++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
@@ -371,10 +371,10 @@ const onUpload = async (row: any, index: any) => {
 		row.fileList.map(item => {
 			if (item.response) {
 				arr.push({
-					response: { ...item.response, url: item.response.fileUrl },
-					name: item.response.fileName,
-					url: item.response.fileUrl,
-					size: +item.response.fileSize,
+					response: { ...item.response, url: item.response.url },
+					name: item.response.originalFilename,
+					url: item.response.url,
+					size: +item.response.size,
 					type: item.response.contentType
 				});
 			} else {
diff --git a/src/views/enterprise/hoistingMachineryRecord/index.vue b/src/views/enterprise/hoistingMachineryRecord/index.vue
index 081db31..a1c0401 100644
--- a/src/views/enterprise/hoistingMachineryRecord/index.vue
+++ b/src/views/enterprise/hoistingMachineryRecord/index.vue
@@ -140,6 +140,19 @@ const columns: ColumnProps[] = [
 			{ label: "禁用", value: 2 }
 		]
 	},
+	{
+		prop: "timeLimit",
+		label: "提交时间",
+		isShow: false,
+		search: {
+			el: "date-picker",
+			props: {
+				type: "daterange",
+				format: "YYYY-MM-DD",
+				valueFormat: "YYYY-MM-DD"
+			}
+		}
+	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 260 }
 ];
 // 备案新增完成
@@ -213,10 +226,10 @@ const transfrom = (arr: Array<any>) => {
 // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
 const getTableList = (params: any) => {
 	let newParams = JSON.parse(JSON.stringify(params));
-	if (newParams.installTime) {
-		newParams.installTime_begin = newParams.installTime[0];
-		newParams.installTime_end = newParams.installTime[1];
-		delete newParams.installTime;
+	if (newParams.timeLimit) {
+		newParams.createTime_begin = newParams.timeLimit[0];
+		newParams.createTime_end = newParams.timeLimit[1];
+		delete newParams.timeLimit;
 	}
 	return hoistEquipPage(newParams);
 };
diff --git a/src/views/enterprise/monthlyReport/index.vue b/src/views/enterprise/monthlyReport/index.vue
index 04548bb..ea2685c 100644
--- a/src/views/enterprise/monthlyReport/index.vue
+++ b/src/views/enterprise/monthlyReport/index.vue
@@ -148,7 +148,7 @@ const columns: ColumnProps[] = [
 		label: "监理单位"
 	},
 	{
-		prop: "createBy",
+		prop: "createByName",
 		label: "填写人"
 	},
 	{
diff --git a/src/views/goverment/monthlyReport/index.vue b/src/views/goverment/monthlyReport/index.vue
index f94ca8a..a53022e 100644
--- a/src/views/goverment/monthlyReport/index.vue
+++ b/src/views/goverment/monthlyReport/index.vue
@@ -115,7 +115,7 @@ const columns: ColumnProps[] = [
 		label: "监理单位"
 	},
 	{
-		prop: "createBy",
+		prop: "createByName",
 		label: "填写人"
 	},
 	{
diff --git a/src/views/project/dangerousEngineering/components/engineerAdd.vue b/src/views/project/dangerousEngineering/components/engineerAdd.vue
index 6a16d9f..fad3be8 100644
--- a/src/views/project/dangerousEngineering/components/engineerAdd.vue
+++ b/src/views/project/dangerousEngineering/components/engineerAdd.vue
@@ -78,7 +78,7 @@
 								<div class="switch-box">
 									<el-switch v-model="formData.technicalDisclosureType" :active-value="2" :inactive-value="1" />
 									<span>未完成</span>
-									<el-button type="primary">点击上传</el-button>
+									<el-button type="primary" @click="onUpload('technicalDisclosureFile')">点击上传</el-button>
 								</div>
 							</el-form-item>
 						</el-col>
@@ -87,7 +87,7 @@
 								<div class="switch-box">
 									<el-switch v-model="formData.securityConstructionSchemeType" :active-value="2" :inactive-value="1" />
 									<span>未完成</span>
-									<el-button type="primary">点击上传</el-button>
+									<el-button type="primary" @click="onUpload('securityConstructionSchemeFile')">点击上传</el-button>
 								</div>
 							</el-form-item>
 						</el-col>
@@ -98,7 +98,7 @@
 								<div class="switch-box">
 									<el-switch v-model="formData.specialConstructionSchemeType" :active-value="2" :inactive-value="1" />
 									<span>未完成</span>
-									<el-button type="primary">点击上传</el-button>
+									<el-button type="primary" @click="onUpload('specialConstructionSchemeFile')">点击上传</el-button>
 								</div>
 							</el-form-item>
 						</el-col>
@@ -110,15 +110,18 @@
 				<el-button type="primary" @click="confirm(formRef)"> 保存 </el-button>
 			</template>
 		</el-dialog>
+		<!-- 附件上传 -->
+		<FilesUploadPlus v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 	</div>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, ref, watch } from "vue";
-import type { FormInstance, UploadProps } from "element-plus";
+import type { FormInstance } from "element-plus";
 import { ElMessage } from "element-plus";
-import { submitMonthlyReport, engineerMainDetails } from "@/api/modules/project";
 import { getDicList } from "@/api/modules/jxjview";
+import FilesUploadPlus from "@/components/FilesUploadPlus/FilesUpload.vue";
+import { dangerousEngineerAdd } from "@/api/modules/project";
 const props = defineProps({
 	addVisible: Boolean,
 	searchSn: String,
@@ -126,6 +129,11 @@ const props = defineProps({
 	relativeId: String
 });
 const emits = defineEmits(["update:addVisible", "confirm"]);
+const documentDataKey = ref("");
+const current = ref({
+	files: []
+});
+const showFilesUpload = ref(false);
 const typeList = ref([]);
 const rules = ref({
 	engineeringName: [
@@ -153,11 +161,55 @@ const rules = ref({
 const formRef = ref<FormInstance>();
 const fileList = ref([]);
 const formData = ref<any>({
-	technicalDisclosureFile: "",
-	securityConstructionSchemeFile: "",
-	specialConstructionSchemeFile: ""
+	technicalDisclosureFile: [],
+	securityConstructionSchemeFile: [],
+	specialConstructionSchemeFile: []
 });
 const visible1 = ref(false);
+// 附件上传改变
+const handlechange = e => {
+	console.log(e);
+	current.value.files = e.map(item => {
+		item.label = current.value.dictLabel;
+		return item;
+	});
+	console.log(current.value.files);
+	formData.value[documentDataKey.value] = current.value.files;
+};
+// 上传附件按钮
+const onUpload = async (key: any) => {
+	console.log(key);
+	showFilesUpload.value = true;
+	documentDataKey.value = key;
+	console.log(formData.value[key]);
+	if (formData.value[key].length > 0) {
+		let arr: any = [];
+		formData.value[key].map(item => {
+			if (item.response) {
+				arr.push({
+					response: { ...item.response, url: item.response.url },
+					name: item.response.originalFilename,
+					url: item.response.url,
+					size: +item.response.size,
+					type: item.response.contentType
+				});
+			} else {
+				arr.push({
+					response: { ...item, url: item.fileUrl },
+					name: item.fileName,
+					url: item.fileUrl,
+					size: +item.fileSize,
+					type: item.contentType
+				});
+			}
+			delete item.response;
+		});
+		current.value.files = arr;
+		console.log(current.value.files);
+	} else {
+		current.value.files = [];
+	}
+};
 const getTypeDicMainList = async () => {
 	// 获取起重机械设备类型字典
 	const { result } = await getDicList({ dictType: "dangerous_engineer_type" });
@@ -176,8 +228,40 @@ const getTypeDicMainList = async () => {
 // 确定按钮触发
 const confirm = async (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
-	await formEl.validate((valid, fields) => {
+	await formEl.validate(async (valid, fields) => {
 		if (valid) {
+			console.log(formData.value);
+			let requestData = {
+				...formData.value,
+				technicalDisclosureFile: "",
+				securityConstructionSchemeFile: "",
+				specialConstructionSchemeFile: ""
+			};
+			if (props.activeValue == "eng") {
+				requestData.engineeringSn = props.searchSn;
+			} else if (props.activeValue == "project") {
+				requestData.projectSn = props.searchSn;
+			}
+			for (let i in requestData) {
+				if (i == "technicalDisclosureFile" || i == "securityConstructionSchemeFile" || i == "specialConstructionSchemeFile") {
+					let arr = [] as any;
+					formData.value[i].map(item => {
+						if (item.response) {
+							arr.push({
+								fileName: item.response.originalFilename,
+								fileUrl: item.response.url
+							});
+						}
+					});
+					requestData[i] = JSON.stringify(arr);
+				}
+			}
+			const res = await dangerousEngineerAdd(requestData);
+			if (res.success) {
+				ElMessage.success("操作成功");
+				visible1.value = false;
+				emits("confirm");
+			}
 		} else {
 			console.log("error submit!", fields);
 			ElMessage({
@@ -200,7 +284,14 @@ watch(
 			if (n) {
 				getTypeDicMainList();
 				fileList.value = [];
-				formData.value = {};
+				formData.value = {
+					technicalDisclosureFile: [],
+					securityConstructionSchemeFile: [],
+					specialConstructionSchemeFile: []
+				};
+				setTimeout(function () {
+					formRef.value?.clearValidate();
+				}, 200);
 			}
 			visible1.value = n;
 		}
diff --git a/src/views/project/dangerousEngineering/components/engineerDetails.vue b/src/views/project/dangerousEngineering/components/engineerDetails.vue
index d7e5904..3ce3021 100644
--- a/src/views/project/dangerousEngineering/components/engineerDetails.vue
+++ b/src/views/project/dangerousEngineering/components/engineerDetails.vue
@@ -1,278 +1,942 @@
 <template>
 	<div class="overview">
-		<el-dialog :show-close="false" v-model="visible1" width="1305px" @close="closeMain">
+		<el-dialog :show-close="false" v-model="visible1" width="1350px" @close="closeMain">
 			<template #title>
 				<div class="title-detail">
-					<span>月报详情</span>
+					<img src="@/assets/images/tableIcon/look.png" alt="" />
+					<span>查看危大工程信息</span>
 					<el-icon>
 						<close @click="closeMain" />
 					</el-icon>
 				</div>
 			</template>
-			<div class="report-content" id="monthlyReport">
-				<div class="title">{{ engineerData.engineeringName }}</div>
-				<div class="title">建设监理工作月报</div>
-				<div class="sub-title">
-					<span>第</span>
-					<span>{{ formData.stage }}</span>
-					<span>期</span>
+			<el-form ref="formRef" :model="formData" label-width="180px" :rules="rules" class="basic-form" size="default">
+				<div class="basic-info">
+					<div class="content-title">基本信息</div>
+					<el-row :gutter="120">
+						<el-col :span="12">
+							<el-form-item label="危大工程名称:" prop="engineeringName">
+								<el-input v-model="formData.engineeringName" placeholder="请输入" disabled />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="危大工程类别:" prop="type">
+								<el-select v-model="formData.type" placeholder="请选择" style="width: 100%" disabled>
+									<el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="120">
+						<el-col :span="12">
+							<el-form-item label="危大工程概况:" prop="engineeringSurvey">
+								<el-input v-model="formData.engineeringSurvey" placeholder="请输入" disabled />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="类别描述:" prop="typeDescribe">
+								<el-input v-model="formData.typeDescribe" placeholder="请输入" disabled />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="120">
+						<el-col :span="12">
+							<el-form-item label="施工部位:" prop="constructionLocation">
+								<el-input v-model="formData.constructionLocation" placeholder="请输入" disabled />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="施工计划:" prop="constructionPlanTime">
+								<el-date-picker
+									disabled
+									style="width: 100%"
+									v-model="formData.constructionPlanTime"
+									format="YYYY-MM-DD"
+									value-format="YYYY-MM-DD"
+									type="date"
+									placeholder="请选择时间"
+								/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="120">
+						<el-col :span="12">
+							<el-form-item label="责任人:" prop="personLiable">
+								<el-input v-model="formData.personLiable" placeholder="请输入" disabled />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="责任分包单位:" prop="responsibilityCompany">
+								<el-input v-model="formData.responsibilityCompany" placeholder="请输入" disabled />
+							</el-form-item>
+						</el-col>
+					</el-row>
 				</div>
-				<div class="sub-title">{{ engineerData.supervisorEnt }}</div>
-				<div class="title">《监理月报》签认表</div>
-				<div class="engineer-name">工程名称：{{ engineerData.engineeringName }}</div>
-				<div class="report-content-part1">
-					<div>致： 监理工程师</div>
-					<div>
-						按照《建设工程监理规范》和公司的有关规定， 年 月 完成了天地一号御花园工程 月份《监理月报》第
-						编写工作，请予以审查签认。
-					</div>
-					<div>编制人员：</div>
-					<div>土建专业监理工程师：</div>
-					<div>水暖专业监理工程师：</div>
-					<div>电气专业监理工程师：</div>
-					<div>（签字）</div>
+				<div class="basic-info">
+					<div class="content-title">危大工程资料</div>
+					<el-row :gutter="120">
+						<el-col :span="12">
+							<el-form-item label="安全技术交底:" prop="devName">
+								<div class="switch-box">
+									<el-switch v-model="formData.technicalDisclosureType" :active-value="2" :inactive-value="1" disabled />
+									<span>未完成</span>
+									<el-button type="primary" @click="onDownLoad('technicalDisclosureFile')">点击下载</el-button>
+								</div>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="安全专项施工方案及附件:" prop="devNumber">
+								<div class="switch-box">
+									<el-switch v-model="formData.securityConstructionSchemeType" :active-value="2" :inactive-value="1" disabled />
+									<span>未完成</span>
+									<el-button type="primary" @click="onDownLoad('securityConstructionSchemeFile')">点击下载</el-button>
+								</div>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="120">
+						<el-col :span="12">
+							<el-form-item label="专项施工方案交底:" prop="devName">
+								<div class="switch-box">
+									<el-switch v-model="formData.specialConstructionSchemeType" :active-value="2" :inactive-value="1" disabled />
+									<span>未完成</span>
+									<el-button type="primary" @click="onDownLoad('specialConstructionSchemeFile')">点击下载</el-button>
+								</div>
+							</el-form-item>
+						</el-col>
+					</el-row>
 				</div>
-				<div class="report-content-part2">
-					<div>项目监理部总监理工程师签认意见：</div>
-					<div>
-						<span>{{ formData.signOpinion }}</span>
-					</div>
-					<div>
-						<span>总监理工程师：</span>
-						<span>年</span>
-						<span>月</span>
+				<div class="basic-info">
+					<div class="content-title">过程管控</div>
+					<div class="tabs-option">
+						<el-tabs v-model="tabPosition" type="card" class="demo-tabs" @tab-click="handleClick">
+							<el-tab-pane label="专项施工方案" :name="0">
+								<div class="content-button">
+									<el-button class="addButtonStyle" @click="addData">新增</el-button>
+								</div>
+								<div class="table">
+									<el-table
+										:data="arrOne"
+										border
+										height="260"
+										class="el-table"
+										:row-style="{ height: '40px', textAlign: 'center' }"
+										:header-cell-style="{ height: '40px', backgroundColor: '#e1eeff', textAlign: 'center' }"
+										:cell-style="{ height: '40px', textAlign: 'center' }"
+									>
+										<el-table-column type="index" label="序号" width="200" />
+										<el-table-column prop="annexName" label="附件名称">
+											<template #default="{ row, $index }">
+												<span v-if="row.id">{{ row.annexName }}</span>
+												<el-input v-else class="test" v-model="row.annexName" />
+											</template>
+										</el-table-column>
+										<el-table-column prop="fileList" label="操作">
+											<template #default="{ row, $index }">
+												<el-button v-if="row.id" type="primary" @click="onTableDownLoad(row)" link>下载附件</el-button>
+												<el-button v-else type="primary" @click="onUpload(row, $index)" link>上传附件</el-button>
+												<el-button v-if="!row.id" type="primary" link @click="confirmAdd(row, $index)">保存</el-button>
+												<el-button type="danger" link @click="removeEngineeringSingle(row, $index)">删除</el-button>
+											</template>
+										</el-table-column>
+										<template #empty>
+											<div class="table-empty">
+												<slot name="empty">
+													<img src="@/assets/images/notData.png" alt="notData" />
+													<div>暂无数据</div>
+												</slot>
+											</div>
+										</template>
+									</el-table>
+								</div>
+							</el-tab-pane>
+							<el-tab-pane label="施工进度" :name="1">
+								<div class="content-button">
+									<el-button class="addButtonStyle" @click="addData">新增</el-button>
+								</div>
+								<div class="table">
+									<el-table
+										:data="arrTwo"
+										class="el-table"
+										height="260"
+										:row-style="{ height: '40px' }"
+										:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
+										:cell-style="{ textAlign: 'center', height: '40px' }"
+									>
+										<el-table-column type="index" label="序号" width="100" />
+										<el-table-column prop="currentProgress" label="当前进度">
+											<template #default="{ row }">
+												<el-input v-model="row.currentProgress" v-if="row.isEdit" />
+												<span v-else>{{ row.currentProgress }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="imageUrl" label="图片">
+											<template #default="{ row }">
+												<div class="face-img" v-if="row.isEdit">
+													<el-upload
+														class="face-uploader"
+														:action="`${baseUrl}` + '/xmgl/file/upload'"
+														:show-file-list="false"
+														:on-success="(response, uploadFile) => handleAvatarSuccess(row, response, uploadFile)"
+														accept="image/jpg, image/jpeg, image/png"
+													>
+														<img v-if="row.imageUrl" :src="row.imageUrl" class="face-avatar" />
+														<el-icon v-else><plus /></el-icon>
+													</el-upload>
+												</div>
+												<img class="showImg" v-else :src="row.imageUrl" />
+											</template>
+										</el-table-column>
+										<el-table-column prop="createByName" label="记录人">
+											<template #default="{ row }">
+												<!-- <el-input v-model="row.createByName" v-if="row.isEdit" />
+												<span v-else>{{ row.createByName }}</span> -->
+												<span>{{ row.createTime }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="createTime" label="记录时间">
+											<template #default="{ row }">
+												<!-- <el-date-picker
+													v-if="row.isEdit"
+													v-model="row.createTime"
+													style="width: 100%"
+													format="YYYY-MM-DD"
+													value-format="YYYY-MM-DD"
+													type="date"
+													placeholder="请选择"
+												/>
+												<span v-else>{{ row.createTime }}</span> -->
+												<span>{{ row.createTime }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column align="center" fixed="right" width="180" label="操作">
+											<template #default="scope">
+												<el-button type="primary" v-if="scope.row.isEdit" link @click="confirmAdd(scope.row, scope.$index)">
+													<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
+													<span>保存</span>
+												</el-button>
+												<el-button type="primary" v-if="!scope.row.isEdit" link @click="scope.row.isEdit = true">
+													<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
+													<span>编辑</span>
+												</el-button>
+												<el-button type="danger" link :icon="Delete" @click="removeEngineeringSingle(scope.row, scope.$index)"
+													>删除</el-button
+												>
+											</template>
+										</el-table-column>
+										<template #empty>
+											<div class="table-empty">
+												<slot name="empty">
+													<img src="@/assets/images/notData.png" alt="notData" />
+													<div>暂无数据</div>
+												</slot>
+											</div>
+										</template>
+									</el-table>
+								</div>
+							</el-tab-pane>
+							<el-tab-pane label="现场巡视" :name="2">
+								<div class="content-button">
+									<el-button class="addButtonStyle" @click="addData">新增</el-button>
+								</div>
+								<div class="table">
+									<el-table
+										:data="arrThree"
+										class="el-table"
+										height="260"
+										:row-style="{ height: '40px' }"
+										:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
+										:cell-style="{ textAlign: 'center', height: '40px' }"
+									>
+										<el-table-column type="index" label="序号" width="100" />
+										<el-table-column prop="inspectResult" label="检查结果">
+											<template #default="{ row }">
+												<el-input v-model="row.inspectResult" v-if="row.isEdit" />
+												<span v-else>{{ row.inspectResult }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="inspectUser" label="检查人">
+											<template #default="{ row }">
+												<el-input v-model="row.inspectUser" v-if="row.isEdit" />
+												<span v-else>{{ row.inspectUser }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="inspectTime" label="检查时间">
+											<template #default="{ row }">
+												<el-date-picker
+													v-if="row.isEdit"
+													v-model="row.inspectTime"
+													style="width: 100%"
+													format="YYYY-MM-DD"
+													value-format="YYYY-MM-DD"
+													type="date"
+													placeholder="请选择"
+												/>
+												<span v-else>{{ row.inspectTime }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="question" label="隐患信息">
+											<template #default="{ row }">
+												<el-input v-model="row.question" v-if="row.isEdit" />
+												<span v-else>{{ row.question }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="solveUser" label="整改人">
+											<template #default="{ row }">
+												<el-input v-model="row.solveUser" v-if="row.isEdit" />
+												<span v-else>{{ row.solveUser }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="questionDesc" label="隐患详情">
+											<template #default="{ row }">
+												<el-input v-model="row.questionDesc" v-if="row.isEdit" />
+												<span v-else>{{ row.questionDesc }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column align="center" fixed="right" width="180" label="操作">
+											<template #default="scope">
+												<el-button type="primary" v-if="scope.row.isEdit" link @click="confirmAdd(scope.row, scope.$index)">
+													<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
+													<span>保存</span>
+												</el-button>
+												<el-button type="primary" v-if="!scope.row.isEdit" link @click="scope.row.isEdit = true">
+													<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
+													<span>编辑</span>
+												</el-button>
+												<el-button type="danger" link :icon="Delete" @click="removeEngineeringSingle(scope.row, scope.$index)"
+													>删除</el-button
+												>
+											</template>
+										</el-table-column>
+										<template #empty>
+											<div class="table-empty">
+												<slot name="empty">
+													<img src="@/assets/images/notData.png" alt="notData" />
+													<div>暂无数据</div>
+												</slot>
+											</div>
+										</template>
+									</el-table>
+								</div>
+							</el-tab-pane>
+							<el-tab-pane label="危大工程验收" :name="3">
+								<div class="content-button">
+									<el-button class="addButtonStyle" @click="addData">新增</el-button>
+								</div>
+								<div class="table">
+									<el-table
+										:data="arrFour"
+										class="el-table"
+										height="260"
+										:row-style="{ height: '40px' }"
+										:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
+										:cell-style="{ textAlign: 'center', height: '40px' }"
+									>
+										<el-table-column type="index" label="序号" width="100" />
+										<el-table-column prop="type" label="验收类型">
+											<template #default="{ row }">
+												<el-select v-if="row.isEdit" style="width: 100%" v-model="row.type" clearable placeholder="请选择">
+													<el-option v-for="item in acceptTypeList" :key="item.value" :label="item.label" :value="item.value" />
+												</el-select>
+												<!-- <span v-else>{{ singleEngText() }}</span> -->
+												<span v-else>{{ textTransform(row.type) }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="result" label="验收结果">
+											<template #default="{ row }">
+												<el-select v-if="row.isEdit" style="width: 100%" v-model="row.result" clearable placeholder="请选择">
+													<el-option label="合格" :value="1" />
+													<el-option label="不合格" :value="2" />
+												</el-select>
+												<span v-else>{{ row.result == 1 ? "合格" : "不合格" }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="state" label="验收状态">
+											<template #default="{ row }">
+												<el-select v-if="row.isEdit" style="width: 100%" v-model="row.state" clearable placeholder="请选择">
+													<el-option label="待验收" :value="1" />
+													<el-option label="已验收" :value="2" />
+												</el-select>
+												<span v-else>{{ row.state == 2 ? "已验收" : "待验收" }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="imageUrl" label="图片">
+											<template #default="{ row }">
+												<div class="face-img" v-if="row.isEdit">
+													<el-upload
+														class="face-uploader"
+														:action="`${baseUrl}` + '/xmgl/file/upload'"
+														:show-file-list="false"
+														:on-success="(response, uploadFile) => handleAvatarSuccess(row, response, uploadFile)"
+														accept="image/jpg, image/jpeg, image/png"
+													>
+														<img v-if="row.imageUrl" :src="row.imageUrl" class="face-avatar" />
+														<el-icon v-else><plus /></el-icon>
+													</el-upload>
+												</div>
+												<img class="showImg" v-else :src="row.imageUrl" />
+											</template>
+										</el-table-column>
+										<el-table-column prop="acceptTime" label="验收时间" width="160">
+											<template #default="{ row }">
+												<el-date-picker
+													v-if="row.isEdit"
+													v-model="row.acceptTime"
+													style="width: 100%"
+													format="YYYY-MM-DD"
+													value-format="YYYY-MM-DD"
+													type="date"
+													placeholder="请选择"
+												/>
+												<span v-else>{{ row.acceptTime }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="createByName" label="记录人">
+											<template #default="{ row }">
+												<span>{{ row.createByName }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="createTime" label="记录时间" width="180">
+											<template #default="{ row }">
+												<span>{{ row.createTime }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column align="center" fixed="right" width="180" label="操作">
+											<template #default="scope">
+												<el-button type="primary" v-if="scope.row.isEdit" link @click="confirmAdd(scope.row, scope.$index)">
+													<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
+													<span>保存</span>
+												</el-button>
+												<el-button type="primary" v-if="!scope.row.isEdit" link @click="scope.row.isEdit = true">
+													<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
+													<span>编辑</span>
+												</el-button>
+												<el-button type="danger" link :icon="Delete" @click="removeEngineeringSingle(scope.row, scope.$index)"
+													>删除</el-button
+												>
+											</template>
+										</el-table-column>
+										<template #empty>
+											<div class="table-empty">
+												<slot name="empty">
+													<img src="@/assets/images/notData.png" alt="notData" />
+													<div>暂无数据</div>
+												</slot>
+											</div>
+										</template>
+									</el-table>
+								</div>
+							</el-tab-pane>
+						</el-tabs>
 					</div>
 				</div>
-				<div class="report-content-part3">
-					<div>
-						<div>工程名称</div>
-						<div>{{ engineerData.engineeringName }}</div>
-						<div>设计单位</div>
-						<div>{{ engineerData.designEnt }}</div>
-					</div>
-					<div>
-						<div>建设单位</div>
-						<div>{{ engineerData.buildEnt }}</div>
-						<div>施工单位</div>
-						<div>{{ engineerData.opEnt }}</div>
-					</div>
-				</div>
-				<div class="report-content-part4">
-					<div><span>形象进度完成情况</span></div>
-					<div>
-						<div>
-							<div><span>实际完成</span></div>
-							<div>
-								<span>{{ formData.actualCompletion }}</span>
-							</div>
-						</div>
-						<div>
-							<div>原因分析</div>
-							<div>
-								<span>{{ formData.reasonAnalysis }}</span>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="report-content-part5">
-					<div><span>工程签证情况</span></div>
-					<div>
-						<div>
-							<div><span>专题报告例会纪要</span></div>
-							<div>
-								<span>{{ formData.meetingSummary }}</span>
-							</div>
-							<div><span>内容简要</span></div>
-							<div>
-								<span>{{ formData.meetingContentBriefly }}</span>
-							</div>
-						</div>
-						<div>
-							<div><span>工程质量签证</span></div>
-							<div>
-								<span>{{ formData.engineeringQualityVisa }}</span>
-							</div>
-							<div><span>内容简要</span></div>
-							<div>
-								<span>{{ formData.engineeringContentBriefly }}</span>
-							</div>
-						</div>
-						<div>
-							<div><span>向施工单位发出的通知、指示、指令</span></div>
-							<div>
-								<span>{{ formData.instructions }}</span>
-							</div>
-							<div><span>内容简要</span></div>
-							<div>
-								<span>{{ formData.instructionsContentBriefly }}</span>
-							</div>
-						</div>
-						<div>
-							<div><span>施工单位提出的各种报告</span></div>
-							<div>
-								<span>{{ formData.presentation }}</span>
-							</div>
-							<div><span>内容简要</span></div>
-							<div>
-								<span>{{ formData.presentationContentBriefly }}</span>
-							</div>
-						</div>
-						<div>
-							<div><span>工程付款签证</span></div>
-							<div>
-								<span>{{ formData.projectPaymentVisa }}</span>
-							</div>
-							<div><span>内容简要</span></div>
-							<div>
-								<span>{{ formData.projectPaymentContentBriefly }}</span>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="report-content-step">
-					<div class="step-title">一、工程进度</div>
-					<div class="step-sub-title">本月完成情况：</div>
-					<div class="step-input">
-						<span>{{ formData.thisMonthCompletion }}</span>
-					</div>
-					<div class="step-sub-title">下月计划完成：</div>
-					<div class="step-input">
-						<span>{{ formData.nextMonthPlan }}</span>
-					</div>
-				</div>
-				<div class="report-content-step">
-					<div class="step-title">二、工程质量</div>
-					<div class="step-input" style="margin-top: 11px">
-						<span>{{ formData.constructionQuality }}</span>
-					</div>
-				</div>
-				<div class="report-content-step">
-					<div class="step-title">三、安全、环保、文明生产</div>
-					<div class="step-input" style="margin-top: 11px">
-						<span>{{ formData.civilizationContent }}</span>
-					</div>
-				</div>
-				<div class="report-content-step">
-					<div class="step-title">四、费用支付</div>
-					<div class="step-input" style="margin-top: 11px">
-						<span>{{ formData.costContent }}</span>
-					</div>
-				</div>
-				<div class="report-content-step">
-					<div class="step-title">五、合同管理</div>
-					<div class="step-input" style="margin-top: 11px">
-						<span>{{ formData.contractManagement }}</span>
-					</div>
-				</div>
-				<div class="report-content-step">
-					<div class="step-title">六、存在的问题</div>
-					<div class="step-input" style="margin-top: 11px">
-						<span>{{ formData.existingProblems }}</span>
-					</div>
-				</div>
-				<div class="report-content-step">
-					<div class="step-title">七、监理工作小结</div>
-					<div class="step-input" style="margin-top: 11px">
-						<span>{{ formData.workSummary }}</span>
-					</div>
-				</div>
-				<div class="report-content-step">
-					<div class="step-title">八、下月工作计划</div>
-					<div class="step-input" style="margin-top: 11px">
-						<span>{{ formData.nextMonthWorkPlan }}</span>
-					</div>
-				</div>
-				<div class="report-content-step">
-					<div class="step-title">九、本月大事记</div>
-					<div class="step-input" style="margin-top: 11px">
-						<span>{{ formData.thisMonthEventsRecord }}</span>
-					</div>
-				</div>
-				<div class="report-content-img">
-					<div class="step-title">十、工程照片</div>
-					<div class="img-list">
-						<img :src="item" alt="" srcset="" v-for="(item, index) in fileList" :key="index" />
-					</div>
-				</div>
-			</div>
+			</el-form>
 			<template #footer>
-				<div>
-					<el-button type="primary" @click="visible1 = false">关闭</el-button>
-				</div>
+				<el-button type="primary" @click="visible1 = false">关闭</el-button>
 			</template>
 		</el-dialog>
+		<!-- 附件上传 -->
+		<FilesUploadPlus v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch, reactive } from "vue";
-import { monthlyReportDetails, engineerMainDetails } from "@/api/modules/project";
-import printJS from "print-js";
-const fileList = ref([]);
+import { onMounted, ref, watch } from "vue";
+import type { FormInstance, UploadProps } from "element-plus";
+import { ElMessage } from "element-plus";
+import { getDicList } from "@/api/modules/jxjview";
+import FilesUploadPlus from "@/components/FilesUploadPlus/FilesUpload.vue";
+import {
+	dangerousEngineerAdd,
+	dangerousEngineerDetails,
+	constructionSchemeList,
+	constructionSchemeAdd,
+	constructionSchemeDelete,
+	constructionSchemeFile,
+	constructionProgressList,
+	constructionProgressAdd,
+	constructionProgressEdit,
+	constructionProgressDelete,
+	localInspectList,
+	localInspectAdd,
+	localInspectEdit,
+	localInspectDelete,
+	engineerAcceptList,
+	engineerAcceptAdd,
+	engineerAcceptEdit,
+	engineerAcceptDelete
+} from "@/api/modules/project";
+import DownLoad from "@/utils/annexDowload.ts";
+import { Delete } from "@element-plus/icons-vue";
+import { jxj_User } from "@/api/types";
+import { ColumnProps } from "@/components/ProTable/interface";
+import { useHandleData } from "@/hooks/useHandleData";
 const baseUrl = import.meta.env.VITE_API_URL;
 const props = defineProps({
-	detailVisible: Boolean,
+	detailsVisible: Boolean,
 	searchSn: String,
 	activeValue: String,
-	relativeId: String,
-	searchId: String
+	relativeId: String
 });
-const emits = defineEmits(["update:detailVisible"]);
-const engineerData = ref<any>({});
+const emits = defineEmits(["update:detailsVisible"]);
+const arrOne = ref<any>([]);
+const arrTwo = ref<any>([]);
+const arrThree = ref<any>([]);
+const arrFour = ref<any>([]);
+const tabPosition = ref(0);
+const documentDataKey = ref("");
+const documentDataIndex = ref(0);
+const current = ref({
+	files: []
+});
+const showFilesUpload = ref(false);
+const typeList = ref([]);
+const acceptTypeList = ref([]);
+const rules = ref({
+	engineeringName: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
+	type: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "change"
+		}
+	],
+	typeDescribe: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	]
+});
+const formRef = ref<FormInstance>();
 const formData = ref<any>({
-	stage: "",
-	signOpinion: "",
-	actualCompletion: "",
-	reasonAnalysis: "",
-	meetingSummary: "",
-	meetingContentBriefly: "",
-	engineeringQualityVisa: "",
-	engineeringContentBriefly: "",
-	instructions: "",
-	instructionsContentBriefly: "",
-	presentation: "",
-	presentationContentBriefly: "",
-	projectPaymentVisa: "",
-	projectPaymentContentBriefly: "",
-	thisMonthCompletion: "",
-	nextMonthPlan: "",
-	constructionQuality: "",
-	civilizationContent: "",
-	costContent: "",
-	contractManagement: "",
-	existingProblems: "",
-	workSummary: "",
-	nextMonthWorkPlan: "",
-	thisMonthEventsRecord: ""
+	technicalDisclosureFile: [],
+	securityConstructionSchemeFile: [],
+	specialConstructionSchemeFile: []
 });
 const visible1 = ref(false);
-// 获取详情数据
-const getDetails = async () => {
-	const res = await monthlyReportDetails({ id: props.relativeId });
+// 验收类型文本转换;
+const textTransform = (id: any) => {
+	let findItem: any = acceptTypeList.value.find(item => item.value == id);
+	return findItem?.label;
+};
+// 图片上传成功后的钩子
+const handleAvatarSuccess: UploadProps["onSuccess"] = (row, response, uploadFile) => {
+	console.log(response.result.url);
+	console.log(response, uploadFile);
+	row.imageUrl = response.result.url;
+	console.log(arrTwo.value);
+};
+// 保存表格数据
+const confirmAdd = async (row: any, index: any) => {
+	let requestData = { ...row, dangerousEngineeringId: props.relativeId };
+	switch (tabPosition.value) {
+		case 0:
+			let updateArr = [] as any;
+			requestData.fileList.map(item => {
+				updateArr.push({
+					createTime: item.response.createTime,
+					extendName: item.response.ext,
+					fileId: item.response.id,
+					fileName: item.response.originalFilename,
+					fileSize: item.response.size,
+					fileUrl: item.response.url,
+					contentType: item.response.contentType
+				});
+			});
+			requestData.annexFiles = updateArr;
+			delete requestData.fileList;
+			const res = await constructionSchemeAdd(requestData);
+			if (res.success) {
+				ElMessage.success("操作成功");
+				getConstructionSchemeList();
+			}
+			break;
+		case 1:
+			row.isEdit = false;
+			if (row.id) {
+				const res2 = await constructionProgressEdit(requestData);
+				if (res2.success) {
+					ElMessage.success("操作成功");
+				}
+			} else {
+				const res2 = await constructionProgressAdd(requestData);
+				if (res2.success) {
+					ElMessage.success("操作成功");
+				}
+			}
+			getConstructionProgressList();
+			break;
+		case 2:
+			row.isEdit = false;
+			if (row.id) {
+				const res3 = await localInspectEdit(requestData);
+				if (res3.success) {
+					ElMessage.success("操作成功");
+				}
+			} else {
+				const res3 = await localInspectAdd(requestData);
+				if (res3.success) {
+					ElMessage.success("操作成功");
+				}
+			}
+			getLocalInspectList();
+			break;
+		case 3:
+			row.isEdit = false;
+			if (row.id) {
+				const res4 = await engineerAcceptEdit(requestData);
+				if (res4.success) {
+					ElMessage.success("操作成功");
+				}
+			} else {
+				const res4 = await engineerAcceptAdd(requestData);
+				if (res4.success) {
+					ElMessage.success("操作成功");
+				}
+			}
+			getengineerAcceptList();
+			break;
+		default:
+			break;
+	}
+};
+// 删除数据
+const removeEngineeringSingle = async (row: any, index: any) => {
+	if (row.id) {
+		switch (tabPosition.value) {
+			case 0:
+				await useHandleData(constructionSchemeDelete, { id: row.id }, `删除【${row.annexName}】`);
+				getConstructionSchemeList();
+				break;
+			case 1:
+				await useHandleData(constructionProgressDelete, { id: row.id }, "删除");
+				getConstructionProgressList();
+				break;
+			case 2:
+				await useHandleData(localInspectDelete, { id: row.id }, "删除");
+				getLocalInspectList();
+				break;
+			case 3:
+				await useHandleData(engineerAcceptDelete, { id: row.id }, "删除");
+				getengineerAcceptList();
+				break;
+			default:
+				break;
+		}
+	} else {
+		switch (tabPosition.value) {
+			case 0:
+				arrOne.value.splice(index, 1);
+				break;
+			case 1:
+				arrTwo.value.splice(index, 1);
+				break;
+			case 2:
+				arrThree.value.splice(index, 1);
+				break;
+			case 3:
+				arrFour.value.splice(index, 1);
+				break;
+			default:
+				break;
+		}
+	}
+};
+// 获取专项施工方案列表
+const getConstructionSchemeList = async () => {
+	const res = await constructionSchemeList({ dangerousEngineeringId: props.relativeId });
+	console.log(res);
+	if (res.result && res.result.length > 0) {
+		arrOne.value = res.result;
+	} else {
+		arrOne.value = [];
+	}
+};
+// 获取施工进度列表
+const getConstructionProgressList = async () => {
+	const res = await constructionProgressList({ dangerousEngineeringId: props.relativeId });
+	console.log(res);
+	if (res.result && res.result.length > 0) {
+		arrTwo.value = res.result;
+	} else {
+		arrTwo.value = [];
+	}
+};
+// 获取现场巡视列表
+const getLocalInspectList = async () => {
+	const res = await localInspectList({ dangerousEngineeringId: props.relativeId });
+	console.log(res);
+	if (res.result && res.result.length > 0) {
+		arrThree.value = res.result;
+	} else {
+		arrThree.value = [];
+	}
+};
+// 获取危大工程验收列表
+const getengineerAcceptList = async () => {
+	const res = await engineerAcceptList({ dangerousEngineeringId: props.relativeId });
+	console.log(res);
+	if (res.result && res.result.length > 0) {
+		arrFour.value = res.result;
+	} else {
+		arrFour.value = [];
+	}
+};
+// 获取危大工程详情
+const getDetailsData = async () => {
+	const res = await dangerousEngineerDetails({ id: props.relativeId });
 	console.log(res);
 	if (res && res.result) {
 		formData.value = { ...res.result };
-		if (formData.value.imageFiles) {
-			fileList.value = formData.value.imageFiles.split(",");
-			console.log(fileList.value);
+	}
+};
+// 新增
+const addData = () => {
+	console.log(tabPosition.value);
+	switch (tabPosition.value) {
+		case 0:
+			arrOne.value.push({
+				annexName: "",
+				fileList: []
+			});
+			break;
+		case 1:
+			arrTwo.value.push({
+				currentProgress: "",
+				imageUrl: "",
+				// createByName: "",
+				// createTime: "",
+				isEdit: true
+			});
+			break;
+		case 2:
+			arrThree.value.push({
+				inspectResult: "",
+				inspectUser: "",
+				inspectTime: "",
+				question: "",
+				solveUser: "",
+				questionDesc: "",
+				isEdit: true
+			});
+			break;
+		case 3:
+			arrFour.value.push({
+				type: null,
+				result: null,
+				state: null,
+				imageUrl: "",
+				acceptTime: "",
+				isEdit: true
+			});
+			break;
+		default:
+			break;
+	}
+};
+// tabs项点击时
+const handleClick = (pane: any) => {
+	tabPosition.value = pane.props.name;
+	switch (tabPosition.value) {
+		case 0:
+			getConstructionSchemeList();
+			break;
+		case 1:
+			getConstructionProgressList();
+			break;
+		case 2:
+			getLocalInspectList();
+			break;
+		case 3:
+			getengineerAcceptList();
+			break;
+		default:
+			break;
+	}
+};
+// 附件上传改变
+const handlechange = e => {
+	console.log(e);
+	current.value.files = e.map(item => {
+		item.label = current.value.dictLabel;
+		return item;
+	});
+	console.log(current.value.files);
+	arrOne.value[documentDataIndex.value].fileList = current.value.files;
+};
+// 危大工程资料
+const onDownLoad = (key: any) => {
+	console.log(key);
+	console.log(formData.value[key]);
+	let val = JSON.parse(formData.value[key]);
+	if (val && val.length > 0) {
+		DownLoad(val);
+	} else {
+		ElMessage.error("暂无可下载文件");
+	}
+};
+
+// 上传附件按钮
+const onUpload = async (row: any, index: any) => {
+	console.log(row);
+	showFilesUpload.value = true;
+	documentDataIndex.value = index;
+	if (row.fileList.length > 0) {
+		let arr: any = [];
+		row.fileList.map(item => {
+			if (item.response) {
+				arr.push({
+					response: { ...item.response, url: item.response.url },
+					name: item.response.originalFilename,
+					url: item.response.url,
+					size: +item.response.size,
+					type: item.response.contentType
+				});
+			} else {
+				arr.push({
+					response: { ...item, url: item.fileUrl },
+					name: item.fileName,
+					url: item.fileUrl,
+					size: +item.fileSize,
+					type: item.contentType
+				});
+			}
+			delete item.response;
+		});
+		current.value.files = arr;
+		console.log(current.value.files);
+	} else {
+		current.value.files = [];
+	}
+};
+// 表格附件下载
+const onTableDownLoad = async (row: any) => {
+	console.log(row);
+	let requestData = {
+		id: row.id
+	};
+	const { result } = await constructionSchemeFile(requestData);
+	console.log(result);
+	if (result && result.length > 0) {
+		DownLoad(result);
+	} else {
+		ElMessage.error("暂无可下载文件");
+	}
+};
+// 获取验收类型字典
+const getAcceptTypeList = async () => {
+	const { result } = await getDicList({ dictType: "check_accept_type" });
+	if (result.length > 0) {
+		let arr: any = [];
+		result.map(item => {
+			arr.push({
+				label: item.dictValue,
+				value: item.dictLabel
+			});
+		});
+		acceptTypeList.value.length = 0;
+		acceptTypeList.value.push(...arr);
+	}
+};
+const getTypeDicMainList = async () => {
+	// 获取起重机械设备类型字典
+	const { result } = await getDicList({ dictType: "dangerous_engineer_type" });
+	if (result.length > 0) {
+		let arr: any = [];
+		result.map(item => {
+			arr.push({
+				label: item.dictValue,
+				value: item.dictLabel
+			});
+		});
+		typeList.value.length = 0;
+		typeList.value.push(...arr);
+	}
+};
+// 确定按钮触发
+const confirm = async (formEl: FormInstance | undefined) => {
+	if (!formEl) return;
+	await formEl.validate(async (valid, fields) => {
+		if (valid) {
+			console.log(formData.value);
+			let requestData = {
+				...formData.value,
+				technicalDisclosureFile: "",
+				securityConstructionSchemeFile: "",
+				specialConstructionSchemeFile: ""
+			};
+			if (props.activeValue == "eng") {
+				requestData.engineeringSn = props.searchSn;
+			} else if (props.activeValue == "project") {
+				requestData.projectSn = props.searchSn;
+			}
+			for (let i in requestData) {
+				if (i == "technicalDisclosureFile" || i == "securityConstructionSchemeFile" || i == "specialConstructionSchemeFile") {
+					let arr = [] as any;
+					formData.value[i].map(item => {
+						if (item.response) {
+							arr.push({
+								response: { ...item.response, url: item.response.fileUrl },
+								name: item.response.fileName,
+								url: item.response.fileUrl,
+								size: +item.response.fileSize,
+								type: item.response.contentType
+							});
+						} else {
+							arr.push({
+								response: { ...item, url: item.fileUrl },
+								name: item.fileName,
+								url: item.fileUrl,
+								size: +item.fileSize,
+								type: item.contentType
+							});
+						}
+					});
+
+					requestData[i] = JSON.stringify(arr);
+				}
+			}
+			const res = await dangerousEngineerAdd(requestData);
+			if (res.success) {
+				ElMessage.success("操作成功");
+				visible1.value = true;
+			}
+		} else {
+			console.log("error submit!", fields);
+			ElMessage({
+				showClose: true,
+				message: "请完善表单信息！",
+				type: "error"
+			});
 		}
-	}
-	const res2 = await engineerMainDetails({ id: props.searchId });
-	console.log(res);
-	if (res2 && res2.result) {
-		engineerData.value = { ...res2.result };
-	}
+	});
 };
 // 关闭两个对话框
 const closeMain = () => {
 	visible1.value = false;
-	emits("update:detailVisible", false);
+	emits("update:detailsVisible", false);
 };
 watch(
-	() => props.detailVisible,
+	() => props.detailsVisible,
 	n => {
 		if (n) {
-			getDetails();
+			if (n) {
+				getAcceptTypeList();
+				getTypeDicMainList();
+				getDetailsData();
+				getConstructionSchemeList();
+				setTimeout(function () {
+					formRef.value?.clearValidate();
+				}, 200);
+			}
 			visible1.value = n;
 		}
 	}
@@ -280,7 +944,7 @@ watch(
 watch(
 	() => visible1,
 	n => {
-		emits("update:detailVisible", n);
+		emits("update:detailsVisible", n);
 	}
 );
 onMounted(() => {});
@@ -308,283 +972,145 @@ onMounted(() => {});
 	}
 	.title-detail {
 		@include flex;
-		border-left: 3px solid #0f81ff;
+		> img {
+			width: 16px;
+			height: 18px;
+		}
 		> span {
+			font-size: 18px;
 			font-family: Source Han Sans CN-Regular, Source Han Sans CN;
 			font-weight: 400;
 			color: #333333;
-			margin-left: 12px;
+			margin-left: 5px;
 			margin-right: auto;
-			font-size: 18px;
 		}
 		:deep(.el-icon) {
 			cursor: pointer;
 			color: #a8abb2;
 		}
 	}
-	.report-content {
-		.title {
-			font-size: 23px;
-			font-family: PingFang SC-Semibold, PingFang SC;
-			font-weight: 600;
-			color: #333333;
-			text-align: center;
-		}
-		.sub-title {
-			@include flex;
-			justify-content: center;
-			font-size: 18px;
-			font-family: PingFang SC-Regular, PingFang SC;
-			font-weight: 400;
-			color: #333333;
-		}
-		.sub-title:nth-child(3) {
-			margin-top: 9px;
-		}
-		.sub-title:nth-child(4) {
-			margin-top: 18px;
-		}
-		.title:nth-child(5) {
-			margin-top: 25px;
-		}
-		.engineer-name {
-			font-size: 16px;
-			font-family: PingFang SC-Semibold, PingFang SC;
-			font-weight: 600;
-			color: #333333;
-			margin-top: 11px;
-		}
-		&-part1 {
-			padding: 16px 9px;
-			border: 1px solid #dedede;
-			margin-top: 11px;
-			div {
-				font-size: 16px;
-				font-family: PingFang SC-Medium, PingFang SC;
-				font-weight: 500;
-				color: #333333;
+	.basic-form {
+		margin-bottom: 42px;
+		.basic-info {
+			.content-title {
+				@include title;
+				margin-bottom: 35px;
 			}
-			div:last-child {
-				text-align: right;
-			}
-			div:not(:last-child) {
-				margin-bottom: 20px;
-			}
-			div:nth-child(6) {
-				margin-bottom: 0px;
-			}
-		}
-		&-part2 {
-			padding: 16px 9px;
-			border: 1px solid #dedede;
-			border-top: 0;
-			div:nth-child(1) {
-				font-size: 16px;
-				font-family: PingFang SC-Semibold, PingFang SC;
-				font-weight: 600;
-				color: #333333;
-				margin-bottom: 14px;
-			}
-			div:nth-child(3) {
-				@include flex;
-				justify-content: flex-end;
-				span {
-					white-space: nowrap;
-				}
-				span:first-child {
-					margin-right: 120px;
-				}
-				span:nth-child(2) {
-					margin-right: 60px;
-				}
-				span:last-child {
-					margin-right: 107px;
-				}
-			}
-		}
-		&-part3 {
-			border: 1px solid #dedede;
-			border-top: 0;
-			> div {
-				@include flex;
-				height: 50px;
-				> div {
-					height: 50px;
-					line-height: 50px;
-				}
-				> div:nth-child(2n-1) {
-					width: 15%;
-					text-align: center;
-				}
-				> div:nth-child(2n) {
-					width: 35%;
-					text-indent: 1em;
-				}
-			}
-			> div:nth-child(1) {
-				> div:not(:last-child) {
-					border-right: 1px solid #dedede;
-					border-bottom: 1px solid #dedede;
-				}
-				> div:nth-child(4) {
-					border-bottom: 1px solid #dedede;
-				}
-			}
-			> div:nth-child(2) {
-				> div:not(:last-child) {
-					border-right: 1px solid #dedede;
-				}
-			}
-		}
-		&-part4 {
-			@include flex;
-			border: 1px solid #dedede;
-			border-top: 0;
-			height: 200px;
-			> div:nth-child(1) {
-				@include flex;
-				justify-content: center;
+			.switch-box {
+				width: 100%;
+				display: flex;
 				align-items: center;
-				width: 3%;
-				height: 200px;
-				border-right: 1px solid #dedede;
 				> span {
-					display: inline-block;
-					writing-mode: vertical-lr;
-					letter-spacing: 4px;
+					margin-right: auto;
+					margin-left: 9px;
 				}
 			}
-			> div:nth-child(2) {
-				width: 97%;
-				> div {
-					height: 100px;
+			.tabs-option {
+				width: 100%;
+				.content-button {
 					@include flex;
-					> div:nth-child(1) {
-						@include flex;
-						justify-content: center;
-						width: calc(12% + 3px);
-						height: 100%;
-						border-right: 1px solid #dedede;
-						border-bottom: 1px solid #dedede;
-					}
-					> div:nth-child(2) {
-						@include flex;
-						justify-content: center;
-						flex: 1;
-						height: 100%;
-						border-bottom: 1px solid #dedede;
+					justify-content: flex-end;
+					> span {
+						font-size: 14px;
+						font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+						font-weight: 400;
+						color: #008bff;
 					}
 				}
-			}
-		}
-		&-part5 {
-			@include flex;
-			border: 1px solid #dedede;
-			border-top: 0;
-			height: 500px;
-			> div:nth-child(1) {
-				@include flex;
-				justify-content: center;
-				width: 3%;
-				height: 100%;
-				border-right: 1px solid #dedede;
-				> span {
-					display: inline-block;
-					writing-mode: vertical-lr;
-					letter-spacing: 4px;
-				}
-			}
-			> div:nth-child(2) {
-				width: 97%;
-				height: 100%;
-				> div {
-					height: 100px;
-					@include flex;
-					> div:nth-child(2n-1) {
-						@include flex;
-						justify-content: center;
-						width: calc(12% + 3px);
+				.table {
+					width: 100%;
+					// height: 310px;
+					margin-top: 15px;
+					:deep(.el-table) {
 						height: 100%;
-						border-right: 1px solid #dedede;
-						border-bottom: 1px solid #dedede;
-						> span {
-							display: inline-block;
-							width: 92%;
+					}
+					.face-img {
+						width: 100%;
+						align-self: flex-start;
+						:deep(.face-uploader .el-upload) {
+							border: 1px dashed #d9d9d9 !important;
+							border-radius: 6px !important;
+							cursor: pointer !important;
+							position: relative !important;
+							overflow: hidden !important;
+						}
+						.face-uploader .el-upload:hover {
+							border-color: #409eff !important;
+						}
+						:deep(.el-icon) {
+							font-size: 24px;
+							color: #8c939d;
+							width: 35px;
+							height: 35px;
+							line-height: 35px;
 							text-align: center;
 						}
+						.face-avatar {
+							width: 35px;
+							height: 35px;
+							display: block;
+						}
 					}
-					> div:nth-child(2n) {
-						@include flex;
+					.showImg {
+						width: 35px;
+						height: 35px;
+						border-radius: 6px;
+					}
+					.table-empty {
+						display: flex;
 						justify-content: center;
+						align-items: center;
+						height: 150px;
 						flex: 1;
-						height: 100%;
-						border-bottom: 1px solid #dedede;
+						flex-direction: column;
+						color: #999;
 					}
-					> div:nth-child(3) {
-						border-left: 1px solid #dedede;
-					}
-				}
-			}
-		}
-		&-step {
-			border: 1px solid #dedede;
-			border-top: 0;
-			padding: 14px 23px;
-			.step-title {
-				font-size: 16px;
-				font-family: PingFang SC-Medium, PingFang SC;
-				font-weight: 500;
-				color: #000000;
-			}
-			.step-sub-title {
-				font-size: 16px;
-				font-family: PingFang SC-Regular, PingFang SC;
-				font-weight: 400;
-				color: #000000;
-				margin-top: 17px;
-				margin-bottom: 9px;
-			}
-		}
-		&-img {
-			border: 1px solid #dedede;
-			border-top: 0;
-			padding: 14px 23px;
-			.step-title {
-				font-size: 16px;
-				font-family: PingFang SC-Medium, PingFang SC;
-				font-weight: 500;
-				color: #000000;
-				margin-bottom: 12px;
-			}
-			.img-list {
-				@include flex;
-				img {
-					width: 100px;
-					height: 100px;
-					border: 1px solid #ccc;
-					margin-right: 15px;
-				}
-			}
-			.face-img {
-				:deep(.face-uploader .el-upload) {
-					border: 2px dashed #d9d9d9 !important;
-					cursor: pointer !important;
-					position: relative !important;
-					overflow: hidden !important;
-				}
-				.face-uploader .el-upload:hover {
-					border-color: #409eff !important;
-				}
-				:deep(.el-icon) {
-					font-size: 42px;
-					color: #8c939d;
-					width: 96px;
-					height: 96px;
-					line-height: 53px;
-					text-align: center;
 				}
 			}
 		}
 	}
 }
+:deep(.el-tabs--card > .el-tabs__header) {
+	border-bottom: none;
+}
+:deep(.el-tabs--card > .el-tabs__header .el-tabs__nav) {
+	width: 600px;
+	background: #f8f8f8;
+	border: 0;
+}
+:deep(.el-tabs__nav-scroll) {
+	display: flex;
+	.el-tabs__item {
+		width: 50%;
+		text-align: center;
+		// background: #f8f8f8;
+		color: #333;
+		// border: 1px solid #e5e5e5;
+		// border-radius: 8px;
+	}
+	.el-tabs__item.is-active {
+		background-color: #008bff;
+		color: #fff;
+	}
+}
+:deep(.el-tabs--card > .el-tabs__header .el-tabs__item.is-active) {
+	border-bottom-color: #008bff !important;
+}
+:deep(#tab-0) {
+	border-radius: 4px 0 0 4px;
+	border: 1px solid #e5e5e5;
+	border-right: 0;
+}
+:deep(#tab-1) {
+	border: 1px solid #e5e5e5;
+	border-right: 0;
+}
+:deep(#tab-2) {
+	border: 1px solid #e5e5e5;
+	border-right: 0;
+}
+:deep(#tab-3) {
+	border: 1px solid #e5e5e5;
+	border-radius: 0 4px 4px 0;
+}
 </style>
diff --git a/src/views/project/dangerousEngineering/index.scss b/src/views/project/dangerousEngineering/index.scss
index 7cc623d..195807c 100644
--- a/src/views/project/dangerousEngineering/index.scss
+++ b/src/views/project/dangerousEngineering/index.scss
@@ -1,3 +1,7 @@
+@mixin flex {
+	display: flex;
+	align-items: center;
+}
 .type-select {
 	display: grid;
 	grid-template-columns: repeat(6, 1fr);
@@ -12,10 +16,9 @@
 		border-radius: 8px 8px 8px 8px;
 		padding: 24px 0;
 		&-content {
-			display: flex;
+			@include flex;
 			flex-direction: column;
 			justify-content: center;
-			align-items: center;
 			> img {
 				width: 44px;
 				height: 44px;
@@ -45,6 +48,32 @@
 			.table-main {
 				height: calc(100% - 82px);
 			}
+			.type-content {
+				@include flex;
+				flex-direction: column;
+				justify-content: center;
+				span {
+					font-size: 12px;
+					font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+					font-weight: 400;
+				}
+				span:nth-child(1) {
+					color: #333333;
+				}
+				span:nth-child(2) {
+					color: #bbbbbb;
+				}
+				span:nth-child(3) {
+					display: inline-block;
+					width: 32px;
+					height: 16px;
+					line-height: 16px;
+					text-align: center;
+					background: #e70000;
+					border-radius: 2px 2px 2px 2px;
+					color: #ffffff;
+				}
+			}
 		}
 	}
 }
diff --git a/src/views/project/dangerousEngineering/index.vue b/src/views/project/dangerousEngineering/index.vue
index 431bd94..a610f2e 100644
--- a/src/views/project/dangerousEngineering/index.vue
+++ b/src/views/project/dangerousEngineering/index.vue
@@ -27,8 +27,21 @@
 				<template #formButton="scope">
 					<el-button class="addButtonStyle" @click="handleAddItem">新增</el-button>
 				</template>
+				<template #type="{ row }">
+					<div class="type-content">
+						<span>{{ textTransform(row.type) }}</span>
+						<span>{{ row.typeDescribe }}</span>
+						<span v-if="row.dangerType == 1">超危</span>
+					</div>
+				</template>
+				<template #engineering="{ row }">
+					<div class="type-content">
+						<span>{{ row.engineeringName }}</span>
+						<span>{{ row.engineeringSurvey }}</span>
+					</div>
+				</template>
 				<template #operation="{ row }">
-					<el-button type="danger" style="margin-right: 5px" link :icon="Delete" @click="deleteItem(row)">删除</el-button>
+					<el-button type="danger" style="margin-right: 5px" link :icon="Delete" @click.stop="deleteItem(row)">删除</el-button>
 				</template>
 			</ProTable>
 		</div>
@@ -39,6 +52,13 @@
 			:activeValue="activeValue"
 			@confirm="confirmAdd"
 		></engineerAdd>
+		<!-- 危大工程详情 -->
+		<engineerDetails
+			v-model:detailsVisible="detailsVisible"
+			:relativeId="relativeId"
+			:searchSn="searchSn"
+			:activeValue="activeValue"
+		></engineerDetails>
 
 		<!-- 侧边栏选择 -->
 		<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">
@@ -63,15 +83,17 @@ import { Delete } from "@element-plus/icons-vue";
 import { jxj_User } from "@/api/types";
 import { useHandleData } from "@/hooks/useHandleData";
 import engineerAdd from "./components/engineerAdd.vue";
+import engineerDetails from "./components/engineerDetails.vue";
 import { getRelevanceList } from "@/api/modules/common";
 import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
 import allEngineering from "@/components/allEngineering/index.vue";
-import { monthlyReportPage, updateMonthlyReport, dangerousEngineerPage, getEngineeringName } from "@/api/modules/project";
+import { dangerousEngineerPage, dangerousEngineerDelete, getEngineeringName } from "@/api/modules/project";
 const activeValue = ref("eng");
 const engList = ref([]);
 const engVisable = ref(false);
 const searchSn = ref("");
 const addVisible = ref(false);
+const detailsVisible = ref(false);
 const relativeId = ref("");
 const statisticsOption = ref([
 	{
@@ -112,7 +134,7 @@ const statisticsOption = ref([
 	}
 ]);
 const operateDialog = ref(false);
-const hoistEquipType = ref([]);
+const typeList = ref([]);
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
 const proTable = ref();
 
@@ -125,7 +147,7 @@ const columns: ColumnProps[] = [
 		search: { el: "input" }
 	},
 	{
-		prop: "model",
+		prop: "engineering",
 		label: "危大工程"
 	},
 	{
@@ -150,6 +172,21 @@ const columns: ColumnProps[] = [
 	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 260 }
 ];
+// 类别文本转换
+const textTransform = (val: any) => {
+	let findItem: any = typeList.value.find(item => item.dictLabel == val);
+	return findItem?.dictValue;
+};
+const getTypeDicMainList = async () => {
+	// 获取起重机械设备类型字典
+	const { result } = await getDicList({ dictType: "dangerous_engineer_type" });
+	if (result.length > 0) {
+		typeList.value.length = 0;
+		typeList.value = result;
+	} else {
+		typeList.value.length = 0;
+	}
+};
 // 新增完成
 const confirmAdd = () => {
 	proTable.value.getTableList();
@@ -158,28 +195,16 @@ const confirmAdd = () => {
 const handleAddItem = () => {
 	addVisible.value = true;
 };
-// 删除大项
+// 删除表格数据
 const deleteItem = async (params: jxj_User.ResUserList) => {
-	// await useHandleData(bigStoreDelete, { id: params.id }, `删除【${params.name}】`);
+	await useHandleData(dangerousEngineerDelete, { id: params.id }, `删除【${params.engineeringName}】`);
+	proTable.value.getTableList();
 };
 // 点击行查看详情
 const rowClick = (row: any, column: ColumnProps) => {
 	console.log("row", row, "column", column);
-};
-const getDicMainList = async () => {
-	// 获取学历字典
-	const { result } = await getDicList({ dictType: "hoist_equip_type" });
-	if (result.length > 0) {
-		let arr: any = [];
-		result.map(item => {
-			arr.push({
-				label: item.dictValue,
-				value: item.dictLabel
-			});
-		});
-		hoistEquipType.value.length = 0;
-		hoistEquipType.value.push(...arr);
-	}
+	relativeId.value = row.id;
+	detailsVisible.value = true;
 };
 // 处理不同状态行不同颜色
 const tableRowClassName = ({ rowIndex }: { row: User.ResUserList; rowIndex: number }) => {
@@ -203,10 +228,14 @@ const dataCallback = (data: any) => {
 // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
 const getTableList = (params: any) => {
 	let newParams = JSON.parse(JSON.stringify(params));
-	if (newParams.timeLimit) {
-		newParams.createTime_begin = newParams.timeLimit[0];
-		newParams.createTime_end = newParams.timeLimit[1];
-		delete newParams.timeLimit;
+	if (searchSn.value) {
+		if (activeValue.value == "eng") {
+			newParams.engineeringSn = searchSn.value;
+		} else if (activeValue.value == "project") {
+			newParams.projectSn = searchSn.value;
+		}
+	} else {
+		return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
 	}
 	return dangerousEngineerPage(newParams);
 };
@@ -252,7 +281,7 @@ const onUpdate = async row => {
 };
 onMounted(() => {});
 onMounted(async () => {
-	await getDicMainList();
+	await getTypeDicMainList();
 	await getengineering();
 });
 </script>
diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
index 6f7f696..10796d1 100644
--- a/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
+++ b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
@@ -371,10 +371,10 @@ const onUpload = async (row: any, index: any) => {
 		row.fileList.map(item => {
 			if (item.response) {
 				arr.push({
-					response: { ...item.response, url: item.response.fileUrl },
-					name: item.response.fileName,
-					url: item.response.fileUrl,
-					size: +item.response.fileSize,
+					response: { ...item.response, url: item.response.url },
+					name: item.response.originalFilename,
+					url: item.response.url,
+					size: +item.response.size,
 					type: item.response.contentType
 				});
 			} else {
@@ -400,6 +400,7 @@ const handlechange = e => {
 		item.label = current.value.dictLabel;
 		return item;
 	});
+	console.log(current.value.files);
 	documentData.value[documentDataIndex.value].fileList = current.value.files;
 };
 // 单体工程名称转换;
diff --git a/src/views/project/monthlyReport/index.vue b/src/views/project/monthlyReport/index.vue
index 1afc71d..c5f41ae 100644
--- a/src/views/project/monthlyReport/index.vue
+++ b/src/views/project/monthlyReport/index.vue
@@ -150,7 +150,7 @@ const columns: ColumnProps[] = [
 		label: "设计单位"
 	},
 	{
-		prop: "createBy",
+		prop: "createByName",
 		label: "填写人"
 	},
 	{