diff --git a/.env.local b/.env.local
index 0612f42..c2f2554 100644
--- a/.env.local
+++ b/.env.local
@@ -5,9 +5,9 @@ VITE_DEV=true
 
 # 请求路径
 #VITE_BASE_URL='http://localhost:48080'
-#VITE_BASE_URL='http://188.188.3.232:48080'
+VITE_BASE_URL='http://188.188.3.232:48080'
 # VITE_BASE_URL='http://188.188.5.188:48080'
-VITE_BASE_URL='https://hb.jzce.com'
+#VITE_BASE_URL='https://hb.jzce.com'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/api/enterpriseinspections/index.ts b/src/api/enterpriseinspections/index.ts
index f4cbd2c..e3d2451 100644
--- a/src/api/enterpriseinspections/index.ts
+++ b/src/api/enterpriseinspections/index.ts
@@ -41,18 +41,19 @@ export const EnterpriseInspectionsApi = {
   },
 
   // 导出企业检查记录表，用于记录与企业相关的环保检查信息。 Excel
-  inspectionsLogList: async (params:any) => {
+  inspectionsLogList: async (params: any) => {
     return await request.get({ url: `/system/inspections-log/list`, params })
   },
 
   //根据 用户id和任务名称查询可以转发的任务
-  getListByUserIdAndTaskName: async (params:any) => {
-    return await request.get({ url: `/system/enterprise-inspections/getListByUserIdAndTaskName`, params })
-  },
-
-    // 新增企业检查记录表，用于记录与企业相关的环保检查信息。
-  passOn: async (data:any) => {
+  getListByUserIdAndTaskName: async (params: any) => {
+    return await request.get({
+      url: `/system/enterprise-inspections/getListByUserIdAndTaskName`,
+      params
+    })
+  },
+  // 变更人员ID
+  passOn: async (data: any) => {
     return await request.post({ url: `/system/enterprise-inspections/passOn`, data })
-  },
-
+  }
 }
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 3c5ca2e..1849d3e 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -19,14 +19,11 @@ export interface UserVO {
   area: string
 }
 
-
-
 // 查询用户管理列表
 export const getUserPage = (params: PageParam) => {
   return request.get({ url: '/system/user/page', params })
 }
 
