From 8f58ca29880b84859828023dd27c0cf40c18b0f7 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 27 Mar 2024 10:48:34 +0800
Subject: [PATCH] add

---
 src/components/uploadAnnex/index.vue          |   3 +-
 .../quality_professional_category/index.vue   |   5 -
 src/views/safety_accident/detail.vue          | 138 ++++++----------
 src/views/safety_accident/edit.vue            |  14 +-
 src/views/safety_accident/index.vue           |  21 +--
 src/views/safety_check/detail.vue             | 155 ++++++++----------
 src/views/safety_check/edit.vue               |  14 +-
 src/views/safety_check/index.vue              |  35 ++--
 src/views/safety_emergency_plan/detail.vue    | 120 ++++----------
 src/views/safety_emergency_plan/edit.vue      |  22 +--
 src/views/safety_emergency_plan/index.vue     |  18 +-
 src/views/safety_evaluate/detail.vue          | 120 ++++----------
 src/views/safety_evaluate/edit.vue            |  26 +--
 src/views/safety_evaluate/index.vue           |  18 +-
 src/views/safety_event/detail.vue             | 120 ++++----------
 src/views/safety_event/index.vue              |  20 +--
 src/views/safety_hazard/detail.vue            | 150 +++++++----------
 src/views/safety_hazard/edit.vue              |  24 +--
 src/views/safety_hazard/index.vue             |  17 +-
 src/views/safety_modify/detail.vue            | 140 ++++++----------
 src/views/safety_modify/index.vue             |  29 +---
 src/views/safety_product_month/detail.vue     | 132 +++++----------
 src/views/safety_product_month/edit.vue       |  20 +--
 src/views/safety_product_month/index.vue      |  21 +--
 src/views/safety_rehearsal/detail.vue         | 120 ++++----------
 src/views/safety_rehearsal/edit.vue           |  20 +--
 src/views/safety_rehearsal/index.vue          |  16 +-
 src/views/safety_standard/detail.vue          | 100 +++--------
 src/views/safety_standard/edit.vue            |  10 +-
 src/views/safety_standard/index.vue           |  20 +--
 src/views/safety_supervise/detail.vue         | 120 ++++----------
 src/views/safety_supervise/index.vue          |  21 +--
 src/views/safety_target/detail.vue            | 131 ++++-----------
 src/views/safety_target/edit.vue              |  13 +-
 src/views/safety_target/index.vue             |  23 +--
 vite.config.ts                                | 121 +++++++-------
 36 files changed, 634 insertions(+), 1463 deletions(-)

diff --git a/src/components/uploadAnnex/index.vue b/src/components/uploadAnnex/index.vue
index df2c9d8..8ad7210 100644
--- a/src/components/uploadAnnex/index.vue
+++ b/src/components/uploadAnnex/index.vue
@@ -6,7 +6,6 @@
         <el-button type="primary">
             上传
         </el-button>
-        <!-- <span class="ml-5 text-xs ">可上传</span> -->
     </el-upload>
 
     <div v-for="(item, index) in formData[value]" class="ml-5 flex ">
@@ -18,6 +17,7 @@
 import { ref, defineProps } from "vue"
 import configs from "@/config"
 import useUserStore from "@/stores/modules/user";
