From f078c827fa17e7015d700eb9582a29a7e80600a3 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Tue, 25 Jul 2023 14:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=95=B0=E5=AD=97=E5=8F=98?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                           | 20 ++++++++++----------
 src/components/DetailTable.vue | 12 +++++++++++-
 src/components/Image.vue       | 15 ++++++++++++++-
 src/utils/common.js            |  5 +++++
 4 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 src/utils/common.js

diff --git a/.env b/.env
index 0cef3be..66792ea 100644
--- a/.env
+++ b/.env
@@ -1,12 +1,12 @@
-VITE_BASE_URL=http://192.168.1.194:8899
-VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.194:8899/websocket/nuclear
-# VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
-VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.194:8081/ws/cmd
-VITE_HOST_URL=http://192.168.1.194:8081/
+# VITE_BASE_URL=http://192.168.1.194:8899
+# VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.194:8899/websocket/nuclear
+# # VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
+# VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.194:8081/ws/cmd
+# VITE_HOST_URL=http://192.168.1.194:8081/
 
 
-# VITE_BASE_URL=http://127.0.0.1:8899
-# VITE_WEBSOCKET_JAVA_URL=ws://127.0.0.1:8899/websocket/nuclear
-# # VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
-# VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8081/ws/cmd
-# VITE_HOST_URL=http://127.0.0.1:8081/
\ No newline at end of file
+VITE_BASE_URL=http://127.0.0.1:8899
+VITE_WEBSOCKET_JAVA_URL=ws://127.0.0.1:8899/websocket/nuclear
+# VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
+VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8081/ws/cmd
+VITE_HOST_URL=http://127.0.0.1:8081/
\ No newline at end of file
diff --git a/src/components/DetailTable.vue b/src/components/DetailTable.vue
index 29f42ff..64f319a 100644
--- a/src/components/DetailTable.vue
+++ b/src/components/DetailTable.vue
@@ -5,6 +5,7 @@
 <script setup lang="jsx">
 import { computed, ref } from 'vue'
 import { useImageStore } from '@/store'
+import { transNumberToEn } from '@/utils/common'
 import moment from 'moment'
 const imageStore = useImageStore()
 const data = computed(() => {
@@ -24,7 +25,16 @@ const columns = ref([
     colKey: 'serialNumber',
     width: 120,
     title: '核查坐标',
-    cell: (h, { row }) => (row.serialNumber ? row.serialNumber : '---'),
+    cell: (h, { row }) => {
+      if (row.serialNumber) {
+        // transNumberToEn
+        // 将本次核查坐标横坐标转换为应为字母
+        const arr = row.serialNumber.split('-')
+        return `${transNumberToEn(arr[0])} - ${arr[1]}`
+      } else {
+        return '---'
+      }
+    },
   },
   {
     colKey: 'firstSign',
diff --git a/src/components/Image.vue b/src/components/Image.vue
index 41ef448..61c225f 100644
--- a/src/components/Image.vue
+++ b/src/components/Image.vue
@@ -4,7 +4,9 @@
     <div class="top_info">
       <p class="title">{{ imageStore.nuclearCoreName }}</p>
       <div class="title_left">
-        <p class="sign">{{ imageStore?.coreInfo?.serialNumber }}</p>
+        <p class="sign">
+          {{ handleSerialNumber(imageStore?.coreInfo?.serialNumber) }}
+        </p>
         <div class="tag_wrap">
           <p>{{ imageStore?.coreInfo?.firstSign?.substr(-4) }}</p>
           <p>{{ imageStore?.coreInfo?.secondSign?.substr(-4) }}</p>
@@ -89,10 +91,21 @@
 
 <script setup>
 import { onMounted } from 'vue'
+import { transNumberToEn } from '@/utils/common'
 import { useTaskStore, useImageStore } from '@/store'
 const taskStore = useTaskStore()
 const imageStore = useImageStore()
 
+const handleSerialNumber = serialNumber => {
+  if (serialNumber) {
+    const arr = serialNumber.split('-')
+    if (arr && arr.length == 2) {
+      return `${transNumberToEn(arr[0])} - ${arr[1]}`
+    }
+  }
+  return ''
+}
+
 const getIdentifyClass = () => {
   const res = imageStore?.coreInfo?.result
   if (res == 1) {
diff --git a/src/utils/common.js b/src/utils/common.js
new file mode 100644
index 0000000..a7e34ed
--- /dev/null
+++ b/src/utils/common.js
@@ -0,0 +1,5 @@
+// 将数字转化为英文坐标
+export const transNumberToEn = num => {
+  const arr = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N']
+  return arr[parseInt(num) - 1]
+}