From bea8beb95f6b5c6c5a4f8cc1fc359205febd5d37 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Wed, 3 Jan 2024 10:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BF=E5=AD=94=E6=9C=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operationtimedata108/hrPuncherdata108.data.ts    |  4 ++--
 .../hrpuncherdata108/operationtimedata108/index.vue  |  6 ++++++
 .../rollcountdata108/hrPuncherdata108.data.ts        |  8 ++++----
 .../rolltimedata108/hrPuncherdata108.data.ts         | 12 ++++++++----
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/views/pszc/hrpuncherdata108/operationtimedata108/hrPuncherdata108.data.ts b/src/views/pszc/hrpuncherdata108/operationtimedata108/hrPuncherdata108.data.ts
index ed53984..a744248 100644
--- a/src/views/pszc/hrpuncherdata108/operationtimedata108/hrPuncherdata108.data.ts
+++ b/src/views/pszc/hrpuncherdata108/operationtimedata108/hrPuncherdata108.data.ts
@@ -23,12 +23,12 @@ export const HrPuncherdata108 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '数据点名称',
-    field: 'icode',
+    field: 'iname',
     isTable: true,
     // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
     //   return sjdList1.find((obj) => obj.value === cellValue)?.label
     // },
-    dictType: DICT_TYPE.pszc_hr_puncherdata108,
+    // dictType: DICT_TYPE.pszc_hr_puncherdata108,
     search: {
       show: true,
       component: 'Select',
diff --git a/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue b/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue
index 9fe555a..e180c75 100644
--- a/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue
+++ b/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue
@@ -27,6 +27,12 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+      <template #iname="{row}">
+        <el-button :type="row.icode == 'Up_Roller_runtime' ? 'warning' : 'success'" link>
+          <span>{{ row.iname }}</span>
+        </el-button>
+      </template>
+
       <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
diff --git a/src/views/pszc/hrpuncherdata108/rollcountdata108/hrPuncherdata108.data.ts b/src/views/pszc/hrpuncherdata108/rollcountdata108/hrPuncherdata108.data.ts
index afa9fb6..96c922e 100644
--- a/src/views/pszc/hrpuncherdata108/rollcountdata108/hrPuncherdata108.data.ts
+++ b/src/views/pszc/hrpuncherdata108/rollcountdata108/hrPuncherdata108.data.ts
@@ -21,11 +21,11 @@ export const HrPuncherdata108 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '数据点名称',
-    field: 'icode',
+    field: 'iname',
     isTable: true,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return sjdList.find((obj) => obj.code === cellValue)?.label
-    },
+    // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+    //   return sjdList.find((obj) => obj.code === cellValue)?.label
+    // },
     // search: {
     //   show: true,
     //   component: 'Select',
diff --git a/src/views/pszc/hrpuncherdata108/rolltimedata108/hrPuncherdata108.data.ts b/src/views/pszc/hrpuncherdata108/rolltimedata108/hrPuncherdata108.data.ts
index de008b2..a337407 100644
--- a/src/views/pszc/hrpuncherdata108/rolltimedata108/hrPuncherdata108.data.ts
+++ b/src/views/pszc/hrpuncherdata108/rolltimedata108/hrPuncherdata108.data.ts
@@ -3,6 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import { TableColumn } from '@/types/table'
 import * as PszcCommonApi from '@/api/pszc/pszccommon'
 import * as DictApi from '@/utils/dict'
+import { number } from 'echarts'
 // 数据点
 // const sjdList = await PszcCommonApi.selectHr108Pros({flag: '3' , type: '1',module:'2'})
 const  sjdList = DictApi.getStrDictOptions(DICT_TYPE.pszc_hr_puncherdata108_roll);
@@ -22,11 +23,11 @@ export const HrPuncherdata108 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '数据点名称',
-    field: 'icode',
+    field: 'iname',
     isTable: true,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return sjdList.find((obj) => obj.value === cellValue)?.label
-    },
+    // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+    //   return sjdList.find((obj) => obj.value === cellValue)?.label
+    // },
     search: {
       show: true,
       component: 'Select',
@@ -54,6 +55,9 @@ export const HrPuncherdata108 = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'ivalue',
     sort: 'custom',
     isSearch: false,
+    formatter: (row,column,cellValue) => {
+      return cellValue+"秒"
+    },
   },
   {
     label: '仪表的编号',