+
 const userStore = useUserStore();
 const base_url = ref(configs.baseUrl + configs.urlPrefix)
 const props = defineProps({
@@ -33,7 +33,6 @@ const props = defineProps({
 
 const handleAvatarSuccess = (response: any) => {
 
-    console.log(props.formData[props.value], 'sdadsa')
     props.formData[props.value] ||= []
     // @ts-ignore
     response.code != 0 ? props.formData[props.value].push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
diff --git a/src/views/quality_professional_category/index.vue b/src/views/quality_professional_category/index.vue
index 7d96d09..c1a0cff 100644
--- a/src/views/quality_professional_category/index.vue
+++ b/src/views/quality_professional_category/index.vue
@@ -30,13 +30,8 @@
                     <el-table-column label="序号" type="index" width="55" />
                     <el-table-column label="组织名称" prop="org_name" show-overflow-tooltip />
                     <el-table-column label="部门名称" prop="dept_name" show-overflow-tooltip />
-
                     <el-table-column label="分类名" prop="classify_name" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-
-
-
-
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
diff --git a/src/views/safety_accident/detail.vue b/src/views/safety_accident/detail.vue
index ecc9fcb..9948d72 100644
--- a/src/views/safety_accident/detail.vue
+++ b/src/views/safety_accident/detail.vue
@@ -1,87 +1,52 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="安全事故详情" :async="true" width="60vw" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_code }}
+                </el-descriptions-item>
+                <el-descriptions-item label="事故名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="事故类型" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.type }}
+                </el-descriptions-item>
+                <el-descriptions-item label="发生时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.happen_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="设备事故" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.device_accident }}
+                </el-descriptions-item>
+                <el-descriptions-item label="承包商人员" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.contractor_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="非本企业人员" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.not_our_company_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="本企业人员" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.our_company_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="内容" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.content }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +68,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +79,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_accident/edit.vue b/src/views/safety_accident/edit.vue
index 98b4aac..329b889 100644
--- a/src/views/safety_accident/edit.vue
+++ b/src/views/safety_accident/edit.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="edit-popup">
 
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
 
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
@@ -66,12 +65,12 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="非本企业人员" prop="our_company_user">
-                            <el-input v-model="formData.our_company_user" clearable placeholder="请输入非本企业人员" />
+                            <el-input v-model="formData.not_our_company_user" clearable placeholder="请输入非本企业人员" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="本企业人员" prop="not_our_company_user">
-                            <el-input v-model="formData.not_our_company_user" clearable placeholder="请输入本企业人员" />
+                            <el-input v-model="formData.our_company_user" clearable placeholder="请输入本企业人员" />
                         </el-form-item>
                     </el-col>
 
@@ -103,10 +102,9 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
+                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
diff --git a/src/views/safety_accident/index.vue b/src/views/safety_accident/index.vue
index 9dd184f..654b7cd 100644
--- a/src/views/safety_accident/index.vue
+++ b/src/views/safety_accident/index.vue
@@ -48,26 +48,10 @@
                     <el-table-column label="事故类型" prop="type" show-overflow-tooltip />
                     <el-table-column label="设备事故" prop="device_accident" show-overflow-tooltip />
                     <el-table-column label="承包商人员" prop="contractor_user" show-overflow-tooltip />
-                    <el-table-column label="非本企业人员" prop="not_our_company_user" show-overflow-tooltip />
+                    <el-table-column label="非本企业人员" prop="not_our_company_user" show-overflow-tooltip width="120" />
                     <el-table-column label="本企业人员" prop="our_company_user" show-overflow-tooltip />
                     <el-table-column label="内容" prop="content" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
-
                         <template #default="{ row }">
                             <el-button v-perms="['safety.safety_accident/edit']" type="primary" link
                                 @click="handleEdit(row)">
@@ -77,6 +61,9 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['safety.safety_accident/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
 
 
                         </template>
diff --git a/src/views/safety_check/detail.vue b/src/views/safety_check/detail.vue
index ecc9fcb..790a803 100644
--- a/src/views/safety_check/detail.vue
+++ b/src/views/safety_check/detail.vue
@@ -1,87 +1,71 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
+        <popup ref="popupRef" title="安全检查详情" :async="true" width="80vw" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="3" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_code }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查日期" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_date }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查单位" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_company }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查区域" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_area }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查项" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_nature }}
+                </el-descriptions-item>
 
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+                <el-descriptions-item label="检查结果" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_result }}
+                </el-descriptions-item>
+                <el-descriptions-item label="整改单位" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.modify_company }}
+                </el-descriptions-item>
+                <el-descriptions-item label="整改期限" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.modify_term }}
+                </el-descriptions-item>
+                <el-descriptions-item label="责任人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.resp_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="风险等级" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.risk_level }}
+                </el-descriptions-item>
+                <el-descriptions-item label="安全隐患" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.safety_hazard }}
+                </el-descriptions-item>
+                <el-descriptions-item label="质量隐患" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.quality_hazard }}
+                </el-descriptions-item>
+                <el-descriptions-item label="子表" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.sub_table }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +87,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +98,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_check/edit.vue b/src/views/safety_check/edit.vue
index fd924c5..049a16e 100644
--- a/src/views/safety_check/edit.vue
+++ b/src/views/safety_check/edit.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="edit-popup">
 
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
 
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
@@ -22,12 +21,12 @@
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-select v-model="formData.dept_id" clearable placeholder="请选择部门" class="flex-1">
                                 <el-option v-for="( item, index ) in  list2 " :key="index" :label="item.name"
-                                    :value="item.id" />
+                                    :value="parseInt(item.id)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="项目名称" prop="project_id" @click="showDialog = true">
+                        <el-form-item label="项目名称" @click="showDialog = true">
                             <el-input v-model="project_name" clearable placeholder="请输入项目名称" />
                         </el-form-item>
                     </el-col>
@@ -148,10 +147,9 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
+                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
diff --git a/src/views/safety_check/index.vue b/src/views/safety_check/index.vue
index c21fbdc..a3ae2e2 100644
--- a/src/views/safety_check/index.vue
+++ b/src/views/safety_check/index.vue
@@ -51,44 +51,31 @@
                     <el-table-column label="检查日期" prop="check_date" show-overflow-tooltip />
                     <el-table-column label="整改期限" prop="modify_term" show-overflow-tooltip />
                     <el-table-column label="检查人" prop="check_user" show-overflow-tooltip />
-                    <el-table-column label="检查单位" prop="check_company" show-overflow-tooltip />
+                    <!-- <el-table-column label="检查单位" prop="check_company" show-overflow-tooltip /> -->
                     <el-table-column label="整改单位" prop="modify_company" show-overflow-tooltip />
                     <el-table-column label="责任人" prop="resp_user" show-overflow-tooltip />
-                    <el-table-column label="检查区域" prop="check_area" show-overflow-tooltip />
-
+                    <!-- <el-table-column label="检查区域" prop="check_area" show-overflow-tooltip /> -->
                     <el-table-column label="风险等级" prop="risk_level" show-overflow-tooltip />
