From bb91cd6f83c2960e5c7992fccf75fad6b312f1b7 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Tue, 15 Oct 2024 16:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/control/analysisList/index.vue     | 10 ++---
 .../device/control/analysisList/popup.vue     | 38 ++++++++++++++-----
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/views/govern/device/control/analysisList/index.vue b/src/views/govern/device/control/analysisList/index.vue
index 9b58451..62e8b1c 100644
--- a/src/views/govern/device/control/analysisList/index.vue
+++ b/src/views/govern/device/control/analysisList/index.vue
@@ -26,10 +26,9 @@ const tableStore: any = new TableStore({
         // { width: '60', type: 'checkbox', fixed: 'left' },
         { title: '序号', type: 'seq', width: 80 },
         { field: 'projectName', title: '工程名称', minWidth: 170 },
-        // { field: 'allCount', title: '数据总数(条)', minWidth: 170 },
-        { field: 'successCount', title: '已入库总数(条)', minWidth: 170 },
-        { field: 'startTime', title: '起始时间', minWidth: 170 },
-        { field: 'endTime', title: '结束时间', minWidth: 170 },
+        { field: 'successCount', title: '成功解析数', minWidth: 170 },
+        { field: 'startTime', title: '导入开始时间', minWidth: 170 },
+        { field: 'endTime', title: '导入结束时间', minWidth: 170 },
         {
             title: '解析状态',
             field: 'status',
@@ -116,8 +115,5 @@ defineExpose({ open })
 <style lang="scss" scoped>
 ::v-deep .el-dialog_body {
     overflow-y: hidden !important;
-    .analysisTable {
-        height: 400px !important;
-    }
 }
 </style>
diff --git a/src/views/govern/device/control/analysisList/popup.vue b/src/views/govern/device/control/analysisList/popup.vue
index 800857c..d1a5da4 100644
--- a/src/views/govern/device/control/analysisList/popup.vue
+++ b/src/views/govern/device/control/analysisList/popup.vue
@@ -1,8 +1,25 @@
 <!-- 解析列表 -->
 <template>
-    <el-dialog v-model="dialogVisible" title="解析列表" width="70%" draggable @closed="close">
-        <TableHeader date-picker></TableHeader>
-        <Table ref="tableRef" />
+    <el-dialog v-model="dialogVisible" title="详情" width="70%" draggable @closed="close">
+        <vxe-table
+            border
+            auto-resize
+            :data="tableData"
+            v-bind="defaultAttribute"
+        >
+            <vxe-column field="name" align="center" title="文件名称"></vxe-column>
+            <vxe-column field="createTime" align="center" title="导入时间"></vxe-column>
+            <vxe-column field="allCount" align="center" title="数据总数(条)" width="120"></vxe-column>
+            <vxe-column field="realCount" align="center" title="已入库总数(条)" width="120"></vxe-column>
+            <vxe-column field="state" align="center" title="解析状态" width="100">
+                <template v-slot:default="scoped">
+                    <el-tag type="warning" v-if="scoped.row.state == 0">未解析</el-tag>
+                    <el-tag type="success" v-if="scoped.row.state == 1">解析成功</el-tag>
+                    <el-tag type="danger" v-if="scoped.row.state == 2">解析失败</el-tag>
+                    <el-tag type="primary" v-if="scoped.row.state == 3">文件不存在</el-tag>
+                </template>
+            </vxe-column>
+        </vxe-table>
     </el-dialog>
 </template>
 <script lang="ts" setup>
@@ -11,6 +28,7 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { ArrowLeft } from '@element-plus/icons-vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
 const emit = defineEmits(['back'])
 const dialogVisible = ref(false)
 const height = ref(0)
@@ -19,17 +37,17 @@ height.value = window.innerHeight < 1080 ? 230 : 450
 const tableStore: any = new TableStore({
     url: '',
     publicHeight: height.value,
+    showPage: false,
     column: [
         { width: '60', type: 'checkbox', fixed: 'left' },
         { title: '序号', type: 'seq', width: 80 },
-        { field: 'projectName', title: '工程名称', minWidth: 170 },
+        { field: 'name', title: '文件名称', minWidth: 170 },
+        { field: 'createTime', title: '导入时间', minWidth: 170 },
         { field: 'allCount', title: '数据总数(条)', minWidth: 170 },
-        { field: 'successCount', title: '已入库总数(条)', minWidth: 170 },
-        { field: 'startTime', title: '起始时间', minWidth: 170 },
-        { field: 'endTime', title: '结束时间', minWidth: 170 },
+        { field: 'realCount', title: '已入库总数(条)', minWidth: 170 },
         {
             title: '解析状态',
-            field: 'status',
+            field: 'state',
             width: 100,
             render: 'tag',
             custom: {
@@ -70,14 +88,14 @@ const tableStore: any = new TableStore({
         tableStore.table.data = []
     }
 })
-provide('tableStore', tableStore)
 //返回
 const handleBack = () => {
     emit('back')
 }
+const tableData: any = ref()
 const open = (val: any) => {
     dialogVisible.value = true
-    tableStore.table.data = val
+    tableData.value = val
     setTimeout(() => {
         tableStore.index()
     }, 10)