From 4edd55cc73b1dee30f85ab9918fa09b74bc1dcaf 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: Thu, 27 Mar 2025 16:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A=E6=89=A7?=
 =?UTF-8?q?=E6=B3=95=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/enterpriseinspections/index.ts        |  19 +-
 .../UploadFile/src/FileUploader.vue           |  20 +-
 .../EnterpriseInspectionsForm.vue             |  11 +-
 src/views/enterpriseinspections/detail.vue    |  13 +-
 src/views/enterprises/index.vue               |  74 +++---
 src/views/enterprises/update.vue              | 216 ++++++++++++++++--
 6 files changed, 292 insertions(+), 61 deletions(-)

diff --git a/src/api/enterpriseinspections/index.ts b/src/api/enterpriseinspections/index.ts
index e3d2451..aefadb7 100644
--- a/src/api/enterpriseinspections/index.ts
+++ b/src/api/enterpriseinspections/index.ts
@@ -55,5 +55,22 @@ export const EnterpriseInspectionsApi = {
   // 变更人员ID
   passOn: async (data: any) => {
     return await request.post({ url: `/system/enterprise-inspections/passOn`, data })
-  }
+  },
+  /**
+   * 查询企业执法记录
+   */
+  getListByEnterpriseId: async (params: any) => {
+    return await request.get({
+      url: `/system/enterprise-inspections/inspectionsByEnterpriseId`,
+      params
+    })
+  },
+  /**
+   * 获取执法记录日志详情
+   */
+  getLogDetail:async (id: any) => {
+    return await request.get({
+      url: `/system/inspections-log/get?id=${id}`,
+    })
+  },
 }
diff --git a/src/components/UploadFile/src/FileUploader.vue b/src/components/UploadFile/src/FileUploader.vue
index 6418993..668a412 100644
--- a/src/components/UploadFile/src/FileUploader.vue
+++ b/src/components/UploadFile/src/FileUploader.vue
@@ -27,11 +27,11 @@
         <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" :size="30" />
-            <span>查看</span>
+            <Icon icon="ep:zoom-in" :size="24" />
+            <span>放大</span>
           </div>
           <div class="handle-icon" @click="handleRemove(file)">
-            <Icon icon="ep:delete" :size="30" />
+            <Icon icon="ep:delete" :size="24" />
             <span>删除</span>
           </div>
         </div>
@@ -82,7 +82,8 @@ const props = defineProps({
   fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传（默认为 ["image/jpeg", "image/png", "image/gif"]）
   height: propTypes.string.def('150px'), // 组件高度 ==> 非必传（默认为 150px）
   width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传（默认为 150px）
-  borderRadius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
+  borderRadius: propTypes.string.def('8px'), // 组件边框圆角 ==> 非必传（默认为 8px）
+  disable: propTypes.bool.def(false)
 })
 const showPlus = ref(false)
 const { uploadUrl, httpRequest } = useUpload()
@@ -138,6 +139,16 @@ watch(
   { immediate: true, deep: true }
 )
 
+watch(
+  () => props.disable,
+  (val) => {
+    if (val) {
+      showPlus.value = true
+    }
+  },
+  { immediate: true, deep: true }
+)
+
 const emitUpdateModelValue = (fileList: any) => {
   emit('update:modelValue', fileList)
 }