-                    <el-table-column label="检查项" prop="check_item" show-overflow-tooltip />
-                    <el-table-column label="安全隐患" prop="safety_hazard" show-overflow-tooltip />
-                    <el-table-column label="检查性质" prop="check_nature" show-overflow-tooltip />
+                    <!-- <el-table-column label="检查项" prop="check_item" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="安全隐患" prop="safety_hazard" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="检查性质" prop="check_nature" show-overflow-tooltip /> -->
                     <el-table-column label="检查结果" prop="check_result" show-overflow-tooltip />
                     <el-table-column label="质量隐患" prop="quality_hazard" show-overflow-tooltip />
-                    <el-table-column label="子表" prop="content" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="子表" prop="sub_table" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
-                            <el-button v-perms="['safety.safety_check/edit']" type="primary" link
-                                @click="handleEdit(row)">
+                            <el-button v-perms="['safety.safety_check/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
                             <el-button v-perms="['safety.safety_check/delete']" type="danger" link
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['safety.safety_check/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
+
 
 
                         </template>
diff --git a/src/views/safety_emergency_plan/detail.vue b/src/views/safety_emergency_plan/detail.vue
index ecc9fcb..6137372 100644
--- a/src/views/safety_emergency_plan/detail.vue
+++ b/src/views/safety_emergency_plan/detail.vue
@@ -1,87 +1,34 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="应急预案详情" :async="true" width="550px" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="内容" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.content }}
+                </el-descriptions-item>
+                <el-descriptions-item label="发生时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.happen_date }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +50,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +61,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_emergency_plan/edit.vue b/src/views/safety_emergency_plan/edit.vue
index ddd0278..8ee0aa7 100644
--- a/src/views/safety_emergency_plan/edit.vue
+++ b/src/views/safety_emergency_plan/edit.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="edit-popup">
 
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
 
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
@@ -45,8 +44,8 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="发生时间" prop="require">
-                            <el-date-picker v-model="formData.happen_date" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="选择发生时间" class="flex-1 !flex">
+                            <el-date-picker v-model="formData.happen_date" clearable type="date" value-format="YYYY-MM-DD"
+                                placeholder="选择发生时间" class="flex-1 !flex">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -71,10 +70,9 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
+                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
@@ -217,10 +215,7 @@ const setFormData = async (data: Record<any, any>) => {
         Object.assign(formDataannex, arry1)
 
     }
-    if (data.dept_id) {
-        getlist1(data.dept_id
-        )
-    }
+
 
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
@@ -229,11 +224,10 @@ const setFormData = async (data: Record<any, any>) => {
         }
     }
 
-
     project_name.value = data.project_name
-
     project_code.value = data.project_code
     getlist1(formData.org_id)
