From b725be02f462d138c6d4589657be47cda2667808 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 17 十月 2024 17:47:00 +0800
Subject: [PATCH] update
---
src/utils/statusFormatter.ts | 16 +++++++++++++++-
src/views/ecg/devmanage/index.vue | 20 ++++----------------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/utils/statusFormatter.ts b/src/utils/statusFormatter.ts
index 7a1f7a9..64ebebc 100644
--- a/src/utils/statusFormatter.ts
+++ b/src/utils/statusFormatter.ts
@@ -1,4 +1,18 @@
-// copy to vben-admin
+
+const DevStateOptions = [
+ {label: "绌洪棽", value: 0},
+ {label: "宸查鐢�", value: 5},
+ {label: "宸茶鏈�", value: 10},
+ {label: "宸查仐澶�", value: 20},
+ {label: "寰呯淮淇�", value: 30},
+ {label: "缁翠慨涓�", value: 40},
+ {label: "宸叉姤搴�", value: 50}
+]
+
+export const tranlateDevState = (state) => {
+ const stateOption = DevStateOptions.find(obj => obj.value === state)
+ return undefined !== stateOption ? stateOption.label : ''
+}
export const queueStatusConvert = (status: number) => {
if (5 === status)
diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index 4e20cc8..d6a483c 100644
--- a/src/views/ecg/devmanage/index.vue
+++ b/src/views/ecg/devmanage/index.vue
@@ -136,6 +136,8 @@
</template>
</el-table-column>
<el-table-column label="閲囪喘鏃ユ湡" align="center" prop="purchaseDate" :formatter="dateFormatter2" width="120px"/>
+ <el-table-column label="鐘舵�佹棩鏈�" align="center" prop="stateDate" :formatter="dateFormatter2" width="120px"/>
+<!--
<el-table-column
label="鍒涘缓鏃堕棿"
align="center"
@@ -143,6 +145,7 @@
:formatter="dateFormatter2"
width="180px"
/>
+-->
<el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template #default="scope">
<el-button
@@ -188,6 +191,7 @@
<script setup lang="ts">
import {getStrDictOptions, DICT_TYPE, DictDataType} from '@/utils/dict'
import {dateFormatter2} from '@/utils/formatTime'
+import {tranlateDevState} from "@/utils/statusFormatter";
import download from '@/utils/download'
import {DeviceApi, DeviceVO, DevModelApi, OptionsVO} from '@/api/ecg/devmanage'
import DeviceForm from './DeviceForm.vue'
@@ -275,22 +279,6 @@
} finally {
exportLoading.value = false
}
-}
-
-const stateOptions = [
- {label: "绌洪棽", value: 0},
- {label: "宸查鐢�", value: 5},
- {label: "宸茶鏈�", value: 10},
- {label: "宸查仐澶�", value: 20},
- {label: "寰呯淮淇�", value: 30},
- {label: "缁翠慨涓�", value: 40},
- {label: "宸叉姤搴�", value: 50}
- ]
-
-const tranlateDevState = (state) => {
- const stateOption = stateOptions.find(obj => obj.value === state)
- console.info( stateOption )
- return undefined !== stateOption ? stateOption.label : ''
}
const categoryChanged = async () => {
--
Gitblit v1.9.3