@@ -284,6 +295,7 @@ defineExpose({
         align-items: center;
         justify-content: center;
         color: aliceblue;
+        font-size: 14px;
         &:hover {
           color: var(--el-color-primary);
           transition: var(--el-transition-duration-fast);
diff --git a/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue b/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue
index 94106b3..91d2e75 100644
--- a/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue
+++ b/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue
@@ -22,16 +22,21 @@
   </Dialog>
 </template>
 <script setup lang="ts">
+import {EnterpriseInspectionsApi} from '@/api/enterpriseinspections'
 /** 企业检查记录表，用于记录与企业相关的环保检查信息。 表单 */
 defineOptions({ name: 'EnterpriseInspectionsForm' })
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 
-const detail = ref()
+const detail = ref({
+  id: undefined
+})
 
 /** 打开弹窗 */
-const open = async (param: any) => {
-  detail.value = param
+const open = async (params: any) => {
+	EnterpriseInspectionsApi.getLogDetail(params.id).then(res=>{
+		detail.value = res
+	})
   dialogVisible.value = true
 }
 
diff --git a/src/views/enterpriseinspections/detail.vue b/src/views/enterpriseinspections/detail.vue
index bfc08ff..3a75377 100644
--- a/src/views/enterpriseinspections/detail.vue
+++ b/src/views/enterpriseinspections/detail.vue
@@ -37,7 +37,7 @@
           @click="
             push({
               path: `/enterprises/update`,
-              query: { id: detailData.enterpriseId }
+              query: { id: detailData.enterpriseId, view: true }
             })
           "
           >详情
@@ -77,7 +77,12 @@
       <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="viewDetail(scope.row)">
+          <el-button
+            link
+            v-if="scope.row.status > 1"
+            type="primary"
+            @click="viewDetail(scope.row.id)"
+          >
             详情
           </el-button>
           <span v-if="scope.row.status === 1">-</span>
@@ -141,8 +146,8 @@ const getDetail = async () => {
   )
 }
 
-const viewDetail = async (row) => {
-  unref(detailRef).open(row)
+const viewDetail = async (id) => {
+  unref(detailRef).open({ id })
 }
 
 const getList = async () => {
diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue
index 20e6150..c478e67 100644
--- a/src/views/enterprises/index.vue
+++ b/src/views/enterprises/index.vue
@@ -47,17 +47,22 @@
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="registrationNumber">
-	        <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-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
@@ -70,7 +75,6 @@
             :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           />
         </el-form-item>
-
         <el-form-item class="btnClass">
           <el-button @click="handleQuery" type="primary" plain>
             <Icon icon="ep:search" class="mr-5px" /> 查询
@@ -112,7 +116,9 @@
         </el-table-column>
         <el-table-column label="行业类别" width="300">
           <template #default="scope">
-            {{ getDictLabel(DICT_TYPE.ENTERPRISES_TYPE, scope.row.type) }}
+            <span v-if="scope.row.tagListName">
+              {{ scope.row.tagListName.map((i) => i.label).join('、') }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="执法人员" width="200">
@@ -128,10 +134,10 @@
         />
         <el-table-column label="操作选项" align="center" width="120px">
           <template #default="scope">
-	          <el-button
-			          link
-			          type="primary"
-			          @click="
+            <el-button
+              link
+              type="primary"
+              @click="
                 push({
                   path: 'update',
                   query: {
@@ -139,18 +145,19 @@
                   }
                 })
               "
-			          v-hasPermi="['system:enterprise:update']"
-	          >
-		          编辑
-	          </el-button>
+              v-hasPermi="['system:enterprise:update']"
+            >
+              编辑
+            </el-button>
             <el-button
               link
               type="primary"
               @click="
                 push({
-                  path: 'detail',
+                  path: 'update',
                   query: {
-                    id: scope.row.id
+                    id: scope.row.id,
+                    view: true
                   }
                 })
               "
@@ -258,25 +265,20 @@ const handleExport = async () => {
   }
 }
 
-
-
 /** 查询搜索项列表 */
 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
-		}
-	})
+  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 cd35c41..4e3c815 100644
--- a/src/views/enterprises/update.vue
+++ b/src/views/enterprises/update.vue
@@ -7,10 +7,15 @@
           <el-form :rules="formRules" :model="formData" ref="formRef" label-width="100px">
             <section class="base-form">
               <el-form-item label="企业名称" prop="enterprisesName">
-                <el-input v-model="formData.enterprisesName" placeholder="请输入企业名称" />
+                <el-input
+                  v-model="formData.enterprisesName"
+                  placeholder="请输入企业名称"
+                  :readonly="isView"
+                />
               </el-form-item>
               <el-form-item label="所属区域" prop="region">
-                <el-select v-model="formData.region" placeholder="请选择所属区域" clearable>
+                <el-input v-if="isView" :readonly="isView" v-model="formData.region" />
+                <el-select v-model="formData.region" placeholder="请选择所属区域" clearable v-else>
                   <el-option
                     v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA)"
                     :key="dict.value"
@@ -20,11 +25,13 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="企业地址" prop="address">
+                <el-input v-if="isView" :readonly="isView" v-model="formData.address" />
                 <el-input
                   v-model="formData.address"
                   placeholder="请选择企业地址"
                   readonly
                   @click="getGaps"
+                  v-else
                 >
                   <template #append>
                     <Icon icon="ep:position" @click.stop="getGaps" />
@@ -32,7 +39,9 @@
                 </el-input>
               </el-form-item>
               <el-form-item label="行业类别" prop="tagIds">
+                <el-input v-if="isView" :readonly="isView" v-model="formData.tagIds" />
                 <el-select
+                  v-else
                   v-model="formData.tagIds"
                   placeholder="请选择行业类型"
                   clearable
@@ -56,19 +65,37 @@
                   maxlength="500"
                   show-word-limit
                   resize="none"
+                  :readonly="isView"
                 />
               </el-form-item>
               <el-form-item label="环保负责人" prop="contactName">
-                <el-input v-model="formData.contactName" placeholder="请输入负责人名称" />
+                <el-input
+                  v-model="formData.contactName"
+                  placeholder="请输入负责人名称"
+                  :readonly="isView"
+                />
               </el-form-item>
               <el-form-item label="联系方式" prop="environmentalContactPhone">
                 <el-input
                   v-model="formData.environmentalContactPhone"
                   placeholder="请输入负责人联系方式"
+                  :readonly="isView"
                 />
               </el-form-item>
               <el-form-item label="企业照片" prop="photo" class="form-photo">
+                <section v-if="isView" class="flex gap-20px">
+                  <el-image
+                    v-for="(p, index) in formData.photo"
+                    :src="p.url"
+                    :key="index"
+                    :preview-src-list="formData.photo.map((i) => i.url)"
+                    :initial-index="index"
+                    fit="contain"
+                    class="w-148px h-148px border-solid border-1 border-color-#ccc border-rounded-8px"
+                  />
+                </section>
                 <FileUploader
+                  v-else
                   v-model="formData.photo"
                   :limit="6"
                   height="148px"
@@ -78,7 +105,9 @@
               </el-form-item>
               <section class="form-sub-title"> 执法配置</section>
               <el-form-item label="执法人员" prop="userId">
+                <el-input v-if="isView" readonly v-model="formData.inviterName" />
                 <el-select
+                  v-else
                   v-model="formData.userId"
                   placeholder="请选择执法人员"
                   filterable
@@ -103,6 +132,7 @@
                   placeholder="请输入执法半径"
                   controls-position="right"
                   class="!w-100%"
+                  :readonly="isView"
                 >
                   <template #suffix>
                     <span>米</span>
@@ -122,12 +152,24 @@
             :key="index"
             @click="editProve(prove.id)"
           >
-            <el-image
-              :src="prove.files[0].url"
-              :preview-src-list="prove.files[0]"
-              :initial-index="0"
-              class="border-rounded-6px h-130px mb-12px"
-            />
+            <section class="image-wrapper">
+              <el-image
+                :src="prove.files[0].url"
+                :preview-src-list="prove.files[0]"
+                :initial-index="0"
+                class="h-100% w-100%"
+              />
+              <section class="operation">
+                <section class="item" @click.stop="imagePreview(prove.files[0].url)">
+                  <Icon icon="ep:zoom-in" :size="24" />
+                  放大
+                </section>
+                <section class="item" @click.stop="deleteProve(prove.id)" v-if="!isView">
+                  <Icon icon="ep:delete" :size="24" />
+                  删除
+                </section>
+              </section>
+            </section>
             <section class="flex flex-col gap-4px items-center">
               <span class="font-bold">
                 {{ getDictLabel(DICT_TYPE.ENTERPRISES_QUA, prove.qualificationName) }}
@@ -139,19 +181,50 @@
               <span v-else>永久</span>
             </section>
           </section>
-          <section class="add-prove" @click="addProve">
+          <section class="add-prove" @click="addProve" v-if="!isView">
             <Icon icon="ep:plus" :size="30" />
           </section>
         </section>
       </section>
     </section>
-    <section class="flex items-center justify-center gap-20px">
+    <section class="flex items-center justify-center gap-20px" v-if="!isView">
       <el-button @click="submit" type="primary">保存信息</el-button>
       <el-button @click="router.go(-1)">返回列表</el-button>
     </section>
   </content-wrap>
+
+  <content-wrap v-if="isView" title="执法记录">
+    <section class="flex flex-col gap-20px">
+      <el-table :data="logList" v-loading="logLoading" :span-method="logSpanMethod" border>
+        <el-table-column label="任务名称" prop="title" />
+        <el-table-column label="执法人员" prop="inspectNames" />
+        <el-table-column label="进度状态">
+          <template #default="{ row }">
+            <dict-tag :value="row.status" :type="DICT_TYPE.INSPECTIONS_STATUS" />
+          </template>
+        </el-table-column>
+        <el-table-column label="执法时间" prop="time" :formatter="dateFormatter" />
+        <el-table-column label="结果反馈" width="100" align="center">
+          <template #default="{ row }">
+            <span v-if="row.status === 1">-</span>
+            <el-link type="primary" v-else @click="showInspection(row.inspectionsId)">详情 </el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :total="logTotal"
+        :show-page-size="false"
+        layout="total, prev, pager, next"
+        v-model:current-page="logParams.pageNo"
+        v-model:page-size="logParams.pageSize"
+        @change="getLogList"
+        class="ml-auto"
+      />
+    </section>
+  </content-wrap>
   <GpsDialog ref="GpsDialogRef" @success="setGps" />
   <ProveForm ref="proveFormRef" @add-prove="setProve" @success="getProveList" />
+  <InspectionForm ref="inspectionRef" />
 </template>
 
 <script setup lang="ts">
@@ -160,10 +233,12 @@ import { TagLibraryApi } from '@/api/system/taglibrary'
 import { getEnterpriseManager } from '@/api/system/user'
 import GpsDialog from './components/getGpsByAmap.vue'
 import ProveForm from '@/views/qualification/prove.vue'
-import { formatDate } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 import { EnterprisesApi } from '@/api/enterprises'
 import { EnterpriseQualificationApi } from '@/api/qualification'
-
+import { createImageViewer } from '@/components/ImageViewer'
+import { EnterpriseInspectionsApi } from '@/api/enterpriseinspections'
+import InspectionForm from '@/views/enterpriseinspections/EnterpriseInspectionsForm.vue'
 /** 企业 表单 */
 defineOptions({ name: 'UpdateEnterprises' })
 //行业类别
@@ -176,6 +251,7 @@ const proveFormRef = ref()
 const route = useRoute()
 const loading = ref(false)
 const formRef = ref()
+const isView = ref(false)
 const formData = ref({
   id: undefined,
   departmentId: undefined,
@@ -265,6 +341,16 @@ const formRules = reactive({
 } as any)
 const fileUploadRef = ref()
 const proveList: any = ref([])
+const logList = ref([])
+const logTotal = ref(0)
+const logLoading = ref(false)
+const logSpanArr: any = ref([])
+const inspectionRef = ref()
+const logParams: any = reactive({
+  pageSize: 5,
+  pageNo: 1,
+  enterpriseId: undefined
+})
 /** 查询搜索项列表 */
 const getSelectOption = async () => {
   userList.value = await getEnterpriseManager()
@@ -342,6 +428,7 @@ const setProve = (prove) => {
 }
 
 const editProve = (id) => {
+  if (isView) return
   unref(proveFormRef).open({ id })
 }
 
@@ -351,6 +438,10 @@ const getDetail = () => {
     formData.value.photo = formData.value.files
     formData.value.gpsLocation = formData.value.gpsLocation.split(',')
     formData.value.tagIds = res.tagObjList.map((i) => i.id)
+    if (isView) {
+      formData.value.region = getDictLabel(DICT_TYPE.ENTERPRISES_AREA, formData.value.region)
+      formData.value.tagIds = res.tagObjList.map((i) => i.tagName).join('，')
+    }
   })
 }
 
@@ -368,13 +459,77 @@ const getProveList = () => {
   })
 }
 