+
 }
 const getDetail = async (row: Record<string, any>) => {
     const data = await safetyemergencyplanDetail({
diff --git a/src/views/safety_emergency_plan/index.vue b/src/views/safety_emergency_plan/index.vue
index d0cf66d..723dcb8 100644
--- a/src/views/safety_emergency_plan/index.vue
+++ b/src/views/safety_emergency_plan/index.vue
@@ -41,20 +41,6 @@
                     <el-table-column label="发生时间" prop="happen_date" show-overflow-tooltip />
                     <el-table-column label="内容" prop="content" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
@@ -66,7 +52,9 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-
+                            <el-button v-perms="['safety.safety_emergency_plan/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
 
                         </template>
                     </el-table-column>
diff --git a/src/views/safety_evaluate/detail.vue b/src/views/safety_evaluate/detail.vue
index ecc9fcb..5c65303 100644
--- a/src/views/safety_evaluate/detail.vue
+++ b/src/views/safety_evaluate/detail.vue
@@ -1,87 +1,34 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="安全评估详情" :async="true" width="550px" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="内容" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.content }}
+                </el-descriptions-item>
+                <el-descriptions-item label="发生时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.happen_date }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +50,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +61,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_evaluate/edit.vue b/src/views/safety_evaluate/edit.vue
index a50bc1e..542ea7d 100644
--- a/src/views/safety_evaluate/edit.vue
+++ b/src/views/safety_evaluate/edit.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="edit-popup">
 
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
 
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
@@ -45,8 +44,8 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="发生时间" prop="require">
-                            <el-date-picker v-model="formData.happen_date" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="选择发生时间" class="flex-1 !flex">
+                            <el-date-picker v-model="formData.happen_date" clearable type="date" value-format="YYYY-MM-DD"
+                                placeholder="选择发生时间" class="flex-1 !flex">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -71,10 +70,9 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
+                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
@@ -217,10 +215,6 @@ const setFormData = async (data: Record<any, any>) => {
         Object.assign(formDataannex, arry1)
 
     }
-    if (data.dept_id) {
-        getlist1(data.dept_id
-        )
-    }
 
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
@@ -228,11 +222,10 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
-
     project_name.value = data.project_name
-
     project_code.value = data.project_code
+    getlist1(formData.org_id)
+
 }
 const getDetail = async (row: Record<string, any>) => {
     const data = await safetyevaluateDetail({
@@ -245,10 +238,7 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     formData.file = formDataannex.map((item) => item.uri)
-
     await formRef.value?.validate()
-
-
     const data = { ...formData }
     mode.value == 'edit'
         ? await safetyevaluateEdit(data)
diff --git a/src/views/safety_evaluate/index.vue b/src/views/safety_evaluate/index.vue
index 3c5d9d1..9899b7b 100644
--- a/src/views/safety_evaluate/index.vue
+++ b/src/views/safety_evaluate/index.vue
@@ -41,22 +41,7 @@
                     <el-table-column label="发生时间" prop="happen_date" show-overflow-tooltip />
                     <el-table-column label="内容" prop="content" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
-
                         <template #default="{ row }">
                             <el-button v-perms="['safety.safety_evaluate/edit']" type="primary" link
                                 @click="handleEdit(row)">
@@ -66,6 +51,9 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['safety.safety_evaluate/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
 
 
                         </template>
diff --git a/src/views/safety_event/detail.vue b/src/views/safety_event/detail.vue
index ecc9fcb..e5295eb 100644
--- a/src/views/safety_event/detail.vue
+++ b/src/views/safety_event/detail.vue
@@ -1,87 +1,34 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="安全事件详情" :async="true" width="550px" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="内容" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.content }}
+                </el-descriptions-item>
+                <el-descriptions-item label="发生时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.happen_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +50,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +61,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_event/index.vue b/src/views/safety_event/index.vue
index d4b492a..83f7bbe 100644
--- a/src/views/safety_event/index.vue
+++ b/src/views/safety_event/index.vue
@@ -42,31 +42,19 @@
                     <el-table-column label="发生时间" prop="happen_time" show-overflow-tooltip />
                     <el-table-column label="事件内容" prop="content" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
-                            <el-button v-perms="['safety.safety_event/edit']" type="primary" link
-                                @click="handleEdit(row)">
+                            <el-button v-perms="['safety.safety_event/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
                             <el-button v-perms="['safety.safety_event/delete']" type="danger" link
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['safety.safety_event/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
 
 
                         </template>
diff --git a/src/views/safety_hazard/detail.vue b/src/views/safety_hazard/detail.vue
index ecc9fcb..4254c1a 100644
--- a/src/views/safety_hazard/detail.vue
+++ b/src/views/safety_hazard/detail.vue
@@ -1,87 +1,64 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="危险源管理详情" :async="true" width="80vw" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="3" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="填报单位" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.fill_company }}
+                </el-descriptions-item>
+                <el-descriptions-item label="施工单位负责人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.construction_company_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="监理单位负责人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.build_company_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="建设单位负责人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.build_company_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="危险源" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.source }}
+                </el-descriptions-item>
+                <el-descriptions-item label="可能发生事故" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.accident }}
+                </el-descriptions-item>
+                <el-descriptions-item label="风险等级" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.risk_level }}
+                </el-descriptions-item>
+                <el-descriptions-item label="管控层级" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.control_level }}
+                </el-descriptions-item>
+                <el-descriptions-item label="主责部门" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.department }}
+                </el-descriptions-item>
+                <el-descriptions-item label="主要人员" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.users }}
+                </el-descriptions-item>
+                <el-descriptions-item label="技术措施" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.technical_measure }}
+                </el-descriptions-item>
+                <el-descriptions-item label="管理措施" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.manage_measure }}
+                </el-descriptions-item>
+                <el-descriptions-item label="应急措施" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.emergency_measure }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +80,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +91,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_hazard/edit.vue b/src/views/safety_hazard/edit.vue
index aa4eac1..187d55a 100644
--- a/src/views/safety_hazard/edit.vue
+++ b/src/views/safety_hazard/edit.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="edit-popup">
 
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
 
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
@@ -106,19 +105,11 @@
                             <el-input v-model="formData.emergency_measure" clearable placeholder="请输入应急措施" />
                         </el-form-item>
                     </el-col>
-
-
-
-
-
                     <el-col :span="24">
                         <el-form-item label="备注" prop="remark">
                             <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
                         </el-form-item>
                     </el-col>
-
-
-
                     <el-col :span="24">
 
                         <el-form-item label="附件">
@@ -133,10 +124,9 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
+                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
@@ -302,12 +292,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
-    if (data.dept_id) {
-        getlist1(data.dept_id
-        )
-    }
     project_name.value = data.project_name
+    getlist1(formData.org_id)
 
 
 }
diff --git a/src/views/safety_hazard/index.vue b/src/views/safety_hazard/index.vue
index 6b56064..4ef24dd 100644
--- a/src/views/safety_hazard/index.vue
+++ b/src/views/safety_hazard/index.vue
@@ -53,29 +53,22 @@
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
                     <el-table-column label="填报单位" prop="fill_company" show-overflow-tooltip />
-                    <el-table-column label="施工单位负责人" prop="construction_company_user" show-overflow-tooltip />
-                    <el-table-column label="监理单位负责人" prop="supervision_company_user" show-overflow-tooltip />
-
-                    <el-table-column label="建设单位负责人" prop="build_company_user" show-overflow-tooltip />
+                    <el-table-column label="施工单位负责人" prop="construction_company_user" show-overflow-tooltip width="140" />
+                    <el-table-column label="监理单位负责人" prop="supervision_company_user" show-overflow-tooltip width="140" />
+                    <el-table-column label="建设单位负责人" prop="build_company_user" show-overflow-tooltip width="140" />
                     <el-table-column label="危险源" prop="source" show-overflow-tooltip />
