From 1272a8045358365b61b09e2745b6d25fdb3c4d34 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Mon, 14 Jul 2025 21:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4ppe=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ppeTool/index.vue    | 12 ++++++++----
 src/views/ppeTool/toolForm.vue |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/ppeTool/index.vue b/src/views/ppeTool/index.vue
index d29a579..ad25616 100644
--- a/src/views/ppeTool/index.vue
+++ b/src/views/ppeTool/index.vue
@@ -44,7 +44,7 @@
                         {{ scope.$index + 1 }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="dependencyName" label="属地" min-width="130" />
+                <el-table-column prop="dependencyName" label="属地" min-width="200" />
                 <el-table-column prop="escUserName" label="ESC" min-width="100" />
                 <el-table-column prop="deptName" label="部门" min-width="150" />
                 <el-table-column prop="toolName" label="工具名称" min-width="180" />
@@ -61,9 +61,11 @@
                         <div v-for="item in JSON.parse(scope.row.fileContent)" class="fileLink">{{ item.name }}</div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="startTime" label="状态" min-width="100">
+                <el-table-column prop="state" label="状态" min-width="100">
                     <template #default="scope">
-                        <span>-</span>
+                        <el-text v-if="scope.row.state == 0" type="success" class="successText">正常</el-text>
+                        <el-text v-else-if="scope.row.state == 1" type="danger" class="dangerText">过期</el-text>
+                        <span v-else>-</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" width="130">
@@ -96,7 +98,9 @@ const router = useRouter()
 const queryParams = ref({
     pageIndex: 1,
     pageSize: 10,
-    deptId: undefined
+    deptId: undefined,
+    dependencyId: undefined,
+    toolName: undefined
 })
 const loading = ref(true)
 const total = ref(0)
diff --git a/src/views/ppeTool/toolForm.vue b/src/views/ppeTool/toolForm.vue
index 3fc0d87..dfee97b 100644
--- a/src/views/ppeTool/toolForm.vue
+++ b/src/views/ppeTool/toolForm.vue
@@ -186,6 +186,7 @@ const getDetailInfo = (id) => {
     getBusPpeTools(id).then(res => {
         if (res.code == 200) {
             ruleForm.value = res.data
+            escName.value = res.data.escUserName
             docUploadList.value = JSON.parse(res.data.fileContent)
         }
     })