From 58d1834923136f63202d466321a63fe5c1e1e4ab Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Thu, 11 Jan 2024 14:15:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operationtimedata108/index.vue                 |  2 +-
 .../operationtimedata90/index.vue                  |  2 +-
 .../operationtimedata108/index.vue                 |  2 +-
 .../hrpuncherdata90/operationtimedata90/index.vue  |  2 +-
 .../hrSizingmilldata108.data.ts                    | 14 +++++++-------
 src/views/pszc/hrsizingmilldata108/index.vue       |  7 +++++++
 .../hrsizingmilldata90/hrSizingmilldata90.data.ts  |  8 ++++----
 src/views/pszc/hrsizingmilldata90/index.vue        |  9 ++++++++-
 8 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/views/pszc/hrelongatordata108/operationtimedata108/index.vue b/src/views/pszc/hrelongatordata108/operationtimedata108/index.vue
index 5a9a593..1a8ef08 100644
--- a/src/views/pszc/hrelongatordata108/operationtimedata108/index.vue
+++ b/src/views/pszc/hrelongatordata108/operationtimedata108/index.vue
@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #iname="{row}">
-        <el-button :type="row.icode == 'Down_Roller_runtime' || row.icode == 'Up_Roller_runtime' ? 'success' : 'warning'" link>
+        <el-button :type="row.icode == 'Down_Roller_runtime' || row.icode == 'Up_Roller_runtime' ? 'success' : 'danger'" link>
           <span>{{ row.iname}}</span>
         </el-button>
       </template>
diff --git a/src/views/pszc/hrelongatordata90/operationtimedata90/index.vue b/src/views/pszc/hrelongatordata90/operationtimedata90/index.vue
index 8fe0183..60f4755 100644
--- a/src/views/pszc/hrelongatordata90/operationtimedata90/index.vue
+++ b/src/views/pszc/hrelongatordata90/operationtimedata90/index.vue
@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #iname="{row}">
-        <el-button :type="row.icode == 'Down_Roller_runtime' || row.icode == 'Up_Roller_runtime' ? 'success' : 'warning'" link>
+        <el-button :type="row.icode == 'Down_Roller_runtime' || row.icode == 'Up_Roller_runtime' ? 'success' : 'danger'" link>
           <span>{{ row.iname}}</span>
         </el-button>
       </template>
diff --git a/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue b/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue
index 10dc6a6..557ba1e 100644
--- a/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue
+++ b/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue
@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #iname="{row}">
-        <el-button :type="row.icode == 'Down_Roller_runtime' || row.icode == 'Up_Roller_runtime' ? 'success' : 'warning'" link>
+        <el-button :type="row.icode == 'Down_Roller_runtime' || row.icode == 'Up_Roller_runtime' ? 'success' : 'danger'" link>
           <span>{{ row.iname}}</span>
         </el-button>
       </template>
diff --git a/src/views/pszc/hrpuncherdata90/operationtimedata90/index.vue b/src/views/pszc/hrpuncherdata90/operationtimedata90/index.vue
index e736bbf..1991abc 100644
--- a/src/views/pszc/hrpuncherdata90/operationtimedata90/index.vue
+++ b/src/views/pszc/hrpuncherdata90/operationtimedata90/index.vue
@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #iname="{row}">
-        <el-button :type="row.icode == 'Up_Roller_runtime' ? 'warning' : 'success'" link>
+        <el-button :type="row.icode == 'Down_Roller_runtime' || row.icode == 'Up_Roller_runtime' ? 'success' : 'danger'" link>
           <span>{{ row.iname}}</span>
         </el-button>
       </template>
diff --git a/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts b/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts
index d83f420..75458c9 100644
--- a/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts
+++ b/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts
@@ -20,11 +20,11 @@ export const HrSizingmilldata108 = 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',
@@ -63,9 +63,9 @@ export const HrSizingmilldata108 = useCrudSchemas(reactive<CrudSchema[]>([
     label: '仪表的名称',
     field: 'mcode',
     isTable: true,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return yqbList.find((obj) => obj.code === cellValue)?.label
-    },
+    // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+    //   return yqbList.find((obj) => obj.code === cellValue)?.label
+    // },
     search: {
       show: true,
       component: 'Select',
diff --git a/src/views/pszc/hrsizingmilldata108/index.vue b/src/views/pszc/hrsizingmilldata108/index.vue
index b15070c..db35929 100644
--- a/src/views/pszc/hrsizingmilldata108/index.vue
+++ b/src/views/pszc/hrsizingmilldata108/index.vue
@@ -31,6 +31,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+      
+      <template #iname="{row}">
+        <el-button :type="row.icode == 'Sizing_hr_stoptime'? 'danger' : 'success'" link>
+          <span>{{ row.iname}}</span>
+        </el-button>
+      </template>
+
       <template #ivalue="{ row }">
         <span>{{ timesFormatter(row.ivalue) }}</span>
       </template>
diff --git a/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts b/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts
index 685fb01..055df3d 100644
--- a/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts
+++ b/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts
@@ -20,11 +20,11 @@ export const HrSizingmilldata90 = 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/hrsizingmilldata90/index.vue b/src/views/pszc/hrsizingmilldata90/index.vue
index 0c19f3b..ae126c7 100644
--- a/src/views/pszc/hrsizingmilldata90/index.vue
+++ b/src/views/pszc/hrsizingmilldata90/index.vue
@@ -27,7 +27,14 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-    <template #ivalue="{ row }">
+
+      <template #iname="{row}">
+        <el-button :type="row.icode == 'Main_start' ? 'danger' : 'success'" link>
+          <span>{{ row.iname}}</span>
+        </el-button>
+      </template>
+      
+       <template #ivalue="{ row }">
         <span>{{ timesFormatter(row.ivalue) }}</span>
       </template>