-                    <el-table-column label="可能发生事故" prop="accident" show-overflow-tooltip />
+                    <el-table-column label="可能发生事故" prop="accident" show-overflow-tooltip width="120" />
                     <el-table-column label="风险等级" prop="control_level" show-overflow-tooltip />
                     <el-table-column label="管控层级" prop="build_company_user" show-overflow-tooltip />
                     <el-table-column label="主责部门" prop="department" show-overflow-tooltip />
                     <el-table-column label="主要人员" prop="users" show-overflow-tooltip />
-
                     <el-table-column label="技术措施" prop="technical_measure" show-overflow-tooltip />
                     <el-table-column label="管理措施" prop="manage_measure" show-overflow-tooltip />
                     <el-table-column label="应急措施" prop="emergency_measure" show-overflow-tooltip />
-
-
-
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
-                            <el-button v-perms="['safety.safety_hazard/edit']" type="primary" link
-                                @click="handleEdit(row)">
+                            <el-button v-perms="['safety.safety_hazard/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
                             <el-button v-perms="['safety.safety_hazard/delete']" type="danger" link
diff --git a/src/views/safety_modify/detail.vue b/src/views/safety_modify/detail.vue
index ecc9fcb..e14b652 100644
--- a/src/views/safety_modify/detail.vue
+++ b/src/views/safety_modify/detail.vue
@@ -1,87 +1,54 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="安全整改详情" :async="true" width="80vw" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="3" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_code }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查性质" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_nature }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查日期" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_date }}
+                </el-descriptions-item>
+                <el-descriptions-item label="整改期限" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.modify_term }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查单位" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_company }}
+                </el-descriptions-item>
+                <el-descriptions-item label="整改单位" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.modify_company }}
+                </el-descriptions-item>
+                <el-descriptions-item label="责任人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.resp_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查项" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_item }}
+                </el-descriptions-item>
+                <el-descriptions-item label="安全隐患" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.safety_hazard }}
+                </el-descriptions-item>
+                <el-descriptions-item label="检查结果" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_result }}
+                </el-descriptions-item>
+                <el-descriptions-item label="整改人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.modify_user }}
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +70,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +81,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_modify/index.vue b/src/views/safety_modify/index.vue
index ca6d889..bdd0267 100644
--- a/src/views/safety_modify/index.vue
+++ b/src/views/safety_modify/index.vue
@@ -2,8 +2,6 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
-
-
                 <el-form-item label="检查人" prop="check_user">
                     <el-input class="w-[280px]" v-model="queryParams.check_user" clearable placeholder="请输入检查人" />
                 </el-form-item>
@@ -52,13 +50,10 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="序号" type="index" width="55" />
                     <el-table-column label="组织名称" prop="org_name" show-overflow-tooltip />
                     <el-table-column label="部门名称" prop="dept_name" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
-
-                    <el-table-column label="检查日期" prop="check_date" show-overflow-tooltip />
                     <el-table-column label="整改期限" prop="modify_term" show-overflow-tooltip />
                     <el-table-column label="检查人" prop="check_user" show-overflow-tooltip />
                     <el-table-column label="检查单位" prop="check_company" show-overflow-tooltip />
@@ -69,34 +64,18 @@
                     <el-table-column label="安全隐患" prop="safety_hazard" show-overflow-tooltip />
                     <el-table-column label="检查性质" prop="check_nature" show-overflow-tooltip />
                     <el-table-column label="检查结果" prop="check_result" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
-
                         <template #default="{ row }">
-                            <el-button v-perms="['safety.safety_modify/edit']" type="primary" link
-                                @click="handleEdit(row)">
+                            <el-button v-perms="['safety.safety_modify/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
                             <el-button v-perms="['safety.safety_modify/delete']" type="danger" link
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-
-
+                            <el-button v-perms="['safety.safety_modify/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
diff --git a/src/views/safety_product_month/detail.vue b/src/views/safety_product_month/detail.vue
index ecc9fcb..217f024 100644
--- a/src/views/safety_product_month/detail.vue
+++ b/src/views/safety_product_month/detail.vue
@@ -1,87 +1,46 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="安全生产月表详情" :async="true" width="550px" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="月份" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.month }}
+                </el-descriptions-item>
+                <el-descriptions-item label="负责人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.resp_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="分类" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.classify }}
+                </el-descriptions-item>
+                <el-descriptions-item label="隐患数量" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.hazard_num }}
+                </el-descriptions-item>
+                <el-descriptions-item label="数据统计" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.data_statistics }}
+                </el-descriptions-item>
+                <el-descriptions-item label="本月重点工作" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.current_important_work }}
+                </el-descriptions-item>
+                <el-descriptions-item label="下一阶段重点工作计划" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.next_important_work }}
+                </el-descriptions-item>
+                <el-descriptions-item label="需报告说明或协调的事项" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.item }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +62,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +73,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_product_month/edit.vue b/src/views/safety_product_month/edit.vue
index 32b11cb..7a4edd9 100644
--- a/src/views/safety_product_month/edit.vue
+++ b/src/views/safety_product_month/edit.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="edit-popup">
 
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="750px" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="750px" @confirm="handleSubmit" @close="handleClose">
 
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
@@ -56,8 +55,7 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="数据统计" prop="data_statistics">
-                            <el-input v-model="formData.data_statistics" type="number" clearable
-                                placeholder="请输入数据统计" />
+                            <el-input v-model="formData.data_statistics" type="number" clearable placeholder="请输入数据统计" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -91,10 +89,9 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
+                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
@@ -242,10 +239,7 @@ const setFormData = async (data: Record<any, any>) => {
         Object.assign(formDataannex, arry1)
 
     }