-
 // 查询专管员用户管理列表
 export const getPcUserPage = (params: PageParam) => {
   return request.get({ url: '/system/user/pcpage', params })
@@ -62,7 +59,6 @@ export const deleteUserAllData = (id: number) => {
   return request.delete({ url: '/system/user/test_delete?id=' + id })
 }
 
-
 // 导出用户
 export const exportUser = (params) => {
   return request.download({ url: '/system/user/export', params })
@@ -94,17 +90,17 @@ export const updateUserStatus = (id: number, status: number) => {
 // 获取用户精简信息列表
 export const getSimpleUserList = (): Promise<UserVO[]> => {
   return request.get({ url: '/system/user/simple-list' })
-}  
+}
 
-// 获取用户精简信息列表
-export const getSimpleUserZGList = (): Promise<UserVO[]> => {
-  return request.get({ url: '/system/user/simple-zg-list' })
-} 
+// 获取专管员
+export const getSimpleUserZGList = (param) => {
+  return request.get({ url: `/system/user/simple-zg-list`, param })
+}
 
 // 通过用户类型获取用户列表
-export const getSimpleUserListByUserType = (params:number) => {
-  return request.get({ url: '/system/user/simple-user-by-userType?type='+ params })
-} 
+export const getSimpleUserListByUserType = (params: number) => {
+  return request.get({ url: '/system/user/simple-user-by-userType?type=' + params })
+}
 
 /**
  * 查询审核列表
@@ -117,7 +113,7 @@ export const getExamieList = (audit: number) => {
  * 审核用户
  */
 export function examineUser(data) {
-  return request.put({url: '/system/user/user_audit', data}) 
+  return request.put({ url: '/system/user/user_audit', data })
 }
 
 // 专管员列表
@@ -129,3 +125,11 @@ export const getEnterpriseManager = () => {
 export const deptByMenu = () => {
   return request.get({ url: '/system/user/deptByMenu' })
 }
+
+
+/**
+ * 获取企业部门列表
+ */
+export const getDeptByEnterprise = () => {
+	return request.get({ url: '/system/user/enterprise_manager_dept_list' })
+}
\ No newline at end of file
diff --git a/src/components/ContentWrap/src/ContentWrap.vue b/src/components/ContentWrap/src/ContentWrap.vue
index 8847219..ac58464 100644
--- a/src/components/ContentWrap/src/ContentWrap.vue
+++ b/src/components/ContentWrap/src/ContentWrap.vue
@@ -16,7 +16,7 @@ defineProps({
 </script>
 
 <template>
-  <ElCard :body-style="bodyStyle" :class="[prefixCls, 'mb-15px']" shadow="never">
+  <ElCard :body-style="bodyStyle" :class="[prefixCls, 'mb-15px']" shadow="never" class="cs-card">
     <template v-if="title" #header>
       <div class="flex items-center">
         <span class="text-16px font-700">{{ title }}</span>
@@ -34,3 +34,14 @@ defineProps({
     <slot></slot>
   </ElCard>
 </template>
+
+<style lang="scss" scoped>
+.cs-card {
+  border: none;
+  --el-card-border-radius: 8px;
+  :deep(.el-card__header) {
+    border-bottom: none;
+    padding-bottom: 0;
+  }
+}
+</style>
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index 13c5091..7f34974 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -29,8 +29,6 @@ const getBindValue = computed(() => {
 
 const isFullscreen = ref(false)
 
-
-
 const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight)
 
 watch(
diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue
index 6414eaa..a1e927d 100644
--- a/src/components/DictTag/src/DictTag.vue
+++ b/src/components/DictTag/src/DictTag.vue
@@ -75,6 +75,8 @@ export default defineComponent({
                   type={dict?.colorType || null}
                   color={dict?.cssClass && isHexColor(dict?.cssClass) ? dict?.cssClass : ''}
                   disableTransitions={true}
+                  round={true}
+                  size="mini"
                 >
                   {dict?.label}
                 </ElTag>
@@ -88,3 +90,5 @@ export default defineComponent({
   }
 })
 </script>
+
+
diff --git a/src/components/UploadFile/src/UploadImgs.vue b/src/components/UploadFile/src/UploadImgs.vue
index 6962a8a..19aff5e 100644
--- a/src/components/UploadFile/src/UploadImgs.vue
+++ b/src/components/UploadFile/src/UploadImgs.vue
@@ -16,17 +16,16 @@
       :on-success="uploadSuccess"
       list-type="picture-card"
     >
-    <div class="upload-empty" v-if="!disabled">
-            <slot name="empty">
-              <Icon icon="ep:plus" />
-              <!-- <span>请上传图片</span> -->
-            </slot>
-         </div>
+      <div class="upload-empty" v-if="!disabled">
+        <slot name="empty">
+          <Icon icon="ep:plus" />
+          <!-- <span>请上传图片</span> -->
+        </slot>
+      </div>
       <template #file="{ file }">
         <img :src="file.url" class="upload-image" />
-      
+
         <div class="upload-handle" @click.stop>
-          
           <div class="handle-icon" @click="imagePreview(file.url!)">
             <Icon icon="ep:zoom-in" />
             <span>查看</span>
@@ -205,8 +204,6 @@ const handleExceed = () => {
   }
 }
 
-
-
 .upload-box {
   .no-border {
     :deep(.el-upload--picture-card) {
diff --git a/src/layout/components/BackOperation/src/index.vue b/src/layout/components/BackOperation/src/index.vue
index 032bc13..2bac2fb 100644
--- a/src/layout/components/BackOperation/src/index.vue
+++ b/src/layout/components/BackOperation/src/index.vue
@@ -5,17 +5,23 @@ import { onBeforeRouteUpdate } from 'vue-router'
 defineOptions({ name: 'BackOperation' })
 
 const router = useRouter()
-const isBack:any = ref(false)
+const route = useRoute()
+const isBack: any = ref(false)
 defineProps({
   color: propTypes.string.def('')
 })
 
+
+
 const goback = () => {
   router.go(-1)
 }
 onBeforeRouteUpdate((to) => {
   isBack.value = to.meta.hidden
 })
+onMounted(()=>{
+	isBack.value = route.meta.hidden
+})
 </script>
 
 <template>
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index dc1c3b9..2cd8d73 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -24,7 +24,6 @@ $elNamespace: el;
   .el-table__header {
     color: #909399;
   }
- 
 }
 
 .el-pagination--large .btn-next,
@@ -33,3 +32,19 @@ $elNamespace: el;
   height: fit-content;
   line-height: normal;
 }
+
+.el-select-dropdown__item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  line-height: normal;
+  height: fit-content;
+  padding: 10px;
+}
+
+.el-input__suffix{
+  margin-right: 15px;
+}
+.el-input-number.is-controls-right[class*=large] [class*=decrease], .el-input-number.is-controls-right[class*=large] [class*=increase]{
+  --el-input-number-controls-height:50%;
+}
\ No newline at end of file
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index e99c996..7a328dc 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -2,7 +2,7 @@
   <el-row justify="space-between">
     <el-col :span="14">
       <el-form :model="queryParams" class="queryForm" inline>
-        <el-form-item label="按区域" prop="region">
+        <el-form-item prop="region">
           <el-select
             v-model="queryParams.region"
             placeholder="请选择区域"
@@ -16,7 +16,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="按周期" prop="selectWeek">
+        <el-form-item  prop="selectWeek">
           <el-select
             v-model="queryParams.selectWeek"
             placeholder="请选择周期"
@@ -45,7 +45,7 @@
       </el-button>
     </section>
   </el-row>
-  <el-row :gutter="20" justify="space-between">
+  <el-row :gutter="20" justify="space-between" class="cursor-pointer">
     <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" :height="280">
       <el-card shadow="hover" class="mb-20px">
         <template #header> 任务进度 </template>
@@ -76,7 +76,7 @@
       </el-card>
     </el-col>
   </el-row>
-  <el-row :gutter="20" justify="space-between">
+  <el-row :gutter="20" justify="space-between" class="cursor-pointer">
     <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-20px">
       <el-card ref="taskNewCard" shadow="never">
         <template #header> 最新任务 </template>
@@ -142,7 +142,7 @@
         </el-skeleton>
       </el-card>
     </el-col>
-  </el-row>
+  </el-row >
 </template>
 <script lang="ts" setup>
 import { HomeApi } from '@/api/home'
@@ -601,8 +601,7 @@ init()
     margin-bottom: 20px;
   }
   .el-form-item {
-    width: 400px;
-    margin-right: 20px;
+    width: 320px;
     display: flex;
     flex-flow: row nowrap;
     align-items: center;
diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue
index 18ac397..daabe45 100644
--- a/src/views/Login/SocialLogin.vue
+++ b/src/views/Login/SocialLogin.vue
@@ -320,6 +320,9 @@ const handleLogin = async (params) => {
 onMounted(() => {
   getCookie()
   tryLogin()
+})
+onUnmounted(()=>{
+
 })
 </script>
 
diff --git a/src/views/Login/components/QrCodeForm.vue b/src/views/Login/components/QrCodeForm.vue
index 2d0e7a0..4d04794 100644
--- a/src/views/Login/components/QrCodeForm.vue
+++ b/src/views/Login/components/QrCodeForm.vue
@@ -121,10 +121,11 @@ onMounted(() => {
   // getCookie()
   getimg()
 })
-onUnmounted(() => {
+onBeforeUnmount(() => {
 	// 组件销毁时清除定时器
 	clearInterval(intervalId.value)
 })
+
 </script>
 <style lang="scss" scoped>
 .expired-text {
diff --git a/src/views/enterpriseinspections/ChangeUser.vue b/src/views/enterpriseinspections/ChangeUser.vue
index 83a840e..2664fb9 100644
--- a/src/views/enterpriseinspections/ChangeUser.vue
+++ b/src/views/enterpriseinspections/ChangeUser.vue
@@ -1,27 +1,29 @@
 <template>
-  <Dialog title="任务转发" v-model="dialogVisible">
-    <el-form :model="formData" label-width="auto" style="max-width: 600px">
-      <el-form-item label="转发用户" prop="name" style="max-width: 500px">
-        <el-select v-model="formData.userId" placeholder="请选择用户">
+  <Dialog title="变更人员" v-model="dialogVisible" width="480">
+    <el-form :model="formData" ref="formRef" :rules="formRules">
+      <el-form-item label="执法人员" prop="userId">
+        <el-select v-model="formData.userId" placeholder="请选择用户" filterable clearable>
           <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label=" item.deptName +'-'+ item.realName "
-                :value="item.id!"
-              />
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.realName"
+            :value="item.id"
+            popper-class="user-wrapper"
+          >
+            <el-avatar :src="item.avatar" :size="30" /> <span>{{ item.realName }}</span>
+          </el-option>
         </el-select>
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
     </template>
   </Dialog>
 </template>
 <script setup lang="ts">
-import { EnterpriseInspectionsApi, EnterpriseInspectionsVO } from '@/api/enterpriseinspections'
-import { getSimpleUserZGList, UserVO } from '@/api/system/user'
-
+import { EnterpriseInspectionsApi } from '@/api/enterpriseinspections'
+import { getSimpleUserZGList } from '@/api/system/user'
 
 /** 企业检查记录表，用于记录与企业相关的环保检查信息。 表单 */
 defineOptions({ name: 'EnterpriseInspectionsForm' })
@@ -31,59 +33,36 @@ const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const changeForm = ref({
-  id: undefined,
-  taskId: undefined,
-  enterpriseId: undefined,
+const formRules = ref({
+  userId: [{ required: true, message: '请选择用户', trigger: 'change' }]
 })
-
-const taskName = ref()
-
-const form = reactive({
-  userId: '',
-  resUserId: '',
-  inspectionsId: [],
-  taskName: ''
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const formRef = ref() // 表单的引用
+const formData: any = ref({
+  userId: undefined,
+  inspectionsId: undefined
 })
-
-// const formRules = reactive({
-// })
-const formRef = ref() // 表单 Ref
-
-
 const userList = ref()
-const getUserList = async () => {
-  const data = await getSimpleUserZGList();
-  userList.value = data
+const getUserList = async (deptId) => {
+  userList.value = await getSimpleUserZGList({ deptId: deptId })
 }
 
-
-const formData:any = ref({
-  userId: undefined,
-  inspectionsId: []
-});
-
 /** 打开弹窗 */
-const open = async (inspectionsId) => {
+const open = async (param) => {
+  formData.value.inspectionsId = param.id
+  await getUserList(param.deptId)
   dialogVisible.value = true
-  formData.value.inspectionsId.push(inspectionsId)
-  getUserList()
 }
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  // await formRef.value.validate()
+  await formRef.value.validate()
   // 提交请求
   formLoading.value = true
   try {
-    
     await EnterpriseInspectionsApi.passOn(formData.value)
     message.success(t('更改成功'))
-
     dialogVisible.value = false
     // 发送操作成功的事件
     emit('success')
@@ -92,29 +71,7 @@ const submitForm = async () => {
   }
 }
 
-// /** 重置表单 */
-// const resetForm = () => {
-//   formData.value = {
-//     id: undefined,
-//     taskId: undefined,
-//     enterpriseId: undefined,
-//   }
-//   formRef.value?.resetFields()
-// }
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 </script>
-<style scoped>
-  .box{
-    display: flex;
-    flex-direction: column;
-    .img{
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: center;
-      gap: 15px
-    }
-    .text{
-      padding: 15px;
-    }
-  }
-</style>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue b/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue
index 1f86e7b..94106b3 100644
--- a/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue
+++ b/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue
@@ -1,116 +1,76 @@
 <template>
-  <Dialog title="反馈信息" v-model="dialogVisible">
-    <div class="box">
-      <div class="img">
-          <div v-for="item in imgList" :key="item">
-            <el-image style="width: 180px; height: 180px" :src="item" :preview-src-list="imgList" />
-          </div>
-      </div>
-      <div class="text">{{dataValue.feedBack}}</div>
-    </div>
-    
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
+  <Dialog title="结果反馈" v-model="dialogVisible" width="800" top="5vh">
+    <section class="content-wrapper">
+      <section>
+        <section class="label">处理意见</section>
+        <section class="line-height-24px text-16px color-#303133"> {{ detail.feedBack }} </section>
+      </section>
+      <section>
+        <section class="label">照片取证</section>
+        <section class="image-wrapper">
+          <el-image
+            v-for="(photo, index) in detail.fileList"
+            :initial-index="index"
+            :preview-src-list="detail.fileList.map((i) => i.url)"
+            :key="photo.id"
+            :src="photo.url"
+            class="img"
+          />
+        </section>
+      </section>
+    </section>
   </Dialog>
 </template>
 <script setup lang="ts">
-import { EnterpriseInspectionsApi, EnterpriseInspectionsVO } from '@/api/enterpriseinspections'
-
 /** 企业检查记录表，用于记录与企业相关的环保检查信息。 表单 */
 defineOptions({ name: 'EnterpriseInspectionsForm' })
 
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
 const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('反馈信息') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  taskId: undefined,
-  enterpriseId: undefined,
-})
-// const formRules = reactive({
-// })
-const formRef = ref() // 表单 Ref
 
-const dataValue = ref()
-const imgList = ref([])
+const detail = ref()
 
 /** 打开弹窗 */
-const open = async (data) => {
-  
+const open = async (param: any) => {
+  detail.value = param
   dialogVisible.value = true
-  dataValue.value = data
-  
-  if (data.fileList.length > 0) {
-    imgList.value = data.fileList.map(i=>i.url)
-  }
-
-  console.log("imgList.value=>", imgList.value)
-
-  // // 修改时，设置数据
-  // if (id) {
-  //   formLoading.value = true
-  //   try {
-  //     formData.value = await EnterpriseInspectionsApi.getEnterpriseInspections(id)
-  //   } finally {
-  //     formLoading.value = false
-  //   }
-  // }
 }
+
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
 
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as EnterpriseInspectionsVO
-    if (formType.value === 'create') {
-      await EnterpriseInspectionsApi.createEnterpriseInspections(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await EnterpriseInspectionsApi.updateEnterpriseInspections(data)
-      message.success(t('common.updateSuccess'))
+<style scoped lang="scss">
+.content-wrapper {
+  display: grid;
+  grid-template-rows: 1fr;
+  grid-template-columns: 1.5fr 1fr;
+  grid-gap: 20px;
+  padding-bottom: 20px;
+  .label {
+    margin-bottom: 20px;
+    font-size: 16px;
+    display: flex;
+    flex-flow: row nowrap;
+    gap: 8px;
+    line-height: 24px;
+    align-items: center;
+    color: #303133;
+    &::before {
+      content: '';
+      display: block;
+      width: 3px;
+      height: 16px;
+      background-color: var(--el-color-primary);
     }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
   }
-}
-
-// /** 重置表单 */
-// const resetForm = () => {
-//   formData.value = {
-//     id: undefined,
-//     taskId: undefined,
-//     enterpriseId: undefined,
-//   }
-//   formRef.value?.resetFields()
-// }
-</script>
-<style scoped>
-  .box{
+  .image-wrapper {
     display: flex;
-    flex-direction: column;
-    .img{
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: center;
-      gap: 15px
-    }
-    .text{
-      padding: 15px;
+    flex-flow: row wrap;
+    gap: 20px;
+    .img {
+      width: 120px;
+      height: 120px;
+      border-radius: 4px;
     }
   }
+}
 </style>
diff --git a/src/views/enterpriseinspections/changeInspections.vue b/src/views/enterpriseinspections/changeInspections.vue
deleted file mode 100644
index 4bcd517..0000000
--- a/src/views/enterpriseinspections/changeInspections.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-  <Dialog title="任务转发" v-model="dialogVisible">
-    <el-form :model="form" label-width="auto" style="max-width: 600px">
-      <el-form-item label="转发用户" prop="name" style="max-width: 500px">
-        <el-select v-model="form.resUserId" placeholder="请选择用户">
-          <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label=" item.deptName +'-'+ item.realName "
-                :value="item.id!"
-              />
-        </el-select>
-      </el-form-item>
-    </el-form>
-
-    <el-form-item label="目标用户" prop="name" style="max-width: 500px">
-      <el-select v-model="form.userId" placeholder="请选择目标用户">
-        <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label=" item.deptName +'-'+ item.realName "
-            :value="item.id!"
-          />
-      </el-select>
-    </el-form-item>
-
-    <el-form-item label="任务名称" prop="name" style="max-width: 500px">
-      <el-select v-model="form.userId" placeholder="请选择任务名称">
-        <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label=" item.deptName +'-'+ item.realName "
-            :value="item.id!"
-          />
-      </el-select>
-    </el-form-item>
-    
-
-    <el-table :data="tableData" style="width: 100%">
-      <el-table-column prop="date" label="Date" width="180" />
-      <el-table-column prop="name" label="Name" width="180" />
-      <el-table-column prop="address" label="Address" />
-    </el-table>
-
-    
-
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import { EnterpriseInspectionsApi, EnterpriseInspectionsVO } from '@/api/enterpriseinspections'
-import { getSimpleUserZGList } from '@/api/system/user'
-
-
-/** 企业检查记录表，用于记录与企业相关的环保检查信息。 表单 */
-defineOptions({ name: 'EnterpriseInspectionsForm' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  taskId: undefined,
-  enterpriseId: undefined,
-})
-
-const taskName = ref()
-
-const tableData = [
-  {
-    date: '2016-05-03',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-02',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-]
-
-const form = reactive({
-  userId: '',
-  resUserId: '',
-  inspectionsId: [],
-  taskName: ''
-})
-
-// const formRules = reactive({
-// })
-const formRef = ref() // 表单 Ref
-
-const dataValue = ref()
-
-const userList = ref()
-const getUserList = async () => {
-  const data = await getSimpleUserZGList();
-  userList.value = data
-}
-
-const selectTask = async() => {
-
-  
-
-  const params = {
-    'userId': form.resUserId,
-    'taskName': taskName
-  }
-
-  const data = await EnterpriseInspectionsApi.getListByUserIdAndTaskName(params)
-  console.log('data==============>', data)
-
-}
-
-
-/** 打开弹窗 */
-const open = async (data) => {
-  
-  dialogVisible.value = true
-  dataValue.value = data
-
-  getUserList()
-  
-
-  // // 修改时，设置数据
-  // if (id) {
-  //   formLoading.value = true
-  //   try {
-  //     formData.value = await EnterpriseInspectionsApi.getEnterpriseInspections(id)
-  //   } finally {
-  //     formLoading.value = false
-  //   }
-  // }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as EnterpriseInspectionsVO
-    if (formType.value === 'create') {
-      await EnterpriseInspectionsApi.createEnterpriseInspections(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await EnterpriseInspectionsApi.updateEnterpriseInspections(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-// /** 重置表单 */
-// const resetForm = () => {
-//   formData.value = {
-//     id: undefined,
-//     taskId: undefined,
-//     enterpriseId: undefined,
-//   }
-//   formRef.value?.resetFields()
-// }
-</script>
-<style scoped>
-  .box{
-    display: flex;
-    flex-direction: column;
-    .img{
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: center;
-      gap: 15px
-    }
-    .text{
-      padding: 15px;
-    }
-  }
-</style>
diff --git a/src/views/enterpriseinspections/detail.vue b/src/views/enterpriseinspections/detail.vue
index 652e4c7..bfc08ff 100644
--- a/src/views/enterpriseinspections/detail.vue
+++ b/src/views/enterpriseinspections/detail.vue
@@ -1,50 +1,87 @@
 <template>
-  <ContentWrap title="" style="padding: 17px;">
-    <el-descriptions>
-      <el-descriptions-item label="记录编号">{{detailData.taskNumber}}</el-descriptions-item>
-      <el-descriptions-item label="任务名称">{{detailData.taskName}}</el-descriptions-item>
-      <el-descriptions-item label="任务类型">{{tagList}}</el-descriptions-item>
-      <el-descriptions-item label="企业名称">{{detailData.enterpriseName}}</el-descriptions-item>
-      <el-descriptions-item label="执法部门">{{detailData.department}}</el-descriptions-item>
-      <el-descriptions-item label="执法人员">
-        {{detailData.inspectName}}
-        <el-tag type="primary" @click="changeUserFun">变更</el-tag>
-      </el-descriptions-item>
-    </el-descriptions>
+  <ContentWrap title="任务状况">
+    <section class="grid grid-cols-3 grid-rows-2 gap-20px">
+      <section class="item">
+        <section class="label">任务名称</section>
+        <section>
+          {{ detailData.taskName }}
+        </section>
+        <el-button
+          type="primary"
+          link
+          text
+          @click="
+            push({
+              path: `/task/create`,
+              query: { id: detailData.taskId }
+            })
+          "
+          >详情
+        </el-button>
+      </section>
+      <section class="item">
+        <section class="label">任务类型</section>
+        <section>{{ detailData.taskType }} </section>
+      </section>
+      <section class="item">
+        <section class="label">发布部门</section>
+        <section>{{ detailData.department }}</section>
+      </section>
+      <section class="item">
+        <section class="label">企业名称</section>
+        <section>{{ detailData.enterpriseName }} </section>
+        <el-button
+          type="primary"
+          link
+          text
+          @click="
+            push({
+              path: `/enterprises/update`,
+              query: { id: detailData.enterpriseId }
+            })
+          "
+          >详情
+        </el-button>
+      </section>
+      <section class="item">
+        <section class="label">所属部门</section>
+        <section> {{ detailData.taskName }}</section>
+      </section>
+      <section class="item">
+        <section class="label">执法人员</section>
+        <section>
+          {{ detailData.inspectName }}
+        </section>
+        <el-button
+          type="primary"
+          link
+          text
+          @click="changeUserFun"
+          v-if="![1, 3].includes(detailData.inspectionStatus)"
+        >
+          变更
+        </el-button>
+      </section>
+    </section>
   </ContentWrap>
-  <ContentWrap title="">
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <!-- <el-table-column label="检查记录ID，主键" align="center" prop="id" /> -->
-      
-      <el-table-column label="执法人员" align="center" prop="inspectName" />
-      <el-table-column label="协同执法" align="center" prop="cooperateWithName" />
-      <el-table-column
-        label="执法时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="进度状态" align="center" prop="inspectionStatus">
+  <ContentWrap title="执法流程">
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true">
+      <el-table-column label="执法人员" prop="inspectName" />
+      <el-table-column label="协同执法" prop="cooperateWithName" />
+
+      <el-table-column label="进度状态" prop="inspectionStatus">
         <template #default="scope">
-        <dict-tag :type="DICT_TYPE.INSPECTIONS_STATUS" :value="scope.row.status"   />
-      </template>
+          <dict-tag :type="DICT_TYPE.INSPECTIONS_STATUS" :value="scope.row.status" />
+        </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="120px">
+      <el-table-column label="执法时间" prop="createTime" :formatter="dateFormatter" />
+      <el-table-column label="结果反馈" align="center" width="100px">
         <template #default="scope">
-          <el-button
-            link
-            v-if="scope.row.status > 1"
-            type="primary"
-            @click="openForm(scope.row)"
-          >
-            查看
+          <el-button link v-if="scope.row.status > 1" type="primary" @click="viewDetail(scope.row)">
+            详情
           </el-button>
-          
-          <span  v-if="scope.row.status == 1">-</span>
-
+          <span v-if="scope.row.status === 1">-</span>
         </template>
-
       </el-table-column>
     </el-table>
     <!-- 分页 -->
@@ -55,58 +92,63 @@
       @pagination="getList"
     />
   </ContentWrap>
-  <changeUser ref="formRef" @success="getList" />
-  <EnterpriseInspectionsForm ref="formRef" @success="getList" />
   <changeUser ref="changeUserRef" @success="getDetail" />
+  <EnterpriseInspectionsForm ref="detailRef" />
 </template>
 
 <script setup>
-
 import { EnterpriseInspectionsApi } from '@/api/enterpriseinspections'
-import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE } from '@/utils/dict'
 import EnterpriseInspectionsForm from './EnterpriseInspectionsForm.vue'
 import changeUser from './ChangeUser.vue'
 
 import { dateFormatter } from '@/utils/formatTime'
-
-
-defineOptions({ name: 'EnterpriseInspections' })
 import { ref } from 'vue'
-const message = ref('Hello, Vue 3!')
 
+defineOptions({ name: 'EnterpriseInspections' })
 const loading = ref(true) // 列表的加载中
 const list = ref() // 列表的数据
 const total = ref(0) // 列表的总页数
-const queryParams = ref({
- inspectionsId: undefined
-})
 const queryFormRef = ref()
-
+const detailRef = ref()
 const route = useRoute()
-
-/** 添加/修改操作 */
 const formRef = ref()
-const openForm = (data) => {
-  formRef.value.open(data)
-}
-
+const { push } = useRouter()
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  inspectionsId: route.query.id
+})
+const detailData = ref({
+  enterpriseName: undefined,
+  taskName: undefined,
+  tagList: undefined,
+  department: undefined,
+  inspectName: undefined,
+  cooperateWithName: undefined,
+  id: undefined
+})
 const changeUserRef = ref()
+
+// 变更人员
 const changeUserFun = () => {
-    changeUserRef.value.open(detailData.value.id )
+  changeUserRef.value.open({ id: detailData.value.id, deptId: detailData.value.deptId })
 }
 
-// const detailData = ref()
-
 const getDetail = async () => {
-  const data = await EnterpriseInspectionsApi.getEnterpriseInspections(queryParams.value.inspectionsId)
-  detailData.value = data
+  detailData.value = await EnterpriseInspectionsApi.getEnterpriseInspections(
+    queryParams.inspectionsId
+  )
+}
+
+const viewDetail = async (row) => {
+  unref(detailRef).open(row)
 }
 
-/** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
-    const data = await EnterpriseInspectionsApi.inspectionsLogList(queryParams.value)
+    const data = await EnterpriseInspectionsApi.inspectionsLogList(queryParams)
     list.value = data
     total.value = data.total
   } finally {
@@ -114,34 +156,25 @@ const getList = async () => {
   }
 }
 
-const detailData = ref({
-    enterpriseName: undefined,
-    taskName: undefined,
-    tagList: undefined,
-    department: undefined,
-    inspectName: undefined,
-    cooperateWithName: undefined,
-    id: undefined
-})
-
-const tagList = ref()
-
-/** 初始化 **/
 onMounted(() => {
-
-    const data = JSON.parse(route.query.data)
-
-    tagList.value =  data.tagList
-    
-    queryParams.value.inspectionsId = data.id
-
-  getDetail()
-
-  getList()
-
-
+  getDetail(route.query.id)
+  getList(route.query.id)
 })
-
 </script>
 
-<style scoped></style>
+<style scoped lang="scss">
+.item {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+  color: #303133;
+  font-size: 16px;
+  .label {
+    color: #606266;
+  }
+  .el-button {
+    font-size: 16px;
+    line-height: normal;
+  }
+}
+</style>
diff --git a/src/views/enterpriseinspections/index.vue b/src/views/enterpriseinspections/index.vue
index 633a330..ade9c3c 100644
--- a/src/views/enterpriseinspections/index.vue
+++ b/src/views/enterpriseinspections/index.vue
@@ -1,108 +1,110 @@
 <template>
-    <ContentWrap style="padding: 10px">
-      <section class="flex flex-col gap-20px">
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="" prop="taskId">
-        <el-input
-          v-model="queryParams.taskName"
-          placeholder="请输入任务标题"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="enterpriseId">
-        <el-input
-          v-model="queryParams.enterpriseName"
-          placeholder="请输入企业名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item> -->
-      <el-form-item>
-        <el-button @click="handleQuery" type="primary" plain><Icon icon="ep:search" class="mr-5px" /> 查询</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <!-- <el-button @click="openChangeForm"><Icon icon="ep:refresh" class="mr-5px" /> 任务转发</el-button> -->
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['system:enterprise-inspections:create']"
-        >
-          <Icon icon="ep:circle-plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['system:enterprise-inspections:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table 
-      v-loading="loading"
-       :data="list" 
-       :stripe="true"
-      :show-overflow-tooltip="true"
-      >
-
-      <!-- <el-table-column label="检查记录ID，主键" align="center" prop="id" /> -->
-      <el-table-column label="企业名称" align="center" prop="enterpriseName" />
-      <el-table-column label="进度状态" align="center" prop="inspectionStatus">
-        <template #default="scope">
-        <dict-tag :type="DICT_TYPE.INSPECTIONS_STATUS" :value="scope.row.inspectionStatus" />
-      </template>
-      </el-table-column>
-      <el-table-column label="任务名称" align="center" prop="taskName" />
-      <el-table-column label="任务类型" align="center" prop="tagList" />
-      <el-table-column label="执法部门" align="center" prop="department" />
-      <el-table-column label="执法人员" align="center" prop="inspectName" />
-      <el-table-column label="协同执法" align="center" prop="cooperateWithName" />
-      <el-table-column
-        label="执法时间"
-        align="center"
-        prop="execTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="push({ path: '/task/inspectionsDetail', query: {data: JSON.stringify(scope.row)} })"
-          >
-            查看
+  <ContentWrap style="padding: 10px">
+    <section class="flex flex-col gap-20px">
+      <!-- 搜索工作栏 -->
+      <el-form :model="queryParams" ref="queryFormRef" :inline="true" class="formClass">
+        <el-form-item label="" prop="enterpriseName">
+          <el-input
+            v-model="queryParams.enterpriseName"
+            placeholder="请输入企业名称"
+            clearable
+            @keyup.enter="handleQuery"
+            :prefix-icon="Search"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="departmentId">
+          <el-select v-model="queryParams.departmentId" placeholder="请选择部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="inspectionsStatus">
+          <el-select v-model="queryParams.inspectionsStatus" placeholder="请选择进度状态">
+            <el-option
+              v-for="dict in getDictOptions(DICT_TYPE.INSPECTIONS_STATUS)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="userId">
+          <el-select v-model="queryParams.userId" placeholder="请选择执法人员" filterable clearable>
+            <el-option
+              v-for="item in userList"
+              :key="item.id"
+              :label="item.realName"
+              :value="item.id"
+              popper-class="user-wrapper"
+            >
+              <el-avatar :src="item.avatar" :size="30" /> <span>{{ item.realName }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="enterpriseId">
+          <el-date-picker
+            v-model="queryParams.establishmentDate"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="daterange"
+            format="YYYY年M月D日"
+            start-placeholder="起始日期"
+            end-placeholder="截止日期"
+            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary" plain>
+            <Icon icon="ep:search" class="mr-5px" /> 查询
           </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-     <!-- 分页 -->
-     <el-pagination
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleExport" :loading="exportLoading">
+            <Icon icon="ep:download" class="mr-5px" /> 导出
+          </el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true">
+        <el-table-column label="企业名称" prop="enterpriseName" />
+        <el-table-column label="所属部门" prop="department" width="200" />
+        <el-table-column label="进度状态" prop="inspectionStatus" width="200">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.INSPECTIONS_STATUS" :value="scope.row.inspectionStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="执法人员">
+          <template #default="{ row }">
+            {{ row.inspectName }}
+            <span v-if="row.cooperateWithName"> 、{{ row.cooperateWithName }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="执法时间" prop="execTime" :formatter="dateFormatter" width="240" />
+        <el-table-column label="任务名称" prop="taskName" />
+        <el-table-column label="操作选项" align="center" width="100px">
+          <template #default="scope">
+            <el-button
+              link
+              type="primary"
+              @click="
+                push({
+                  path: '/task/inspectionsDetail',
+                  query: { id: scope.row.id }
+                })
+              "
+            >
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页 -->
+      <el-pagination
         :total="total"
         :show-page-size="false"
         layout="total, prev, pager, next"
@@ -111,15 +113,11 @@
         @change="getList"
         class="ml-auto"
       />
-
-  </section>
+    </section>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
   <EnterpriseInspectionsForm ref="formRef" @success="getList" />
-
-  <ChangeInspections ref="changeRef" @success="getList" />
-
 </template>
 
 <script setup lang="ts">
@@ -127,8 +125,9 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { EnterpriseInspectionsApi, EnterpriseInspectionsVO } from '@/api/enterpriseinspections'
 import EnterpriseInspectionsForm from './EnterpriseInspectionsForm.vue'
-import ChangeInspections from './changeInspections.vue'
-import { DICT_TYPE } from '@/utils/dict'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import { Search } from '@element-plus/icons-vue'
+import { getSimpleUserZGList, getDeptByEnterprise } from '@/api/system/user'
 
 const { push } = useRouter()
 
@@ -136,7 +135,6 @@ const { push } = useRouter()
 defineOptions({ name: 'EnterpriseInspections' })
 
 const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
 const list = ref<EnterpriseInspectionsVO[]>([]) // 列表的数据
@@ -144,19 +142,16 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  taskName: undefined,
   enterpriseName: undefined,
+  inspectionsStatus: undefined,
+  departmentId: undefined,
+  userId: undefined
 })
+const userList = ref()
+const deptList = ref()
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-
-const selectedRows = ref([]);
-const handleSelectionChange = (selection) => {
-  selectedRows.value = selection;
-  console.log('Selected Rows:', selectedRows.value);
-};
-
-
+const formRef = ref()
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -182,29 +177,10 @@ const resetQuery = () => {
   handleQuery()
 }
 
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-//任务转发
-const changeRef = ref()
-const openChangeForm = () => {
-  changeRef.value.open(selectedRows.value)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await EnterpriseInspectionsApi.deleteEnterpriseInspections(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
+/** 查询搜索项列表 */
+const getSearchOption = async () => {
+  userList.value = await getSimpleUserZGList({})
+  deptList.value = await getDeptByEnterprise()
 }
 
 /** 导出按钮操作 */
@@ -222,8 +198,22 @@ const handleExport = async () => {
   }
 }
 
+getSearchOption()
+
 /** 初始化 **/
 onMounted(() => {
   getList()
 })
 </script>
+
+<style lang="css" scoped>
+.formClass {
+  .el-form-item {
+    width: calc(100% / 4 - 15px);
+    &:last-child {
+      width: fit-content;
+      margin-left: auto;
+    }
+  }
+}
+</style>
diff --git a/src/views/enterprises/components/SelectUser.vue b/src/views/enterprises/components/SelectUser.vue
deleted file mode 100644
index 7e0200d..0000000
--- a/src/views/enterprises/components/SelectUser.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-  <Teleport to="body">
-    <section class="view-container" v-show="show">
-      <section class="user-conatiner">
-        <section class="close">
-          <el-button type="primary" circle size="small" @click="close">
-            <Icon icon="ep:close" /> </el-button
-        ></section>
-        <User ref="userComponent" isInset v-bind="$attrs" />
-      </section>
-    </section>
-  </Teleport>
-</template>
-
-<script setup>
-import User from '@/views/system/user/index.vue'
-const show = ref(false)
-const emit = defineEmits(['select'])
-const open = () => {
-  show.value = true
-}
-
-function close() {
-  show.value = false
-  emit('close')
-}
-
-const dblclickRow = (row) => {
-  emit('dbClickRow', row)
-}
-
-provide('closeParent', close);
-
-
-defineExpose({
-  open
-})
-</script>
-
-<style lang="scss" scoped>
-.view-container {
-  background-color: #0000006f;
-  position: absolute;
-  inset: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  z-index: 9999;
-  .user-conatiner {
-    width: 80vw;
-    border-radius: 8px;
-    // overflow: hidden;
-    padding: 12px;
-    background-color: #fff;
-    position: relative;
-    .close {
-      position: absolute;
-      right: 0;
-      top: 0;
-      transform: translateX(50%) translateY(-50%);
-    }
-  }
-}
-</style>
diff --git a/src/views/enterprises/components/getGpsByQq.vue b/src/views/enterprises/components/getGpsByQq.vue
new file mode 100644
index 0000000..d0c8b33
--- /dev/null
+++ b/src/views/enterprises/components/getGpsByQq.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+const show = ref(false)
+const TMap = (window as any).qq.maps
+let map: any = null
+//当前位置经纬度
+const coordinate = reactive({
+  latitude: undefined,
+  longitude: undefined,
+  address: ''
+} as any)
+
+const open = () => {
+  show.value = true
+  navigator.geolocation.getCurrentPosition((position) => {
+    coordinate.latitude = position.coords.latitude
+    coordinate.longitude = position.coords.longitude
+  })
+  nextTick(() => {
+    init()
+  })
+}
+
+const init = () => {
+  const center = new TMap.LatLng(coordinate.latitude, coordinate.longitude)
+  map = new TMap.Map(document.getElementById('tencent-container'), {
+    center: center, // 设置地图中心点坐标
+    zoom: 11, // 设置地图缩放级别
+    viewMode: '2D'
+  })
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<template>
+  <Dialog v-model="show" title="选择地址">
+    <section id="tencent-container"></section>
+  </Dialog>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue
index bf23bd6..20e6150 100644
--- a/src/views/enterprises/index.vue
+++ b/src/views/enterprises/index.vue
@@ -16,6 +16,7 @@
             placeholder="请输入企业名称"
             clearable
             @keyup.enter="handleQuery"
+            :prefix-icon="Search"
           />
         </el-form-item>
         <el-form-item label="" prop="region">
@@ -46,12 +47,17 @@
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="registrationNumber">
-          <el-input
-            v-model="queryParams.registrationNumber"
-            placeholder="请选择执法人员"
-            clearable
-            @keyup.enter="handleQuery"
-          />
+	        <el-select v-model="queryParams.registrationNumber" placeholder="请选择执法人员" filterable clearable>
+		        <el-option
+				        v-for="item in userList"
+				        :key="item.id"
+				        :label="item.realName"
+				        :value="item.id"
+				        popper-class="user-wrapper"
+		        >
+			        <el-avatar :src="item.avatar" :size="30" /> <span>{{ item.realName }}</span>
+		        </el-option>
+	        </el-select>
         </el-form-item>
         <el-form-item label="" prop="establishmentDate">
           <el-date-picker
@@ -59,8 +65,8 @@
             value-format="YYYY-MM-DD HH:mm:ss"
             type="daterange"
             format="YYYY年M月D日"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            start-placeholder="起始日期"
+            end-placeholder="截止日期"
             :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           />
         </el-form-item>
@@ -97,7 +103,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true">
         <el-table-column label="企业名称" fixed="left" prop="enterprisesName" />
         <el-table-column label="所属区域" width="200">
           <template #default="scope">
@@ -111,7 +117,7 @@
         </el-table-column>
         <el-table-column label="执法人员" width="200">
           <template #default="scope">
-	          {{`${scope.row.inviterName} | ${scope.row.inviterNameDept}`}}
+            {{ `${scope.row.inviterName} | ${scope.row.inviterNameDept}` }}
           </template>
         </el-table-column>
         <el-table-column
@@ -120,14 +126,29 @@
           :formatter="dateFormatter"
           width="240"
         />
-        <el-table-column label="操作选项" align="center" width="100px">
+        <el-table-column label="操作选项" align="center" width="120px">
           <template #default="scope">
+	          <el-button
+			          link
+			          type="primary"
+			          @click="
+                push({
+                  path: 'update',
+                  query: {
+                    id: scope.row.id
+                  }
+                })
+              "
+			          v-hasPermi="['system:enterprise:update']"
+	          >
+		          编辑
+	          </el-button>
             <el-button
               link
               type="primary"
               @click="
                 push({
-                  path: 'update',
+                  path: 'detail',
                   query: {
                     id: scope.row.id
                   }
@@ -161,9 +182,9 @@ import { getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
-import { getEnterpriseManager } from '@/api/system/user'
-
+import { getSimpleUserZGList } from '@/api/system/user'
 import { TagLibraryApi } from '@/api/system/taglibrary'
+import { Search } from '@element-plus/icons-vue'
 /** 企业 列表 */
 defineOptions({ name: 'Enterprises' })
 
@@ -191,8 +212,9 @@ const queryParams = reactive({
   createTime: [],
   managerDeptId: undefined
 })
+const userList = ref()
 //行业类别
-const typeList = ref([])
+const typeList = ref([] as any)
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const { push } = useRouter() // 路由
@@ -236,22 +258,25 @@ const handleExport = async () => {
   }
 }
 
-const getTypList = async () => {
-  const res = await TagLibraryApi.tagLibraryList('hy')
-  typeList.value = res[0].children.map((t) => {
-    return {
-      label: t.tagName,
-      value: t.id
-    }
-  })
-}
 
-getTypList()
 
-const getUserList = async () => {
-  // awitgetEnterpriseManager
+/** 查询搜索项列表 */
+const getSearchOption = async () => {
+	userList.value = await getSimpleUserZGList({})
+	const res = await TagLibraryApi.tagLibraryList('hy')
+	typeList.value = res[0].children.map((t) => {
+		return {
+			label: t.tagName,
+			value: t.id
+		}
+	})
 }
 
+
+getSearchOption()
+
+
+
 /** 初始化 **/
 onMounted(() => {
   getList()
diff --git a/src/views/enterprises/update.vue b/src/views/enterprises/update.vue
index cf7ffa6..b5092bf 100644
--- a/src/views/enterprises/update.vue
+++ b/src/views/enterprises/update.vue
@@ -1,272 +1,131 @@
 <template>
-  <ContentWrap
-    >{{ formData.id ? '修改企业信息' : '发布企业信息' }}
-    <section class="taskForm">
-      <el-form
-        ref="formRef"
-        :model="formData"
-        :rules="formRules"
-        label-width="auto"
-        v-loading="loading"
-      >
-        <el-form-item label="企业名称" prop="enterprisesName">
-          <el-input v-model="formData.enterprisesName" placeholder="请输入企业名称" />
-        </el-form-item>
-        <el-form-item label="企业类型标签" prop="type">
-          <el-select v-model="formData.type" placeholder="请选择企业类型">
-            <el-option
-              v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_TYPE)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="企业所属区域" prop="region">
-          <el-select v-model="formData.region" placeholder="请选择企业所属区域">
-            <el-option
-              v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="专管员" prop="startUserSelectAssignees">
-          <section class="selec-wrapper">
-            <!-- 动态显示选中的专管员 -->
-            <section class="select" @click="handlerClickSelect">
-              {{ selectedUser ? selectedUser : '请选择专管员' }}
+  <content-wrap>
+    <section class="view-wrapper">
+      <section class="w-70%">
+        <section class="mb-40px">
+          <section class="title-wrapper"> 基本信息</section>
+          <el-form :rules="formRules" :model="formData" label-width="100px">
+            <section class="base-form">
+              <el-form-item label="企业名称" prop="enterprisesName">
+                <el-input v-model="formData.enterprisesName" placeholder="请输入企业名称" />
+              </el-form-item>
+              <el-form-item label="所属区域" prop="region">
+                <el-select v-model="formData.region" placeholder="请选择所属区域" clearable>
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="企业地址" prop="address">
+                <el-input v-model="formData.address" placeholder="请选择企业地址" readonly @click="getGaps">
+                  <template #append>
+                    <Icon icon="ep:position" @click.stop="getGaps"/>
+                  </template>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="行业类别" prop="tags">
+                <el-select
+                  v-model="formData.tags"
+                  placeholder="请选择行业类型"
+                  clearable
+                  multiple
+                  collapse-tags
+                  collapse-tags-tooltip
+                >
+                  <el-option
+                    v-for="dict in typeList"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="企业介绍" class="form-textarea" prop="introduction">
+                <el-input
+                  v-model="formData.introduction"
+                  placeholder="请输入企业介绍"
+                  type="textarea"
+                  maxlength="500"
+                  show-word-limit
+                  resize="none"
+                />
+              </el-form-item>
+              <el-form-item label="环保负责人" prop="contactName">
+                <el-input v-model="formData.contactName" placeholder="请输入负责人名称" />
+              </el-form-item>
+              <el-form-item label="联系方式" prop="environmentalContactPhone">
+                <el-input
+                  v-model="formData.environmentalContactPhone"
+                  placeholder="请输入负责人联系方式"
+                />
+              </el-form-item>
+              <el-form-item label="企业照片" prop="photo" class="form-photo">
+                <UploadImgs v-model="formData.photo" />
+              </el-form-item>
+              <section class="form-sub-title"> 执法配置</section>
+              <el-form-item label="执法人员" prop="userId">
+                <el-select
+                  v-model="formData.userId"
+                  placeholder="请选择执法人员"
+                  filterable
+                  clearable
+                >
+                  <el-option
+                    v-for="item in userList"
+                    :key="item.userId"
+                    :label="item.realName"
+                    :value="item.userId"
+                    popper-class="user-wrapper"
+                  >
+                    <el-avatar :src="item.avatar" :size="30" /> <span>{{ item.realName }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="签到半径" prop="signRadius">
+                <el-input-number
+                  v-model="formData.signRadius"
+                  :min="10"
+                  :step="1"
+                  placeholder="请输入执法半径"
+                  controls-position="right"
+                  class="!w-100%"
+                >
+                  <template #suffix>
+                    <span>米</span>
+                  </template>
+                </el-input-number>
+              </el-form-item>
             </section>
-          </section>
-        </el-form-item>
-        <!-- <el-form-item label="企业关联微信用户" prop="address">
-          <el-select
-            v-model="formData.enterpriseUserId"
-            filterable
-            placeholder="Select"
-            style="width: 240px"
-          >
-            <el-option
-              v-for="item in enterpriseUserList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item> -->
-        <el-form-item label="企业地址" prop="address">
-          <el-input v-model="formData.address" type="textarea" placeholder="请输入企业地址" />
-        </el-form-item>
-        <el-form-item label="企业环保负责人姓名" prop="contactName">
-          <el-input v-model="formData.contactName" placeholder="请输入环保负责人姓名" />
-        </el-form-item>
-        <el-form-item label="企业环保负责人联系电话" prop="environmentalContactPhone">
-          <el-input
-            v-model="formData.environmentalContactPhone"
-            placeholder="请输入企业环保负责人联系电话"
-          />
-        </el-form-item>
-        <el-form-item label="企业注册号" prop="registrationNumber">
-          <el-input v-model="formData.registrationNumber" placeholder="请输入企业注册号" />
-        </el-form-item>
-        <el-form-item label="企业介绍" prop="introduction">
-          <el-input v-model="formData.introduction" type="textarea" placeholder="请输入企业介绍" />
-        </el-form-item>
-        <el-form-item label="企业照片" prop="fileIds">
-          <UploadImgs v-model="fileList" :limit="3" height="100px" width="100px" />
-        </el-form-item> 
-
-
-
-
-        <el-form-item label="企业成立时间" prop="establishmentDate">
-          <el-date-picker
-            v-model="formData.establishmentDate"
-            type="date"
-            value-format="x"
-            placeholder="选择企业成立时间"
-          />
-        </el-form-item>
-
-        <el-form-item label="企业经纬度" prop="gpsLocation">
-          <el-input
-            v-model="formData.gpsLocation"
-            placeholder="点击按钮选择坐标"
-            readonly
-            style="width: 500px"
-          >
-            <template #append>
-              <!-- 选择坐标按钮 -->
-              <el-button @click="showMap = true">选择坐标</el-button>
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <!-- 地图弹窗 -->
-        <el-dialog v-model="showMap" title="选择坐标" width="80%" :before-el-close="handleClose">
-          <div>
-            <el-input
-              type="text"
-              v-model="formData.searchQuery"
-              placeholder="可通过名称联想搜索"
-              style="width: 20%"
-            />
-            <el-button @click="handleSearch">搜索</el-button>
-          </div>
-          <div ref="mapContainerRef" style="width: 100%; height: 600px"></div>
-          <template #footer>
-            <el-button @click="showMap = false">关闭</el-button>
-            <el-button type="primary" @click="showMap = false">确定</el-button>
-          </template>
-        </el-dialog>
-        <el-form-item label="签到半径" prop="gpsLocation">
-          <el-input
-            v-model="formData.signRadius"
-            placeholder="请输入签到半径"
-            style="width: 280px"
-          /><span style="margin-left: 10px">单位：米</span>
-        </el-form-item>
-        <el-form-item style="align-items: center">
-          <el-button type="success" @click="submitForm">确认</el-button>
-        </el-form-item>
-      </el-form>
+          </el-form>
+        </section>
+      </section>
+      <section class="flex-1">
+        <section class="title-wrapper"> 相关资质 </section>
+      </section>
     </section>
-    <SelectUser ref="selectUserRef" @select-user="echoUser" />
-  </ContentWrap>
-
-  <el-card title="资质记录" v-if="formType === 'update'">
-    <template #header>
-      <div class="flex items-center justify-between">
-        <span class="text-16px font-700">资质记录</span>
-        <el-button type="primary" @click="openQualForm('create')">新增</el-button>
-      </div>
-    </template>
-    <el-table v-loading="loading" :data="qualificationlist" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="资质图片" align="center" fixed="left" prop="files" >
-        <template #default="scope">
-          
-          <UploadImgs :disabled="true"  v-model="scope.row.files" :limit="3" height="100px" width="100px" />
-        </template>
-        </el-table-column>
-
-      <el-table-column label="资质编号" align="center" fixed="left" prop="enterpriseAuth" />
-      <el-table-column label="资质名称" align="center" fixed="left" prop="qualificationName" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ENTERPRISES_QUA" :value="scope.row.qualificationName" />
-        </template>
-      </el-table-column>
-  
-      <el-table-column
-        label="资质到期日期"
-        align="center"
-        prop="expiryDate"
-        :formatter="dateFormatter2"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openQualForm('update', scope.row.id)"
-
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handQualDelete(scope.row.id)"
-
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-card>
-<!-- 表单弹窗：添加/修改 -->
-<EnterpriseQualificationForm ref="formQualRef" @success="getQualificationList" style="margin-top: 20px;"/>
-  <ContentWrap title="执法记录" v-if="formType === 'update'">
-    <div class="demo-collapse">
-      <el-collapse v-model="activeNames" @change="handleChange">
-        <el-collapse-item
-          v-for="item in inspectionslist"
-          :key="item.taskId"
-          :name="item.taskName" @click="getInspectionsLogList(item.id)">
-          <template #title>
-            <div class="custom-title">
-             任务编号： {{item.taskName}}
-            </div>
-            <div class="custom-title">
-              任务名称： {{item.taskName}}
-            </div>
-            <div class="custom-title">
-              计划开始时间： {{formatDate(item.taskStartTime)}}
-            </div>
-            <div class="custom-title">
-              计划结束时间： {{formatDate(item.taskEndTime)}}
-            </div>
-          </template>
-          <el-table v-loading="loading" :data="inspectionsLogList" :stripe="true" :show-overflow-tooltip="true">
-            <el-table-column label="执法人员" align="center"  prop="inspectName" />
-            <el-table-column label="协同执法" align="center"  prop="cooperateWithName" />
-            <el-table-column label="进度状态" align="center" prop="status">
-              <template #default="scope">
-                <dict-tag :type="DICT_TYPE.INSPECTIONS_STATUS" :value="scope.row.status"   />
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="执法时间"
-              align="center"
-              prop="createTime"
-              :formatter="dateFormatter"
-              width="180px"
-            />
-          </el-table>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-  </ContentWrap>
+    <section>
+      <el-button>保存</el-button>
+    </section>
+  </content-wrap>
 
+  <GpsDialog ref="GpsDialogRef" @success="setGps" />
 </template>
 <script setup lang="ts">
 import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
-import { EnterprisesApi } from '@/api/enterprises'
-import { EnterpriseQualificationApi, EnterpriseQualificationVO } from '@/api/qualification'
-import { UserVO, getSimpleUserListByUserType } from '@/api/system/user'
-import EnterpriseQualificationForm from '@/views/qualification/EnterpriseQualificationForm.vue'
-
-import { EnterpriseInspectionsApi, EnterpriseInspectionsVO } from '@/api/enterpriseinspections'
-
+import { TagLibraryApi } from '@/api/system/taglibrary'
+import { getEnterpriseManager } from '@/api/system/user'
 import { UploadImgs } from '@/components/UploadFile'
-import * as FileApi from '@/api/infra/file'
-import { ElMessage } from 'element-plus'
-import SelectUser from './components/SelectUser.vue'
-import * as UserApi from '@/api/system/user'
-import {useTagsViewStore} from "@/store/modules/tagsView";
-import {dateFormatter,dateFormatter2, formatDate} from "@/utils/formatTime";
+import GpsDialog from './components/getGpsByQq.vue'
 
 /** 企业 表单 */
 defineOptions({ name: 'UpdateEnterprises' })
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const selectUserRef = ref()
-const loading = ref(false)
-const selectedUser = ref()
-const router=useRouter()
-const route=useRoute()
-const tagView=useTagsViewStore()
-const fileIds = ref([]);
-const qualificationlist = ref([]);
-const inspectionslist = ref([]);
-const inspectionsLogList = ref([]);
-const enterpriseUserList = ref([])
-
+//行业类别
+const typeList = ref([] as any)
+const userList = ref([] as any)
+const GpsDialogRef=ref()
 const formData = ref({
   id: undefined,
   departmentId: undefined,
@@ -276,7 +135,7 @@ const formData = ref({
   enterprisesName: undefined,
   address: undefined,
   contactName: undefined,
-  enterprisesStatus:undefined,
+  enterprisesStatus: undefined,
   environmentalContactPhone: undefined,
   registrationNumber: undefined,
   introduction: undefined,
@@ -285,378 +144,141 @@ const formData = ref({
   searchQuery: undefined,
   managerDeptId: undefined,
   ides: undefined,
-  startUserSelectAssignees:undefined,
-  enterpriseUserId: undefined
-
+  startUserSelectAssignees: undefined,
+  enterpriseUserId: undefined,
+  tags: undefined,
+  photo: undefined,
+  signRadius: 30
 })
-
-const fileList=ref([])
-
-const getEnterpriseUserList = async () => {
-  const type:number = 2
-  const data = await getSimpleUserListByUserType(type)
-  console.log("datadata===>", data)
-
-}
-
-
 const formRules = reactive({
   type: [{ required: true, message: '企业类型不能为空', trigger: 'change' }],
   enterprisesName: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
   contactName: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  environmentalContactPhone: [{ required: true, message: '企业环保负责人联系电话不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-const { query } = useRoute()
-
-function init() {
-  if (query.id) {
-    // 修改：如果有 id 则设置为 'update'
-     formType.value = 'update'
-      EnterprisesApi.getEnterprises(query.id).then((res) => {
-      selectedUser.value=res.inviterName;
-     // formData.value.startUserSelectAssignees=res.userId;
-     fileList.value=res.files;
-      formData.value = res
-    })
-  }else{formType.value = 'create'}
-}
-// 控制地图弹窗显示隐藏
-const showMap = ref(false)
-// 地图实例
-let map
-// 标记实例
-let marker
-let searchService=null
-// const searchService = ref()
-const mapContainerRef = ref<HTMLDivElement | null>(null)
-// 初始化地图
-const initMap = () => {
-  if (!window.qq || !window.qq.maps) {
-    ElMessage.error('腾讯地图 API 未加载完成')
-    return
-  }
-
-  if (!mapContainerRef.value) {
-    ElMessage.error('地图容器元素未找到')
-    return
-  }
-
-  map = new window.qq.maps.Map(mapContainerRef.value, {
-    center: new window.qq.maps.LatLng(41.520282, 121.265721), // 初始中心点
-    zoom: 14
-  })
-
-  // 添加地图点击事件监听器
-  window.qq.maps.event.addListener(map, 'click', (event: any) => {
-    const latLng = event.latLng
-    const lat = latLng.getLat()
-    const lng = latLng.getLng()
-
-    // 更新表单中的经纬度信息
-    formData.value.gpsLocation = `${lat},${lng}`
-
-    // 在地图上显示标记
-    if (marker) {
-      marker.setMap(null) // 清除之前的标记
+  environmentalContactPhone: [
+    { required: true, message: '企业环保负责人联系电话不能为空', trigger: 'blur' }
+  ],
+  userId: [
+    {
+      required: true,
+      message: '请选择执法人员',
+      trigger: 'change'
     }
-    marker = new window.qq.maps.Marker({
-      position: latLng,
-      map: map
-    })
-  })
-
-   // 确保 searchService 已经正确初始化
-   searchService = new window.qq.maps.SearchService({
-    complete: (results) => {
-    //  console.log('搜索结果:', results) // 打印 results 对象
-      if (results.detail && results.detail.pois.length > 0) {
-        const firstResult = results.detail.pois[0]
-        const position = firstResult.latLng
-        // 设置地图中心点为搜索结果的位置
-        map.setCenter(position)
-        // 创建标记
-        if (marker) {
-          marker.setMap(null)
-        }
-        marker = new window.qq.maps.Marker({
-          position: position,
-          map: map
-        })
-        // 更新表单中的经纬度信息
-        formData.value.gpsLocation = `${position.getLat()},${position.getLng()}`
-      }
-    },
-    error: (e) => {
-      console.error('搜索出错:', e)
-      ElMessage.error('搜索出错，请重试')
+  ],
+  signRadius: [
+    {
+      required: true,
+      message: '请输入执法半径',
+      trigger: 'change'
     }
-  })
-}
-
-// 搜索按钮点击事件处理函数
-const handleSearch = () => {
-  if (searchService && formData.value.searchQuery) {
-    searchService.search(formData.value.searchQuery)
-  } else {
-    ElMessage.error('请输入搜索关键词')
-  }
-}
-
-
-/** 添加/修改操作 */
-const formQualRef = ref()
-const openQualForm = (type: string, id?: number) => {
-  formQualRef.value.open(type, id, formData.value.id)
-}
-
-/** 删除按钮操作 */
-const handQualDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await EnterpriseQualificationApi.deleteEnterpriseQualification(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await    getQualificationList()
-  } catch {}
-}
-
-onMounted(() => {
-  init()
-  //判断是添加删除
-  if(query.id){
-    getQualificationList()
-    getInspectionslList()
-
-  }
-
-  getEnterpriseUserList()
-  //getInspectionsLogList()
-  const openMapAndInit = async () => {
-    if (showMap.value) {
-      await nextTick() // 等待 DOM 更新
-      if (qq && qq.maps) {
-        initMap() // 初始化地图
-      } else {
-        console.error('腾讯地图 API 未加载完成')
-      }
+  ],
+  photo: [
+    {
+      required: true,
+      message: '请上传企业照片',
+      trigger: 'change'
     }
-  }
-
-  // 监听 showMap 的变化
-  watch(
-    showMap,
-    () => {
-      openMapAndInit()
-    },
-    { immediate: true }
-  )
+  ],
+  introduction: [
+    {
+      required: true,
+      message: '请输入企业介绍',
+      trigger: 'change'
+    }
+  ],
+  address: [
+    {
+      required: true,
+      message: '请输入企业地址',
+      trigger: 'change'
+    }
+  ],
+  tags: [
+    {
+      required: true,
+      message: '请选择行业类别',
+      trigger: 'change'
+    }
+  ],
+  region: [
+    {
+      required: true,
+      message: '请选择所属区域',
+      trigger: 'change'
+    }
+  ]
 })
-
-function handlerClickSelect() {
-  // 调用 SelectUser 组件的 open 方法
-  unref(selectUserRef)?.open()
-}
-
-function handlerSelectUser(row) {
-  if (formData.value.startUserSelectAssignees.findIndex((i) => i.id == row.id) > -1) return
-  formData.value.startUserSelectAssignees.push(row)
-}
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  //console.log(formData.value)
-  // 校验表单
-  await formRef.value.validate()
-
-  // 提交请求
-  loading.value = true
-  try {
-    let data = formData.value
-    // 设置企业状态为数字类型 1
-    data.enterprisesStatus = 1 as number;
-
-    data.fileIds = (fileList.value || []).map((item: any) => item.id);
-    if (formType.value == 'create') {
-      await EnterprisesApi.pccreateEnterprises(data)
-      message.success(t('common.createSuccess'))
-      tagView.delView(route)
-      router.go(-1)
-    } else {
-      await EnterprisesApi.updateEnterprises(data)
-      
-      message.success(t('common.updateSuccess'))
+/** 查询搜索项列表 */
+const getSelectOption = async () => {
+  userList.value = await getEnterpriseManager()
+  const res = await TagLibraryApi.tagLibraryList('hy')
+  typeList.value = res[0].children.map((t) => {
+    return {
+      label: t.tagName,
+      value: t.id
     }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    loading.value = false
-      // 关闭当前页面
-      tagView.delView(route)
-    router.go(-1)
-  }
-}
-
-const echoUser = async (v) => {
-  // console.log('当前选择',v)
-  const users = await UserApi.getUser(v)
-  selectedUser.value = users.username
-  formData.value.userId=users.id
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    departmentId: undefined,
-    userId: undefined,
-    type: undefined,
-    region: undefined,
-    enterprisesName: undefined,
-    address: undefined,
-    contactName: undefined,
-    environmentalContactPhone: undefined,
-    registrationNumber: undefined,
-    introduction: undefined,
-    establishmentDate: undefined,
-    gpsLocation: undefined,
-    searchadd: undefined,
-    managerDeptId: undefined,
-    startUserSelectAssignees: undefined
-  }
-  formRef.value?.resetFields()
-}
-
-const uploadList: any = ref([])
-
-async function uploadSuccess(res) {
-  console.log(res.data.file_id)
-  fileIds.value.push(res.data.file_id);
-  if (res) {
-    await FileApi.createFile({
-      unitId: formData.value.id || id.value,
-      attachmentPath: res.data,
-      attachmentName: res.filename,
-      attachmentSuffix: res.type
-      //type: 4
-    }).then(() => {
-      loading.value.close()
-      dialogVisible.value = false
-      emit('success')
-    })
-  } else {
-    loading.value.close()
-    dialogVisible.value = false
-    emit('success')
-  }
-}
-
-
-/** 资质查询列表 BY-ZY */
-const getQualificationList = async () => {
-  loading.value = true
-  try {
-    const data = await EnterpriseQualificationApi.getEnterpriseQualificationPageEnterprise({"enterpriseId":query.id})
-    qualificationlist.value = data.list
-  } finally {
-    loading.value = false
-  }
+  })
 }
 
-
-
-/** 执法记录查询列表 by zy*/
-const getInspectionslList = async () => {
-  loading.value = true
-  try {
-    const data = await EnterpriseInspectionsApi.getEnterpriseInspectionsPage({"enterpriseId":query.id})
-    if(!data.list || data.list.length === 0){
-      console.log("No data or data is null");
-    } else {
-      inspectionslist.value = data.list;
-    }
-
-  } finally {
-    loading.value = false
-  }
+const setGps = (gps) => {
+  formData.value.gpsLocation = gps
 }
 
-/** 执法记录查询列表 by zy*/
-const getInspectionsLogList = async (insprctionsId) => {
-  console.log(insprctionsId)
-  loading.value = true
-  try {
-    const data = await EnterpriseInspectionsApi.inspectionsLogList({"inspectionsId":insprctionsId})
-    if(!data.list || data.list.length === 0){
-      console.log("No data or data is null");
-    } else {
-      inspectionsLogList.value = data.list;
-    }
-  } finally {
-    loading.value = false
-  }
+const getGaps=()=>{
+	unref(GpsDialogRef).open()
 }
 
+getSelectOption()
+onMounted(() => {})
 </script>
 
 <style lang="scss" scoped>
-.selec-wrapper {
-  max-width: 400px;
+.view-wrapper {
   display: flex;
   flex-flow: row nowrap;
-  gap: 5px;
-
-  .users {
-    flex: 1;
-    display: flex;
-    flex-flow: row wrap;
-    gap: 5px;
+  gap: 40px;
+  .title-wrapper {
+    font-size: 16px;
+    line-height: 140%;
+    font-weight: 700;
+    margin-bottom: 40px;
   }
-
-  .select {
-    cursor: pointer;
-    background-color: #f1faff;
-    border: 1px dashed #00a3ff;
-    padding: 1px 40px;
-    color: #00a3ff;
-    // color: #00a3ff;
-    // text-decoration: underline;
-    border-radius: 6px;
-    height: fit-content;
-
-    &:hover {
-      opacity: 0.8;
+  .form-photo {
+    grid-column: span 2;
+  }
+  .base-form {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 40px;
+    .form-textarea {
+      grid-row: span 2;
+      ::v-deep(.el-textarea) {
+        height: 100%;
+        .el-textarea__inner {
+          height: 100%;
+          white-space: pre-wrap;
+          &::-webkit-scrollbar {
+            width: 4px;
+          }
+          &::-webkit-scrollbar-thumb {
+            background-color: #ccc;
+            border-radius: 10px;
+          }
+          &::-webkit-scrollbar-track {
+            background-color: transparent;
+          }
+          &::-webkit-scrollbar-button {
+            display: none;
+            height: 2px;
+          }
+        }
+      }
+    }
+    .form-sub-title {
+      font-size: 16px;
+      line-height: 140%;
+      font-weight: 700;
+      grid-column: span 2;
     }
   }
 }
-
-.modal-enter-from {
-  opacity: 0;
-  transition: 0.2s all;
-}
-
-.modal-leave-to {
-  opacity: 0;
-}
-
-.modal-enter-from .modal-container,
-.modal-leave-to .modal-container {
-  -webkit-transform: scale(1.1);
-  transform: scale(1.1);
-}
-
-#map-container {
-  width: 100%;
-  height: 400px;
-  margin-top: 20px;
-}
-
-.custom-title {
-  font-size: 14px;
-  margin: 2% auto;
-}
 </style>
diff --git a/src/views/system/jobinfo/JobInfoForm.vue b/src/views/system/jobinfo/JobInfoForm.vue
index 1d1d482..9f20f18 100644
--- a/src/views/system/jobinfo/JobInfoForm.vue
+++ b/src/views/system/jobinfo/JobInfoForm.vue
@@ -25,7 +25,7 @@
           <el-input v-model="formData.jobName" placeholder="请输入汇报人姓名" />
         </el-form-item>
         <el-form-item label="汇报内容" prop="content" class="!w100%">
-          <Editor v-model="formData.content" height="400px" class="w100%"/>
+          <Editor v-model="formData.content" height="500px" class="w100%"/>
         </el-form-item>
       </section>
     </el-form>
@@ -97,7 +97,7 @@ const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
-  dialogTitle.value = type == 'create' ? '新增工作汇报' : '修改工作汇报'
+  dialogTitle.value = type == 'create' ? '新增工作汇报' : '编辑工作汇报'
   formType.value = type
   resetForm()
   // 修改时，设置数据
diff --git a/src/views/system/jobinfo/index.vue b/src/views/system/jobinfo/index.vue
index 4989eb5..7dcd99e 100644
--- a/src/views/system/jobinfo/index.vue
+++ b/src/views/system/jobinfo/index.vue
@@ -1,111 +1,79 @@
 <template>
   <ContentWrap>
     <section class="flex flex-col gap-20px">
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入汇报标题"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="jobName">
-        <el-input
-          v-model="queryParams.jobName"
-          placeholder="请输入汇报人姓名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['system:job-info:create']"
-        >
-          <Icon icon="ep:circle-plus" class="mr-5px" /> 新增
-        </el-button>
- 
-      </el-form-item>
-    </el-form>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="汇报标题" align="center" prop="title" />
-      <el-table-column label="汇报日期" :formatter="dateFormatter2" align="center" prop="jobDate" />
-      <el-table-column label="汇报人姓名" align="center" prop="jobName" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="PDF文件" align="center" prop="pdfUrl">
-        <template #default="scope">
-          <el-button 
-            v-if="scope.row.pdfUrl"
-            link
-            type="primary" 
-            @click="handleOpenPdf(scope.row.pdfUrl)"
-          >
-            查看PDF
-          </el-button>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="handleDetail(scope.row.id)"
-            v-hasPermi="['system:job-info:update']"
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px"
+      >
+        <el-form-item label="" prop="title">
+          <el-input
+            v-model="queryParams.title"
+            placeholder="请输入汇报标题"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+            :prefix-icon="Search"
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary" plain
+            ><Icon icon="ep:search" class="mr-5px" /> 查询</el-button
           >
-            生成
-          </el-button>
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        </el-form-item>
+
+        <el-form-item class="ml-auto">
           <el-button
-            link
             type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['system:job-info:update']"
+            @click="openForm('create')"
+            v-hasPermi="['system:job-info:create']"
           >
-            编辑
+            <Icon icon="ep:circle-plus" class="mr-5px" /> 新增
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:job-info:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <el-pagination
-      :total="total"
-      :show-page-size="false"
-      layout="total, prev, pager, next"
-      v-model:current-page="queryParams.pageNo"
-      v-model:page-size="queryParams.pageSize"
-      @change="getList"
-      class="ml-auto"
-    />
-  </section>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true">
+        <el-table-column label="汇报标题"  prop="title" />
+        <el-table-column label="汇报日期" :formatter="dateFormatter2" prop="jobDate" />
+        <el-table-column label="汇报人" prop="jobName" />
+        <el-table-column label="创建时间" prop="createTime" :formatter="dateFormatter" />
+        <el-table-column label="操作选项" align="center" width="120px">
+          <template #default="scope">
+            <el-button
+              link
+              type="primary"
+              @click="openForm('update', scope.row.id)"
+              v-hasPermi="['system:job-info:update']"
+            >
+              编辑
+            </el-button>
+            <el-button
+              link
+              type="primary"
+              @click="handleExport(scope.row.id)"
+              v-hasPermi="['system:job-info:delete']"
+            >
+              下载
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <el-pagination
+        :total="total"
+        :show-page-size="false"
+        layout="total, prev, pager, next"
+        v-model:current-page="queryParams.pageNo"
+        v-model:page-size="queryParams.pageSize"
+        @change="getList"
+        class="ml-auto"
+      />
+    </section>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -113,10 +81,11 @@
 </template>
 
 <script setup lang="ts">
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { JobInfoApi, JobInfoVO } from '@/api/system/jobinfo'
 import JobInfoForm from './JobInfoForm.vue'
+import { Search } from '@element-plus/icons-vue'
 
 /** 工作汇报 列表 */
 defineOptions({ name: 'JobInfo' })
@@ -132,7 +101,7 @@ const queryParams = reactive({
   pageSize: 10,
   title: undefined,
   jobName: undefined,
-  createTime: [],
+  createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -167,35 +136,7 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
-/** 生成按钮操作 */
-const handleDetail = async (id: number) => {
-  try {
-
-    // 发起删除
-    await JobInfoApi.jobDetail(id)
-    message.success('生成成功')
-    // 刷新列表
-    await getList()
-  } catch {}
-}
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await JobInfoApi.deleteJobInfo(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 打开pdf */
-const handleOpenPdf = (url: string) => {
-  window.open(url)
-}
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -216,4 +157,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/policy/PolicyForm.vue b/src/views/system/policy/PolicyForm.vue
index 86fed30..9bc2730 100644
--- a/src/views/system/policy/PolicyForm.vue
+++ b/src/views/system/policy/PolicyForm.vue
@@ -7,7 +7,7 @@
       v-loading="formLoading"
       class="policyForm"
     >
-      <section class="flex flex-wrap gap-18px">
+      <section class="flex flex-wrap gap-20px">
         <el-form-item label="标题名称" prop="name" class="w-[calc(100%/2-10px)]">
           <el-input v-model="formData.name" placeholder="请输入名称" />
         </el-form-item>
@@ -15,14 +15,14 @@
           <el-date-picker
             v-model="formData.effectiveDate"
             type="date"
-            placeholder="请选择生效日期"
+            placeholder="选择日期"
             value-format="YYYY-MM-DD"
             :default-value="new Date()"
             class="!w100%"
           />
         </el-form-item>
         <el-form-item label="内容详细" prop="context" class="w100%">
-          <Editor v-model="formData.context" height="350px" class="!w100%" />
+          <Editor v-model="formData.context" height="500px" class="!w100%" />
         </el-form-item>
       </section>
     </el-form>
@@ -118,12 +118,12 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
-const deletePolicy=()=>{
-	PolicyApi.deletePolicy(formData.value.id).then(()=>{
-		message.success(t('common.delSuccess'))
-		dialogVisible.value = false
-		emit('success')
-	})
+const deletePolicy = () => {
+  PolicyApi.deletePolicy(formData.value.id).then(() => {
+    message.success(t('common.delSuccess'))
+    dialogVisible.value = false
+    emit('success')
+  })
 }
 </script>
 
diff --git a/src/views/system/policy/index.vue b/src/views/system/policy/index.vue
index 3fb00da..7f2c0c4 100644
--- a/src/views/system/policy/index.vue
+++ b/src/views/system/policy/index.vue
@@ -10,6 +10,7 @@
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
+            :prefix-icon="Search"
           />
         </el-form-item>
         <el-form-item>
@@ -89,6 +90,7 @@ import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { PolicyApi, PolicyVO } from '@/api/system/policy'
 import PolicyForm from './PolicyForm.vue'
+import {Search} from "@element-plus/icons-vue";
 
 /** 政策法规 列表 */
 defineOptions({ name: 'Policy' })
diff --git a/src/views/system/taglibrary/form.vue b/src/views/system/taglibrary/form.vue
index 4245e24..01ed2df 100644
--- a/src/views/system/taglibrary/form.vue
+++ b/src/views/system/taglibrary/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="480">
     <el-form
       ref="formRef"
       :model="formData"
@@ -68,7 +68,7 @@ const list = ref<any>([])
 /** 打开弹窗 */
 const open = async (params) => {
   dialogVisible.value = true
-  dialogTitle.value = params.id ? `修改标签` : `创建标签`
+  dialogTitle.value = params.id ? `编辑标签` : `新增标签`
   resetForm()
   formLoading.value = true
   await getParent(params.parentId)
diff --git a/src/views/system/taglibrary/index.vue b/src/views/system/taglibrary/index.vue
index c9b5760..b4d5dc7 100644
--- a/src/views/system/taglibrary/index.vue
+++ b/src/views/system/taglibrary/index.vue
@@ -14,7 +14,7 @@
             placeholder="请输入标签的名称"
             clearable
             @keyup.enter.prevent="handleQuery"
-            class="!w-240px"
+            class="!w-370px"
           />
         </el-form-item>
         <el-form-item label="">
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 381a3bb..d519955 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -80,7 +80,7 @@
         v-loading="loading"
         :data="list"
         :show-overflow-tooltip="true"
-      
+
       >
         <el-table-column label="任务名称" align="left" prop="title" width="200" />
         <el-table-column label="任务类型" align="left" prop="taskType">