From 8e6c55ae85a8faf7baf7cd93b67fc3f6acb4c904 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Wed, 5 Jul 2023 18:32:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailTable.vue | 26 +++++++++++++++++---------
 src/components/Task.vue        | 21 +++++++++++++++++++--
 src/pages/index.vue            |  2 +-
 src/store/modules/image.js     |  8 ++++++++
 4 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/components/DetailTable.vue b/src/components/DetailTable.vue
index a166813..017809d 100644
--- a/src/components/DetailTable.vue
+++ b/src/components/DetailTable.vue
@@ -3,35 +3,43 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
-const data = ref([])
+import { computed, ref } from 'vue'
+import { useImageStore } from '@/store'
+const imageStore = useImageStore()
+const data = computed(() => {
+  const res = { ...imageStore.coreInfo }
+  res.nuclearCoreName = imageStore.nuclearCoreName
+  res.operatorName = imageStore.operatorName
+  res.nuclearStationName = imageStore.nuclearStationName
+  return [res]
+})
 const columns = ref([
   {
-    colKey: 'username',
+    colKey: 'operatorName',
     title: '操作员',
   },
   {
-    colKey: 'coord',
+    colKey: 'serialNumber',
     title: '核查坐标',
   },
   {
-    colKey: 'detectionResult',
+    colKey: 'firstSign',
     title: '坐标信息',
   },
   {
-    colKey: 'result',
+    colKey: 'resultSerial',
     title: '核对结果',
   },
   {
-    colKey: 'updateTime',
+    colKey: 'id',
     title: '核对时间',
   },
   {
-    colKey: 'statioName',
+    colKey: 'nuclearStationName',
     title: '核电站名称',
   },
   {
-    colKey: 'coreName',
+    colKey: 'nuclearCoreName',
     title: '核反应堆名称',
   },
 ])
diff --git a/src/components/Task.vue b/src/components/Task.vue
index ed508a4..b2bbf07 100644
--- a/src/components/Task.vue
+++ b/src/components/Task.vue
@@ -330,7 +330,13 @@ export default {
                     theme="primary"
                     disabled={row.canUpload}
                     onClick={() =>
-                      this.viewDetail(row.id, row.nuclearCoreName, 2)
+                      this.viewDetail(
+                        row.id,
+                        row.nuclearCoreName,
+                        2,
+                        row.nuclearStationName,
+                        row.operatorName,
+                      )
                     }
                   >
                     详情
@@ -345,6 +351,8 @@ export default {
                       row.id,
                       row.nuclearCoreName,
                       1,
+                      row.nuclearStationName,
+                      row.operatorName,
                       row.canUpload,
                     )
                   }
@@ -438,10 +446,19 @@ export default {
       taskStore.updateCurrentTaskId(taskId)
       taskStore.updateCurrentDetailTaskId(null)
     },
-    viewDetail(taskId, nuclearCoreName, flag, canUpload) {
+    viewDetail(
+      taskId,
+      nuclearCoreName,
+      flag,
+      nuclearStationName,
+      operatorName,
+      canUpload,
+    ) {
       if (flag == 1 && canUpload) {
         return
       }
+      imageStore.updateNuclearStationName(nuclearStationName)
+      imageStore.updateOperatorName(operatorName)
       imageStore.updateNuclearCoreName(nuclearCoreName)
       taskStore.updateCurrentDetailTaskId(taskId)
       imageStore.updateShowImage(false)
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 424bb18..0e52635 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -421,11 +421,11 @@ const getSocketdata = res => {
   console.log(res)
   if (res == 'update') {
     // 更新一系列数据
+    taskStore.getExcelList(taskStore.currentTaskId)
   }
 }
 
 onMounted(async () => {
-  // taskStore.getExcelList(1)
   websocket.value = new socket()
   websocket.value.WebSocketSet(getSocketdata)
 })
diff --git a/src/store/modules/image.js b/src/store/modules/image.js
index 5c2ebf1..29b3e45 100644
--- a/src/store/modules/image.js
+++ b/src/store/modules/image.js
@@ -6,10 +6,18 @@ export const useImageStore = defineStore({
       nuclearCoreName: '',
       coreInfo: {},
       showImage: false,
+      operatorName: '',
+      nuclearStationName: '',
     }
   },
   // actions
   actions: {
+    updateNuclearStationName(nuclearStationName) {
+      this.nuclearStationName = nuclearStationName
+    },
+    updateOperatorName(operatorName) {
+      this.operatorName = operatorName
+    },
     updateShowImage(showImage) {
       this.showImage = showImage
     },