-    if (data.dept_id) {
-        getlist1(data.dept_id
-        )
-    }
+
 
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
@@ -258,6 +252,8 @@ const setFormData = async (data: Record<any, any>) => {
     project_name.value = data.project_name
 
     project_code.value = data.project_code
+    getlist1(formData.org_id)
+
 }
 const getDetail = async (row: Record<string, any>) => {
     const data = await safetyproductmonthDetail({
diff --git a/src/views/safety_product_month/index.vue b/src/views/safety_product_month/index.vue
index 323cdfc..dbd3723 100644
--- a/src/views/safety_product_month/index.vue
+++ b/src/views/safety_product_month/index.vue
@@ -42,23 +42,7 @@
                     <el-table-column label="本月重点工作" width="155" prop="current_important_work" show-overflow-tooltip />
                     <el-table-column label="下一阶段重点工作计划" width="165" prop="next_important_work" show-overflow-tooltip />
                     <el-table-column label="需报告说明或协调的事项" width="185" prop="item" show-overflow-tooltip />
-
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
-
                         <template #default="{ row }">
                             <el-button v-perms="['safety.safety_product_month/edit']" type="primary" link
                                 @click="handleEdit(row)">
@@ -68,8 +52,9 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-
-
+                            <el-button v-perms="['safety.safety_product_month/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
diff --git a/src/views/safety_rehearsal/detail.vue b/src/views/safety_rehearsal/detail.vue
index ecc9fcb..54c27f2 100644
--- a/src/views/safety_rehearsal/detail.vue
+++ b/src/views/safety_rehearsal/detail.vue
@@ -1,87 +1,34 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="安全演练详情" :async="true" width="550px" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="内容" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.content }}
+                </el-descriptions-item>
+                <el-descriptions-item label="发生时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.happen_date }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +50,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +61,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_rehearsal/edit.vue b/src/views/safety_rehearsal/edit.vue
index f6d7a9c..cd4c086 100644
--- a/src/views/safety_rehearsal/edit.vue
+++ b/src/views/safety_rehearsal/edit.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="edit-popup">
 
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
 
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
@@ -45,8 +44,8 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="发生时间" prop="require">
-                            <el-date-picker v-model="formData.happen_date" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="选择发生时间" class="flex-1 !flex">
+                            <el-date-picker v-model="formData.happen_date" clearable type="date" value-format="YYYY-MM-DD"
+                                placeholder="选择发生时间" class="flex-1 !flex">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -71,10 +70,9 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
+                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
@@ -180,7 +178,7 @@ const getlist1 = (id: any) => {
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑安全演练表' : '新增安全评估表'
+    return mode.value == 'edit' ? '编辑安全演练表' : '新增安全演练表'
 })
 
 // 表单数据
@@ -217,10 +215,6 @@ const setFormData = async (data: Record<any, any>) => {
         Object.assign(formDataannex, arry1)
 
     }
