From d09fe6aa593b974119628baf5e91bdfd0de7c378 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 10 四月 2025 10:42:26 +0800
Subject: [PATCH] 翻译 设备状态信息

---
 src/utils/statusFormatter.ts                        |    6 +++---
 src/views/ecg/devmanage/DeviceForm.vue              |   13 ++-----------
 src/views/ecg/doctor/components/DevInstallPanel.vue |   14 ++++++++------
 src/views/ecg/doctor/components/DevReadyPanel.vue   |    3 ++-
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/utils/statusFormatter.ts b/src/utils/statusFormatter.ts
index 92486b7..1578c1b 100644
--- a/src/utils/statusFormatter.ts
+++ b/src/utils/statusFormatter.ts
@@ -1,5 +1,5 @@
 /**
- * 鍙彿灞忎娇鐢�
+ *
  */
 export const DevStateOptions = [
   {label: "绌洪棽", value: 0},
@@ -13,11 +13,11 @@
 
 export const tranlateDevState = (state) => {
   const stateOption = DevStateOptions.find(obj => obj.value === state)
-  return  undefined !== stateOption ? stateOption.label : ''
+  return  stateOption?.label || '-'
 }
 
 /**
- * 鍙彿灞忎娇鐢�
+ *
  */
 export const queueStatusConvert = (status: number) => {
   if (3 === status)
diff --git a/src/views/ecg/devmanage/DeviceForm.vue b/src/views/ecg/devmanage/DeviceForm.vue
index 5e480c9..b1fc3c7 100644
--- a/src/views/ecg/devmanage/DeviceForm.vue
+++ b/src/views/ecg/devmanage/DeviceForm.vue
@@ -83,6 +83,7 @@
 <script setup lang="ts">
 import {getStrDictOptions, DICT_TYPE, DictDataType} from '@/utils/dict'
 import {DeviceApi, DeviceVO, DevModelApi, OptionsVO} from '@/api/ecg/devmanage'
+import {tranlateDevState} from "@/utils/statusFormatter";
 
 /** 璁惧 琛ㄥ崟 */
 defineOptions({ name: 'DeviceForm' })
@@ -204,20 +205,10 @@
   formData.value.model = modelOptions.value.length === 0 ? "" : modelOptions.value[0].value
 }
 
-const tranlateDevState = (state) => {
-  if (state === 0) return "绌洪棽";
-  else if (state=== 5) return "宸查鐢�";
-  else if (state=== 10) return "宸茶鏈�";
-  else if (state=== 20) return "宸查仐澶�";
-  else if (state=== 30) return "寰呯淮淇�";
-  else if (state=== 40) return "缁翠慨涓�";
-  else if (state=== 50) return "宸叉姤搴�";
-}
-
 onMounted( async () => {
   console.info("onMount DeviceForm...")
   const data = await getStrDictOptions(DICT_TYPE.ECG_DEV_CATEGORY)
   categoryOptions.value = data
 })
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 931b5a5..9253690 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -38,9 +38,7 @@
             <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
           </el-form-item>
           <el-form-item label="璁惧鎻忚堪" prop="">
-            <span v-if="formData.brand !== null"> {{formData.brand}} </span>
-             {{"&nbsp;&nbsp;"}}
-            <span v-if="formData.model !== null"> {{formData.model}} </span>
+            {{formData.brand + "&nbsp;&nbsp;" + formData.model + " " + tranlateDevState(formData.state)}}
           </el-form-item>
           <el-form-item label="澶囨敞" prop="remark">
             <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
@@ -128,6 +126,7 @@
 import {Barcode} from "@/components/Barcode";
 import {useCheckTypeStore} from "@/store/modules/checkType";
 import {DICT_TYPE} from "@/utils/dict";
+import {tranlateDevState} from "../../../../utils/statusFormatter";
 
 /** 璁惧瑁呮満 琛ㄥ崟 */
 defineComponent({ name: 'DevInstallPanel' })
@@ -218,6 +217,7 @@
     category: '',
     brand: '',
     model: '',
+    state: -1,
   }
   formRef.value?.resetFields()
 }
@@ -227,14 +227,16 @@
     formData.value.category = ""
     formData.value.brand = ""
     formData.value.model = ""
+    formData.value.state = -1
     return
   }
 
   const data = await DeviceApi.getDeviceByDevId(formData.value.devId!)
   console.info( data )
-  formData.value.category = data === null ? "" : data.category
-  formData.value.brand = data === null ? "" : data.brand
-  formData.value.model = data === null ? "" : data.model
+  formData.value.category = data?.category || ""
+  formData.value.brand = data?.brand || ""
+  formData.value.model = data?.model || ""
+  formData.value.state = data?.state || -1
 }
 
 const getRentInfoByPatId = () => {
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 8bffad7..97b9a02 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -30,7 +30,7 @@
         <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
       </el-form-item>
       <el-form-item label="璁惧鎻忚堪" prop="">
-        {{deviceInfo.brand + "&nbsp;&nbsp;" + deviceInfo.model + " " + deviceInfo.state}}
+        {{deviceInfo.brand + "&nbsp;&nbsp;" + deviceInfo.model + " " + tranlateDevState(deviceInfo.state)}}
       </el-form-item>
       <el-form-item label="棰嗙敤鏃堕棿" prop="rentTime">
         <el-date-picker
@@ -150,6 +150,7 @@
 import {calGender, getBookBeginTime} from "@/utils";
 import form from "@/components/Form/src/Form.vue";
 import {DICT_TYPE} from "@/utils/dict";
+import {tranlateDevState} from "@/utils/statusFormatter";
 
 /** 璁惧棰嗙敤 琛ㄥ崟 */
 defineComponent({ name: 'DevReadyPanel' })

--
Gitblit v1.9.3