From 108e3e6a9b16dcb39c9d39ea419ddb062d9a2327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Tue, 25 Mar 2025 15:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E4=B8=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=A1=A8=E5=8D=95=EF=BC=8C=E8=B0=83=E6=95=B4=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=92=8C=E9=80=BB=E8=BE=91=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=89=A7=E6=B3=95=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9=E5=92=8C?=
 =?UTF-8?q?=E5=9D=90=E6=A0=87=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContentWrap/src/ContentWrap.vue           |  12 +-
 src/components/Dialog/src/Dialog.vue          |   2 -
 src/components/UploadFile/src/UploadImgs.vue  |  17 +-
 src/styles/variables.scss                     |   7 +
 .../enterpriseinspections/ChangeUser.vue      |   2 +-
 src/views/enterpriseinspections/detail.vue    |   4 +-
 .../enterprises/components/SelectUser.vue     |  64 --
 .../enterprises/components/getGpsByQq.vue     |  43 +
 src/views/enterprises/index.vue               |  75 +-
 src/views/enterprises/update.vue              | 824 +++++-------------
 src/views/task/index.vue                      |  21 +-
 11 files changed, 344 insertions(+), 727 deletions(-)
 delete mode 100644 src/views/enterprises/components/SelectUser.vue
 create mode 100644 src/views/enterprises/components/getGpsByQq.vue

diff --git a/src/components/ContentWrap/src/ContentWrap.vue b/src/components/ContentWrap/src/ContentWrap.vue
index b9aec2d..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>
@@ -36,8 +36,12 @@ defineProps({
 </template>
 
 <style lang="scss" scoped>
-:deep(.el-card__header) {
-  border-bottom: none;
-	padding-bottom: 0;
+.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/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/styles/variables.scss b/src/styles/variables.scss
index af98654..2cd8d73 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -41,3 +41,10 @@ $elNamespace: el;
   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/enterpriseinspections/ChangeUser.vue b/src/views/enterpriseinspections/ChangeUser.vue
index 6e1cf10..2664fb9 100644
--- a/src/views/enterpriseinspections/ChangeUser.vue
+++ b/src/views/enterpriseinspections/ChangeUser.vue
@@ -2,7 +2,7 @@
   <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="请选择用户">
+        <el-select v-model="formData.userId" placeholder="请选择用户" filterable clearable>
           <el-option
             v-for="item in userList"
             :key="item.id"
diff --git a/src/views/enterpriseinspections/detail.vue b/src/views/enterpriseinspections/detail.vue
index 705df25..bfc08ff 100644
--- a/src/views/enterpriseinspections/detail.vue
+++ b/src/views/enterpriseinspections/detail.vue
@@ -12,8 +12,8 @@
           text
           @click="
             push({
-              path: `/enterprises/update`,
-              query: { id: detailData.enterpriseId }
+              path: `/task/create`,
+              query: { id: detailData.taskId }
             })
           "
           >详情
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 6b7cda1..20e6150 100644
--- a/src/views/enterprises/index.vue
+++ b/src/views/enterprises/index.vue
@@ -47,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
@@ -98,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">
@@ -112,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
@@ -121,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
                   }
@@ -162,10 +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";
+import { Search } from '@element-plus/icons-vue'
 /** 企业 列表 */
 defineOptions({ name: 'Enterprises' })
 
@@ -193,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() // 路由
@@ -238,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 a8990f2..b5092bf 100644
--- a/src/views/enterprises/update.vue
+++ b/src/views/enterprises/update.vue
@@ -1,268 +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>
+    <section>
+      <el-button>保存</el-button>
+    </section>
+  </content-wrap>
 
-      <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>
+  <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,
@@ -282,375 +145,140 @@ const formData = ref({
   managerDeptId: undefined,
   ides: undefined,
   startUserSelectAssignees: undefined,
-  enterpriseUserId: 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) // 清除之前的标记
+  ],
+  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
-  }
+const setGps = (gps) => {
+  formData.value.gpsLocation = gps
 }
 
-/** 执法记录查询列表 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 getGaps=()=>{
+	unref(GpsDialogRef).open()
 }
 
-/** 执法记录查询列表 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
-  }
-}
+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/task/index.vue b/src/views/task/index.vue
index 8af0bf9..17ee54f 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -164,7 +164,6 @@ const { push } = useRouter()
 const loading = ref(true) // 列表的加载中
 const list = ref<TaskInfoVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const taskTypeMap = ref()
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -191,8 +190,6 @@ const exportLoading = ref(false) // 导出的加载中
 
 const taskTypeList: any = ref([])
 
-const mydateFormatter3 = () => {}
-
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -214,21 +211,7 @@ const getList = async () => {
   }
 }
 
-// 立即执行
-const taskExec = async (data) => {
-  loading.value = true
-
-  try {
-    await TaskInfoApi.taskExec(data)
-    message.success(t('common.createSuccess'))
-    getList()
-  } finally {
-    loading.value = false
-  }
-}
 
-//选择任务中企业范围
-const selectEnterprise = async (id: number) => {}
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -244,9 +227,7 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
+
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {