From 057303a09df9ac6447273634b08ae21f22a78552 Mon Sep 17 00:00:00 2001
From: dx <1242347652@qq.com>
Date: Fri, 14 Feb 2025 17:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enterpriseinspections/index.vue | 19 +++++++++++--------
 src/views/system/user/examine.vue         |  2 +-
 src/views/system/user/index.vue           |  8 +-------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/views/enterpriseinspections/index.vue b/src/views/enterpriseinspections/index.vue
index 6020239..43bbdec 100644
--- a/src/views/enterpriseinspections/index.vue
+++ b/src/views/enterpriseinspections/index.vue
@@ -71,16 +71,24 @@
       :show-overflow-tooltip="true"
       @selection-change="handleSelectionChange"
       >
-      <el-table-column type="selection" width="55" />
+      <!-- <el-table-column type="selection" width="55" /> -->
 
       <!-- <el-table-column label="检查记录ID，主键" align="center" prop="id" /> -->
-      <el-table-column label="企业名称" align="center" prop="enterpriseName" />
+      <el-table-column label="企业名称" align="center" prop="enterpriseName" >
+        <template #default="scope">
+          <v-router @click="push({ path: '/enterprises/enterprises', query: { enterpriseId: scope.row.id} })" >{{scope.row.enterpriseName}}</v-router>
+        </template>
+      </el-table-column>
       <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="taskName">
+        <template #default="scope">
+          <v-router @click="push({ path: '/task/index', query: { taskId: scope.row.taskId} })" >{{scope.row.taskName}}</v-router>
+        </template>
+      </el-table-column>
       <el-table-column label="任务类型" align="center" prop="tagList" />
       <el-table-column label="执法部门" align="center" prop="department" />
       <el-table-column label="执法人员" align="center" prop="inspectName" />
@@ -160,11 +168,6 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await EnterpriseInspectionsApi.getEnterpriseInspectionsPage(queryParams)
-
-    data.list.forEach(item => {
-      item.tagList = item.tagList.join()
-    });
-
     list.value = data.list
     total.value = data.total
   } finally {
diff --git a/src/views/system/user/examine.vue b/src/views/system/user/examine.vue
index 920266f..be6e089 100644
--- a/src/views/system/user/examine.vue
+++ b/src/views/system/user/examine.vue
@@ -153,7 +153,7 @@ const queryParams = reactive({
   status: undefined,
   deptId: undefined,
   audit: [1,3],
-  userType: "1,2",
+  userType: "2, 3",
   createTime: []
 
 })
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9bc1349..6ef0e76 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -100,13 +100,7 @@
           <el-table-column
             label="用户名称"
             align="center"
-            prop="username"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="用户昵称"
-            align="center"
-            prop="nickname"
+            prop="realName"
             :show-overflow-tooltip="true"
           />
           <el-table-column