+const deleteProve = (id: any) => {
+  EnterpriseQualificationApi.deleteEnterpriseQualification(id).then(() => {
+    message.success('删除成功')
+    getProveList()
+  })
+}
+
+const getLogList = () => {
+  logLoading.value = true
+  EnterpriseInspectionsApi.getListByEnterpriseId(logParams).then((res) => {
+    logLoading.value = false
+    logTotal.value = res.total
+    logList.value = res.list
+    getSpanArr(logList.value)
+  })
+}
+
+// 查看图片
+const imagePreview = (imgUrl: string) => {
+  createImageViewer({
+    zIndex: 9999999,
+    urlList: [imgUrl]
+  })
+}
+
+const logSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+  if (columnIndex == 0) {
+    const _row = logSpanArr.value[rowIndex]
+    const _col = _row > 0 ? 1 : 0
+    return { rowspan: _row, colspan: _col }
+  }
+}
+
+const showInspection = (id) => {
+  unref(inspectionRef).open({ id })
+}
+
+const getSpanArr = (data) => {
+  logSpanArr.value = []
+  let pos = 0
+
+  for (var i = 0; i < data.length; i++) {
+    if (i === 0) {
+      logSpanArr.value.push(1)
+      pos = 0
+    } else {
+      // 判断当前元素与上一个元素是否相同  inAccessCode（批次字段）
+      if (data[i].taskId === data[i - 1].taskId) {
+        logSpanArr.value[pos] += 1
+        logSpanArr.value.push(0)
+      } else {
+        logSpanArr.value.push(1)
+        pos = i
+      }
+    }
+  }
+}
+
 getSelectOption()
+
 onMounted(() => {
   if (route.query.id) {
     formData.value.id = route.query.id
     getDetail()
     getProveList()
   }
+  if (route.query.view) {
+    isView.value = true
+    logParams.enterpriseId = route.query.id
+    getLogList()
+  }
 })
 </script>
 
@@ -454,6 +609,41 @@ onMounted(() => {
       border-radius: 8px;
       overflow: hidden;
       padding: 12px;
+      .image-wrapper {
+        position: relative;
+        height: 130px;
+        margin-bottom: 12px;
+        border-radius: 6px;
+        overflow: hidden;
+        &:hover {
+          .operation {
+            opacity: 1;
+          }
+        }
+        .operation {
+          cursor: pointer;
+          opacity: 0;
+          position: absolute;
+          inset: 0;
+          background-color: rgba(0, 0, 0, 0.7);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          gap: 20px;
+          color: #fff;
+          font-size: 14px;
+          transition: var(--el-transition-time);
+          .item {
+            display: flex;
+            flex-flow: column nowrap;
+            align-items: center;
+            gap: 8px;
+            &:hover {
+              color: var(--el-color-primary);
+            }
+          }
+        }
+      }
     }
     .add-prove {
       width: 200px;