-    if (data.dept_id) {
-        getlist1(data.dept_id
-        )
-    }
 
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
diff --git a/src/views/safety_rehearsal/index.vue b/src/views/safety_rehearsal/index.vue
index 9ddf601..e590b57 100644
--- a/src/views/safety_rehearsal/index.vue
+++ b/src/views/safety_rehearsal/index.vue
@@ -41,20 +41,7 @@
                     <el-table-column label="发生时间" prop="happen_date" show-overflow-tooltip />
                     <el-table-column label="内容" prop="content" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
 
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
@@ -66,6 +53,9 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['safety.safety_rehearsal/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
 
 
                         </template>
diff --git a/src/views/safety_standard/detail.vue b/src/views/safety_standard/detail.vue
index 38dc9ae..0233fae 100644
--- a/src/views/safety_standard/detail.vue
+++ b/src/views/safety_standard/detail.vue
@@ -1,70 +1,27 @@
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="安全规范详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="组织名称">
-                                {{ formData.org_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="部门名称">
-                                {{ formData.dept_name
-
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="规范名称">
-                                {{ formData.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="规范类别">
-                                {{ formData.type
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="发布部门">
-                                {{ formData.publish_dep
-
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="内容">
-                                {{ formData.content }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="规范附件">
-                                <div>
-                                    <div v-for="( item, index ) in  formDataannex "
-                                        style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                            :href="item.uri" target="_blank">{{ item.name }}</a>
-                                        <span style="cursor: pointer;margin-left: 5px;"
-                                            @click="delFileFn(index)">x</span>
-                                    </div>
-                                </div>
-
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="安全规范详情" :async="true" width="550px" @close="handleClose" @confirm="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="规范类别" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.type }}
+                </el-descriptions-item>
+                <el-descriptions-item label="发布部门" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.publish_dep }}
+                </el-descriptions-item>
+                <el-descriptions-item label="内容" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.content }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,19 +60,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-    if (data.file && data.file.length > 0) {
-
-        const arry1 = data.file.map((item: any, index: any) => {
-            return {
-                name: `文件${index + 1}`,
-                uri: item
-            };
-        });
-        Object.assign(formDataannex, arry1)
-
-    }
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_standard/edit.vue b/src/views/safety_standard/edit.vue
index 9e69428..ab4a967 100644
--- a/src/views/safety_standard/edit.vue
+++ b/src/views/safety_standard/edit.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="edit-popup">
 
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
 
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
@@ -64,10 +63,9 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
+                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
diff --git a/src/views/safety_standard/index.vue b/src/views/safety_standard/index.vue
index 0a471d3..2bfba22 100644
--- a/src/views/safety_standard/index.vue
+++ b/src/views/safety_standard/index.vue
@@ -41,22 +41,6 @@
                     <el-table-column label="规范类别" prop="type" show-overflow-tooltip />
                     <el-table-column label="发布部门" prop="publish_dep" show-overflow-tooltip />
                     <el-table-column label="内容" prop="content" show-overflow-tooltip />
-
-
-                    <el-table-column label="规范附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
@@ -68,9 +52,9 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <!-- <el-button v-perms="['safety.safety_standard/detail']" link @click="handledetail(row)">
+                            <el-button v-perms="['safety.safety_standard/detail']" link @click="handledetail(row)">
                                 详情
-                            </el-button> -->
+                            </el-button>
 
                         </template>
                     </el-table-column>
diff --git a/src/views/safety_supervise/detail.vue b/src/views/safety_supervise/detail.vue
index ecc9fcb..26d92af 100644
--- a/src/views/safety_supervise/detail.vue
+++ b/src/views/safety_supervise/detail.vue
@@ -1,87 +1,34 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="项目合同详情" :async="true" width="550px" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="监督名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="发生时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.happen_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="设备事故" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.device_accident }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -103,12 +50,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
 
 // 表单数据
 const formData = reactive({
@@ -120,9 +61,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_supervise/index.vue b/src/views/safety_supervise/index.vue
index d1c01ee..ba6ac3e 100644
--- a/src/views/safety_supervise/index.vue
+++ b/src/views/safety_supervise/index.vue
@@ -44,36 +44,23 @@
                     <el-table-column label="组织名称" prop="org_name" show-overflow-tooltip />
                     <el-table-column label="部门名称" prop="dept_name" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-                    <!-- <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip /> -->
                     <el-table-column label="监督名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="发生时间" prop="happen_time" show-overflow-tooltip />
                     <el-table-column label="设备事故" prop="device_accident" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
-                            <el-button v-perms="['safety.safety_event/edit']" type="primary" link
-                                @click="handleEdit(row)">
+                            <el-button v-perms="['safety.safety_event/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
                             <el-button v-perms="['safety.safety_event/delete']" type="danger" link
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['safety.safety_event/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
 
 
                         </template>
diff --git a/src/views/safety_target/detail.vue b/src/views/safety_target/detail.vue
index 91a1466..3273bae 100644
--- a/src/views/safety_target/detail.vue
+++ b/src/views/safety_target/detail.vue
@@ -1,88 +1,40 @@
+
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="安全目标详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="组织名称">
-                                {{ formData.org_name }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="部门名称">
-                                {{ formData.dept_name
-
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project_name
-                                }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目类别">
-                                {{ formData.project_type
-
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="安全目标">
-                                {{ formData.target
-
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="基本要求">
-                                {{ formData.require
-
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="目标规范">
-                                {{ formData.target_standard }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="合格率">
-                                {{ formData.pass_rate }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="允许偏差">
-                                {{ formData.deviation }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="规范附件">
-                                <div>
-                                    <div v-for="( item, index ) in  formDataannex "
-                                        style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                            :href="item.uri" target="_blank">{{ item.name }}</a>
-                                        <span style="cursor: pointer;margin-left: 5px;"
-                                            @click="delFileFn(index)">x</span>
-                                    </div>
-                                </div>
-
-                            </el-form-item>
-                        </el-col>
-
-
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+        <popup ref="popupRef" title="安全目标详情" :async="true" width="550px" @confirm="handleClose" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.org_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.dept_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目类别" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.project_type }}
+                </el-descriptions-item>
+                <el-descriptions-item label="安全目标" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.target }}
+                </el-descriptions-item>
+                <el-descriptions-item label="基本要求" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.require }}
+                </el-descriptions-item>
+                <el-descriptions-item label="目标规范" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.target_standard }}
+                </el-descriptions-item>
+                <el-descriptions-item label="合格率" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.pass_rate }}
+                </el-descriptions-item>
+                <el-descriptions-item label="允许偏差" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.deviation }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <el-link type="primary" v-for="(item, index) in formData.file" :key="index" :href="item"
+                        target="_blank"> 文件{{ index + 1 }}</el-link>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -121,19 +73,6 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-    if (data.file && data.file.length > 0) {
-
-        const arry1 = data.file.map((item: any, index: any) => {
-            return {
-                name: `文件${index + 1}`,
-                uri: item
-            };
-        });
-        Object.assign(formDataannex, arry1)
-
-    }
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/safety_target/edit.vue b/src/views/safety_target/edit.vue
index 8c11f42..ad4f1b3 100644
--- a/src/views/safety_target/edit.vue
+++ b/src/views/safety_target/edit.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="edit-popup">
 
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
 
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
@@ -51,8 +50,7 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="目标规范" prop="target_standard">
-                            <el-input v-model="formData.target_standard" type="textarea" clearable
-                                placeholder="请输入目标规范" />
+                            <el-input v-model="formData.target_standard" type="textarea" clearable placeholder="请输入目标规范" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -82,10 +80,9 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
+                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
diff --git a/src/views/safety_target/index.vue b/src/views/safety_target/index.vue
index 66f4d4f..9e47a2a 100644
--- a/src/views/safety_target/index.vue
+++ b/src/views/safety_target/index.vue
@@ -41,35 +41,18 @@
                     <el-table-column label="目标规范" prop="target_standard" show-overflow-tooltip />
                     <el-table-column label="合格率" prop="pass_rate" show-overflow-tooltip />
                     <el-table-column label="允许偏差" prop="deviation" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.file.length > 0">
-                                <div v-for="(item, i) in row.file " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
-
                         <template #default="{ row }">
-                            <el-button v-perms="['safety.safety_target/edit']" type="primary" link
-                                @click="handleEdit(row)">
+                            <el-button v-perms="['safety.safety_target/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
                             <el-button v-perms="['safety.safety_target/delete']" type="danger" link
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <!-- <el-button v-perms="['safety.safety_target/detail']" link @click="handledetail(row)">
+                            <el-button v-perms="['safety.safety_target/detail']" link @click="handledetail(row)">
                                 详情
-                            </el-button> -->
-
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
diff --git a/vite.config.ts b/vite.config.ts
index f8e8694..d0839d0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,64 +1,71 @@
-import { fileURLToPath, URL } from 'url'
+import { fileURLToPath, URL } from "url";
 
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
-import vueJsx from '@vitejs/plugin-vue-jsx'
-import AutoImport from 'unplugin-auto-import/vite'
-import Components from 'unplugin-vue-components/vite'
-import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
-import { createStyleImportPlugin, ElementPlusResolve } from 'vite-plugin-style-import'
-import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
-import vueSetupExtend from 'vite-plugin-vue-setup-extend'
-import { visualizer } from 'rollup-plugin-visualizer'
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
+import AutoImport from "unplugin-auto-import/vite";
+import Components from "unplugin-vue-components/vite";
+import { ElementPlusResolver } from "unplugin-vue-components/resolvers";
+import {
+  createStyleImportPlugin,
+  ElementPlusResolve,
+} from "vite-plugin-style-import";
+import { createSvgIconsPlugin } from "vite-plugin-svg-icons";
+import vueSetupExtend from "vite-plugin-vue-setup-extend";
+import { visualizer } from "rollup-plugin-visualizer";
 // import legacyPlugin from '@vitejs/plugin-legacy'
 // https://vitejs.dev/config/
 export default defineConfig({
-    base: '/admin/',
-    server: {
-        host: '0.0.0.0',
-        port:9527,
-        open:true
+  base: "/admin/",
+  server: {
+    host: "0.0.0.0",
+    port: 8888,
+    open: true,
+  },
+  plugins: [
+    visualizer({ open: true }),
+    vue(),
+    vueJsx(),
+    AutoImport({
+      imports: ["vue", "vue-router"],
+      resolvers: [ElementPlusResolver()],
+      eslintrc: {
+        enabled: true,
+      },
+    }),
+    Components({
+      directoryAsNamespace: true,
+      resolvers: [ElementPlusResolver()],
+    }),
+    createStyleImportPlugin({
+      resolves: [ElementPlusResolve()],
+    }),
+    createSvgIconsPlugin({
+      // 配置路劲在你的src里的svg存放文件
+      iconDirs: [fileURLToPath(new URL("./src/assets/icons", import.meta.url))],
+      symbolId: "local-icon-[dir]-[name]",
+    }),
+    vueSetupExtend(),
+    // legacyPlugin({
+    //     targets: ['defaults', 'IE 11']
+    // })
+  ],
+  resolve: {
+    alias: {
+      "@": fileURLToPath(new URL("./src", import.meta.url)),
     },
-    plugins: [
-         visualizer({open: true}),
-        vue(),
-        vueJsx(),
-        AutoImport({
-            imports: ['vue', 'vue-router'],
-            resolvers: [ElementPlusResolver()],
-            eslintrc: {
-                enabled: true
-            }
-        }),
-        Components({
-            directoryAsNamespace: true,
-            resolvers: [ElementPlusResolver()]
-        }),
-        createStyleImportPlugin({
-            resolves: [ElementPlusResolve()]
-        }),
-        createSvgIconsPlugin({
-            // 配置路劲在你的src里的svg存放文件
-            iconDirs: [fileURLToPath(new URL('./src/assets/icons', import.meta.url))],
-            symbolId: 'local-icon-[dir]-[name]'
-        }),
-        vueSetupExtend()
-        // legacyPlugin({
-        //     targets: ['defaults', 'IE 11']
-        // })
-    ],
-    resolve: {
-        alias: {
-            '@': fileURLToPath(new URL('./src', import.meta.url))
+  },
+  build: {
+    rollupOptions: {
+      manualChunks(id) {
+        if (id.includes("node_modules")) {
+          return id
+            .toString()
+            .split("node_modules/")[1]
+            .split("/")[0]
+            .toString();
         }
+      },
     },
-    build: {
-        rollupOptions: {
-            manualChunks(id) {
-                if (id.includes('node_modules')) {
-                    return id.toString().split('node_modules/')[1].split('/')[0].toString()
-                }
-            }
-        }
-    }
-})
+  },
+});