From f5858de70715d2c22aac42deddfaec871cb660fc Mon Sep 17 00:00:00 2001
From: liuhr <liuhr@taisoft.com.cn>
Date: Sat, 15 Jun 2024 16:54:06 +0800
Subject: [PATCH] =?UTF-8?q?[FEAT]:=201.=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=202.=E8=B0=83=E6=95=B4=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=8A=A5=E8=A1=A8=203.=E8=B0=83=E6=95=B4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Utils/helper.ts                           |  14 ++
 .../device/components/devicePointDialog.vue   |  17 +-
 .../device/components/equipmentDialog.vue     |  14 +-
 .../equipment/components/addOrEditDialog.vue  |  13 +-
 src/pages/equipment/index.vue                 |  15 +-
 src/pages/screen/screen1/index.vue            | 147 +++------------
 src/pages/screen/screen2/index.vue            |   6 +-
 src/pages/screen/screen3/index.vue            | 171 ++++--------------
 src/pages/screen/screen4/index.vue            |   9 +-
 9 files changed, 120 insertions(+), 286 deletions(-)

diff --git a/src/Utils/helper.ts b/src/Utils/helper.ts
index 0a0adc5..57ac44c 100644
--- a/src/Utils/helper.ts
+++ b/src/Utils/helper.ts
@@ -557,4 +557,18 @@ export default class helper {
     return textStatus;
     };
 
+  // 设备类型（Homegrown 国产炉 Import 进口炉）
+  static getEquipmentType = (val: any) => {
+    let text = '';
+    switch (val) {
+      case 'Homegrown':
+        text = '国产炉';
+        break;
+      case 'Import':
+        text = '进口炉';
+        break;
+    }
+    return text;
+  };
+
 }
diff --git a/src/pages/device/components/devicePointDialog.vue b/src/pages/device/components/devicePointDialog.vue
index b94912d..3b1f068 100644
--- a/src/pages/device/components/devicePointDialog.vue
+++ b/src/pages/device/components/devicePointDialog.vue
@@ -65,12 +65,12 @@
             <q-separator />
             <q-card-section style="width: 90vw" class="scroll">
                 <q-table class="my-sticky-header-column-table" :rows="tableData" row-key="id" separator="cell"
-                    :loading="loading" :columns="columns" v-model:pagination="pagination" :table-style="{ height: '500px' }"
-                    @request="onRequest" flat bordered>
+                    :loading="loading" :columns="columns" v-model:pagination="pagination"
+                    :table-style="{ height: '500px' }" @request="onRequest" flat bordered>
                     <template v-slot:body="props">
                         <q-tr :props="props" class="tr_hover">
                             <q-td style="font-size: 16px;" key="index" :props="props">{{ props.rowIndex + 1
-                            }}</q-td>
+                                }}</q-td>
                             <q-td key="deviceCode" :props="props">{{
                                 props.row.deviceCode
                             }}</q-td>
@@ -79,8 +79,10 @@
                             }}</q-td>
                             <q-td key="equipmentCode" :props="props">{{ props.row.equipmentCode }}</q-td>
                             <q-td key="equipmentName" :props="props">{{ props.row.equipmentName }}</q-td>
-                            <q-td key="equipmentType" :props="props">{{ props.row.equipmentType }}</q-td>
-                            <q-td key="actionType" :props="props">{{ helper.getActionType(props.row.actionType) }}</q-td>
+                            <q-td key="equipmentType" :props="props">{{ helper.getEquipmentType(props.row.equipmentType)
+                                }}</q-td>
+                            <q-td key="actionType" :props="props">{{ helper.getActionType(props.row.actionType)
+                                }}</q-td>
                             <q-td key="pointCode" :props="props">
                                 {{ props.row.pointCode }}
                             </q-td>
@@ -177,9 +179,8 @@ const pagination = ref(new Pagination(new DeivcePointSearchEntity()));
 //公共变量
 const deviceInfo = ref();
 const equipmentTypeList = ref([
-    { label: 'Ionbond', value: 'Ionbond' },
-    { label: 'Balzers', value: 'Balzers' },
-    { label: 'CemeCon', value: 'CemeCon' },
+    { label: '国产炉', value: 'Homegrown' },
+    { label: '进口炉', value: 'Import' }
 ])
 const activatedList = ref([
     { label: '启用', value: true },
diff --git a/src/pages/device/components/equipmentDialog.vue b/src/pages/device/components/equipmentDialog.vue
index d835ea0..0ceddac 100644
--- a/src/pages/device/components/equipmentDialog.vue
+++ b/src/pages/device/components/equipmentDialog.vue
@@ -35,8 +35,8 @@
                         <q-input dense label="设备名称" outlined v-model="equipmentSearchEntity.equipmentName" />
                     </div>
                     <div class="col-xl-2 col-lg-2 col-sm-12">
-                        <q-select dense outlined v-model="equipmentSearchEntity.equipmentType" :options="equipmentTypeList"
-                            emit-value map-options label="设备类型" />
+                        <q-select dense outlined v-model="equipmentSearchEntity.equipmentType"
+                            :options="equipmentTypeList" emit-value map-options label="设备类型" />
                     </div>
                     <div class="col-xl-2 col-lg-2 col-sm-12">
                         <q-select dense outlined v-model="equipmentSearchEntity.activated" :options="activatedList"
@@ -57,10 +57,11 @@
                     <template v-slot:body="props">
                         <q-tr :props="props" class="tr_hover">
                             <q-td style="font-size: 16px;" key="index" :props="props">{{ props.rowIndex + 1
-                            }}</q-td>
+                                }}</q-td>
                             <q-td key="equipmentCode" :props="props">{{ props.row.equipmentCode }}</q-td>
                             <q-td key="equipmentName" :props="props">{{ props.row.equipmentName }}</q-td>
-                            <q-td key="equipmentType" :props="props">{{ props.row.equipmentType }}</q-td>
+                            <q-td key="equipmentType" :props="props">{{ helper.getEquipmentType(props.row.equipmentType)
+                                }}</q-td>
                             <q-td key="state" :props="props">
                                 <q-badge style="font-size: 18px;height:30px;"
                                     :color="helper.getEquipmentState(props.row.state).color"
@@ -99,9 +100,8 @@ const emit = defineEmits(['returnEquipment']);
 
 //公共变量
 const equipmentTypeList = ref([
-    { label: 'Ionbond', value: 'Ionbond' },
-    { label: 'Balzers', value: 'Balzers' },
-    { label: 'CemeCon', value: 'CemeCon' },
+    { label: '国产炉', value: 'Homegrown' },
+    { label: '进口炉', value: 'Import' }
 ])
 const activatedList = ref([
     { label: '启用', value: true },
diff --git a/src/pages/equipment/components/addOrEditDialog.vue b/src/pages/equipment/components/addOrEditDialog.vue
index c11cce8..3e09431 100644
--- a/src/pages/equipment/components/addOrEditDialog.vue
+++ b/src/pages/equipment/components/addOrEditDialog.vue
@@ -39,7 +39,8 @@
                             { label: '否', value: false }]" emit-value map-options label="是否报警" />
                         </div>
                         <div class="col-xl-6 col-lg-12 col-sm-12">
-                            <q-input class="text-h6" type="number" outlined v-model="addOrEditFormData.ordrNo" label="排序"
+                            <q-input class="text-h6" type="number" outlined v-model="addOrEditFormData.ordrNo"
+                                label="排序"
                                 :rules="[(val) => (val != null && val != undefined && val != '') || '请填写排序']">
                                 <template v-slot:append>
                                     <q-btn icon="info" round flat color="info" @click="cfgClick">
@@ -84,9 +85,8 @@ const emit = defineEmits(['refresh']);
 const isAlarmFlag = ref(false);
 
 const equipmentTypeList = ref([
-    { label: 'Ionbond', value: 'Ionbond' },
-    { label: 'Balzers', value: 'Balzers' },
-    { label: 'CemeCon', value: 'CemeCon' },
+    { label: '国产炉', value: 'Homegrown' },
+    { label: '进口炉', value: 'Import' }
 ])
 
 const activatedList = ref([
@@ -95,9 +95,8 @@ const activatedList = ref([
 ])
 
 const remarkList = ref([
-    { label: 'Ionbond', value: 'Ionbond' },
-    { label: 'Balzers', value: 'Balzers' },
-    { label: 'CemeCon', value: 'CemeCon' }
+    { label: '第一', value: '第一' },
+    { label: '第二', value: '第二' }
 ])
 
 const modelList = ref([
diff --git a/src/pages/equipment/index.vue b/src/pages/equipment/index.vue
index d79e4c1..407b747 100644
--- a/src/pages/equipment/index.vue
+++ b/src/pages/equipment/index.vue
@@ -49,7 +49,7 @@
                             <template v-slot:body="props">
                                 <q-tr :props="props" class="tr_hover">
                                     <q-td style="font-size: 16px;" key="index" :props="props">{{ props.rowIndex + 1
-                                    }}</q-td>
+                                        }}</q-td>
                                     <q-td style="font-size: 16px;" key="equipmentCode" :props="props">{{
                                         props.row.equipmentCode
                                     }}</q-td>
@@ -57,7 +57,7 @@
                                         props.row.equipmentName
                                     }}</q-td>
                                     <q-td style="font-size: 16px;" key="equipmentType" :props="props">{{
-                                        props.row.equipmentType
+                                        helper.getEquipmentType(props.row.equipmentType)
                                     }}</q-td>
                                     <q-td style="font-size: 16px;" key="state" :props="props"><q-badge
                                             style="font-size: 18px;height:30px;"
@@ -82,9 +82,11 @@
                                             :color="props.row.activated == true ? 'green' : 'red'"
                                             :label="props.row.activated == true ? '启用' : '停用'" />
                                     </q-td>
-                                    <q-td style="font-size: 16px;" key="remark" :props="props">{{ props.row.remark }}</q-td>
+                                    <q-td style="font-size: 16px;" key="remark" :props="props">{{ props.row.remark
+                                        }}</q-td>
                                     <q-td key="action" :props="props" style="width: 100px">
-                                        <q-btn round flat push color="info" icon="edit" @click="addOrEditForm(props.row)">
+                                        <q-btn round flat push color="info" icon="edit"
+                                            @click="addOrEditForm(props.row)">
                                             <q-tooltip content-class="bg-amber text-black shadow-4" :offset="[10, 10]"
                                                 content-style="font-size: 12px">编辑这条数据</q-tooltip>
                                         </q-btn>
@@ -121,9 +123,8 @@ import helper from 'src/Utils/helper';
 
 //公共
 const equipmentTypeList = ref([
-    { label: 'Ionbond', value: 'Ionbond' },
-    { label: 'Balzers', value: 'Balzers' },
-    { label: 'CemeCon', value: 'CemeCon' },
+    { label: '国产炉', value: 'Homegrown' },
+    { label: '进口炉', value: 'Import' }
 ])
 const activatedList = ref([
     { label: '启用', value: true },
diff --git a/src/pages/screen/screen1/index.vue b/src/pages/screen/screen1/index.vue
index f7ea567..50e5dd6 100644
--- a/src/pages/screen/screen1/index.vue
+++ b/src/pages/screen/screen1/index.vue
@@ -105,7 +105,7 @@
                                                                 }}</q-td>
                                                         </q-tr>
                                                     </template>
-                                                </q-table> -->
+</q-table> -->
 
                                         <table style="width: 100%; ">
                                             <thead>
@@ -116,16 +116,16 @@
                                                 </tr>
                                             </thead>
                                         </table>
-                                        <vue3-seamless-scroll :list="list" :step="0.3" :hover="true" :limitScrollNum="18"
-                                            class="scroll">
+                                        <vue3-seamless-scroll :list="list" :step="0.3" :hover="true"
+                                            :limitScrollNum="18" class="scroll">
                                             <table style="width: 100%;">
                                                 <tbody>
                                                     <tr v-for="(item, index) in list" :key="index" class="item">
                                                         <td class="text-center" style="width:10%;">{{ index + 1 }}</td>
                                                         <td class="text-center" style="width:40%;">{{ item.equipmentCode
-                                                        }}</td>
+                                                            }}</td>
                                                         <td class="text-center" style="width:40%;">{{ item.equipmentName
-                                                        }}</td>
+                                                            }}</td>
                                                     </tr>
                                                 </tbody>
                                             </table>
@@ -257,23 +257,19 @@ const getEquipmentAlarmList = () => {
 // 设备运行状态总览
 const EquipmentStateView = () => {
     let All: any = [];
-    let Balzers: any = [];
-    let CemeCon: any = [];
-    let Ionbond: any = [];
+    let Homegrown: any = [];
+    let Import: any = [];
 
     // 获取设备总览
     equipmentRecordApi.getEquipmentStateView().then((res: any) => {
         res.forEach((item: any) => {
             if (item.equipmentType == 'All') {
                 All.push(item.run, item.stop, item.alarm);
-            } else if (item.equipmentType == 'Balzers') {
-                Balzers.push(item.run, item.stop, item.alarm);
+            } else if (item.equipmentType == 'Homegrown') {
+                Homegrown.push(item.run, item.stop, item.alarm);
             }
-            else if (item.equipmentType == 'CemeCon') {
-                CemeCon.push(item.run, item.stop, item.alarm);
-            }
-            else if (item.equipmentType == 'Ionbond') {
-                Ionbond.push(item.run, item.stop, item.alarm);
+            else if (item.equipmentType == 'Import') {
+                Import.push(item.run, item.stop, item.alarm);
             }
         });
 
@@ -297,7 +293,7 @@ const EquipmentStateView = () => {
                     }
                 },
                 {
-                    subtext: 'Balzers',
+                    subtext: '国产炉',
                     left: '75%',
                     top: '45%',
                     textAlign: 'center',
@@ -308,7 +304,7 @@ const EquipmentStateView = () => {
                     }
                 },
                 {
-                    subtext: 'CemeCon',
+                    subtext: '进口炉',
                     left: '25%',
                     top: '90%',
                     textAlign: 'center',
@@ -317,17 +313,6 @@ const EquipmentStateView = () => {
                         fontSize: 18,
                         fontWeight: 'bold'
                     }
-                },
-                {
-                    subtext: 'Ionbond',
-                    left: '75%',
-                    top: '90%',
-                    textAlign: 'center',
-                    subtextStyle: {
-                        color: '#000',
-                        fontSize: 18,
-                        fontWeight: 'bold'
-                    }
                 }
             ],
             legend: {
@@ -344,16 +329,14 @@ const EquipmentStateView = () => {
             },
             dataset: {
                 source: {
-                    // product: ['All', 'Balzers', 'CemeCon', 'Ionbond'],
+                    // product: ['All', 'Homegrown', 'Import'],
                     product: ['运行', '停机', '报警'],
                     All,
-                    Balzers,
-                    CemeCon,
-                    Ionbond,
+                    Homegrown,
+                    Import,
                     // All: [11, 21, 31],
-                    // Balzers: [41, 51, 61],
-                    // CemeCon: [71, 81, 91],
-                    // Ionbond: [10, 11, 12]
+                    // Homegrown: [41, 51, 61],
+                    // Import: [71, 81, 91]
                 }
             },
             series: [
@@ -384,7 +367,7 @@ const EquipmentStateView = () => {
                     center: ['75%', '28%'],
                     encode: {
                         itemName: 'product',
-                        value: 'Balzers'
+                        value: 'Homegrown'
                     },
                     label: {
                         normal: {
@@ -403,7 +386,7 @@ const EquipmentStateView = () => {
                     center: ['25%', '73%'],
                     encode: {
                         itemName: 'product',
-                        value: 'CemeCon'
+                        value: 'Import'
                     },
                     label: {
                         normal: {
@@ -415,25 +398,6 @@ const EquipmentStateView = () => {
                             // formatter: '{@[3]} 台 \n {d} %'
                         }
                     }
-                },
-                {
-                    type: 'pie',
-                    radius: '38%',
-                    center: ['75%', '73%'],
-                    encode: {
-                        itemName: 'product',
-                        value: 'Ionbond'
-                    },
-                    label: {
-                        normal: {
-                            fontSize: '16px',
-                            color: '#fff',
-                            show: true,
-                            position: 'inside', // 在内部显示，outseide 是在外部显示
-                            formatter: '{@[4]} 台'
-                            // formatter: '{@[4]} 台 \n {d} %'
-                        }
-                    }
                 }
             ]
         };
@@ -787,42 +751,12 @@ const EquipmentRecordOEEMonthTotal = () => {
 
 // 月度开炉次数统计
 const EquipmentRecordFurnaceMonthTotal = () => {
-    let Balzers: any = [];
-    let CemeCon: any = [];
-    let Ionbond: any = [];
     let month: any = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
     let result: Array<object> = [];
 
     // 获取设备记录开炉次数月统计
     equipmentRecordApi.getEquipmentRecordFurnaceMonthTotal().then((res: any) => {
-        // month.forEach((m: any) => {
-        //     res.forEach((item: any) => {
-        //         if (item.totalMonth == m) {
-        //             if (item.equipmentType == 'Balzers') {
-        //                 Balzers.push(item.furnaceNum);
-        //             }
-        //             if (item.equipmentType == 'CemeCon') {
-        //                 CemeCon.push(item.furnaceNum);
-        //             }
-        //             if (item.equipmentType == 'Ionbond') {
-        //                 Ionbond.push(item.furnaceNum);
-        //             }
-        //         } else {
-        //             if (item.equipmentType == 'Balzers') {
-        //                 Balzers.push(0);
-        //             }
-        //             if (item.equipmentType == 'CemeCon') {
-        //                 CemeCon.push(0);
-        //             }
-        //             if (item.equipmentType == 'Ionbond') {
-        //                 Ionbond.push(0);
-        //             }
-        //         }
-        //     })
-        // })
-
-        // let grouped_data = lodash.groupBy(res, 'totalMonth');
-        // console.log(grouped_data);
+        debugger
 
         var obj = {}, newArr = [];
         res.forEach(function (item, suffix) {
@@ -844,15 +778,13 @@ const EquipmentRecordFurnaceMonthTotal = () => {
 
         newArr.forEach((item: any) => {
             let CemeCon = item.filter(c => {
-                return c.equipmentType == 'CemeCon'
+                return c.equipmentType == 'Homegrown'
             })
-            let Balzers = item.filter(b => { return b.equipmentType == 'Balzers' })
-            let Ionbond = item.filter(i => { return i.equipmentType == 'Ionbond' })
+            let Balzers = item.filter(b => { return b.equipmentType == 'Import' })
             result.push({
                 product: item[0].totalMonth + '月',
-                CemeCon: CemeCon[0].furnaceNum,
-                Balzers: Balzers[0].furnaceNum,
-                Ionbond: Ionbond[0].furnaceNum,
+                Homegrown: CemeCon[0].furnaceNum,
+                Import: Balzers[0].furnaceNum,
             })
         })
 
@@ -876,7 +808,7 @@ const EquipmentRecordFurnaceMonthTotal = () => {
                 // left: 0,
                 right: '2%',
                 top: 1,
-                data: ['Balzers', 'CemeCon', 'Ionbond']
+                data: ['Homegrown', 'Import']
             },
             // grid: {
             //     top: '5%',
@@ -934,33 +866,13 @@ const EquipmentRecordFurnaceMonthTotal = () => {
                 }
             },
             dataset: {
-                dimensions: ['product', 'Balzers', 'CemeCon', 'Ionbond'],
+                dimensions: ['product', 'Homegrown', 'Import'],
                 source: result
             },
             series: [
                 {
-                    name: 'Balzers',
-                    type: 'bar',
-                    // data: Balzers,
-                    itemStyle: {
-                        normal: {
-                            label: {
-                                color: '#000',
-                                position: 'top', //在上方显示
-                                show: true // 在折线拐点上显示数据
-                            },
-                        }
-                    },
-                    tooltip: {
-                        valueFormatter: function (value: any) {
-                            return value + ' 次';
-                        }
-                    }
-                },
-                {
-                    name: 'CemeCon',
+                    name: 'Homegrown',
                     type: 'bar',
-                    // data: CemeCon,
                     itemStyle: {
                         normal: {
                             label: {
@@ -977,9 +889,8 @@ const EquipmentRecordFurnaceMonthTotal = () => {
                     }
                 },
                 {
-                    name: 'Ionbond',
+                    name: 'Import',
                     type: 'bar',
-                    // data: Ionbond,
                     itemStyle: {
                         normal: {
                             label: {
diff --git a/src/pages/screen/screen2/index.vue b/src/pages/screen/screen2/index.vue
index f1fe268..6aeca46 100644
--- a/src/pages/screen/screen2/index.vue
+++ b/src/pages/screen/screen2/index.vue
@@ -75,7 +75,7 @@
                                 <q-td style="font-size: 16px;" key="equipmentName" :props="props">{{
                                     props.row.equipmentName }}</q-td>
                                 <q-td style="font-size: 16px;" key="equipmentType" :props="props">{{
-                                    props.row.equipmentType }}</q-td>
+                                    helper.getEquipmentType(props.row.equipmentType) }}</q-td>
                                 <q-td style="font-size: 16px;" key="state" :props="props">
                                     <q-badge style="font-size: 18px;height:30px;"
                                         :color="helper.getEquipmentState(props.row.state).color"
@@ -102,7 +102,7 @@ import { onMounted, ref } from 'vue';
 import { Notify, Screen, date, Platform, exportFile, Loading, Dialog, QSpinnerIos } from 'quasar';
 import * as XLSX from 'XLSX'
 import { Pagination, cconvert } from 'src/api/class';
-import helper from 'src/Utils/helper'
+import helper from 'src/Utils/helper';
 import { EquipmentSearchEntity } from 'src/api/equipment/model/equipment'
 import { equipmentApi } from 'src/api/equipment/equipmentApi';
 import { EquipmentRecord } from 'src/api/equipmentRecord/model/equipmentRecord'
@@ -508,7 +508,7 @@ const exportTable = () => {
                         index + 1,
                         item.equipmentCode,
                         item.equipmentName,
-                        item.equipmentType,
+                        helper.getEquipmentType(item.equipmentType),
                         helper.getEquipmentState(item.state).text,
                         item.startTime,
                         item.endTime,
diff --git a/src/pages/screen/screen3/index.vue b/src/pages/screen/screen3/index.vue
index b3d95fa..d8c43a8 100644
--- a/src/pages/screen/screen3/index.vue
+++ b/src/pages/screen/screen3/index.vue
@@ -20,13 +20,13 @@
                                     <q-td key="total" :props="props">{{ props.row.total }}</q-td>
                                 </q-tr>
                             </template>
-                        </q-table> -->
+</q-table> -->
 
-                <div class="col-xs-6 col-xl-6 col-lg-6 col-sm-6">
+                <div class="col-xs-5 col-xl-5 col-lg-5 col-sm-5">
                     <q-card class="my-card">
                         <q-card-section class="row q-pa-xs">
-                            <template v-for="(item, index) in BalzersList" v-bind:key="item">
-                                <div class="q-pa-xs col-xs-4 col-xl-4 col-lg-4 col-sm-4">
+                            <template v-for="(item, index) in list1" v-bind:key="item">
+                                <div class="q-pa-xs col-xs-6 col-xl-6 col-lg-6 col-sm-6">
                                     <q-card :class="'my-card no-shadow ' + helper.getEquipmentStateColor(item.state)"
                                         :bordered="item.id != ''" :flat="item.id == ''" style="height:70px;">
                                         <q-card-section>
@@ -49,31 +49,25 @@
                                 </div>
                             </template>
                         </q-card-section>
-                        <!-- <q-card-section>
-                                <div class="text-h6 text-weight-bold text-center ">第四涂层室</div>
-                            </q-card-section> -->
+                        <q-card-section>
+                            <div class="text-h6 text-weight-bold text-center ">第一</div>
+                        </q-card-section>
                     </q-card>
                 </div>
                 <div class="col-xs-2 col-xl-2 col-lg-2 col-sm-2">
-                    <q-card class="my-card">
+                    <q-card class="my-card" style="background-color: #73cb9b;">
                         <q-card-section class="row q-pa-xs">
-                            <template v-for="(item, index) in list2" v-bind:key="item">
+                            <template v-for="(item, index) in guodao" v-bind:key="item">
                                 <div class="q-pa-xs col-xs-12 col-xl-12 col-lg-12 col-sm-12">
                                     <q-card :class="'my-card no-shadow ' + helper.getEquipmentStateColor(item.state)"
-                                        :bordered="item.id != ''" :flat="item.id == ''" style="height:70px;">
+                                        :flat="item.id == ''" style="height:70px;background-color: #73cb9b;">
                                         <q-card-section class="col-xs-3 col-xl-3 col-lg-4 col-sm-12 ">
                                             <div class="row q-col-gutter-md items-center">
                                                 <div class="col-xl-9 col-lg-9 col-sm-9">
-                                                    <div class="text-h5 text-weight-bold "> {{ item.equipmentName }}
-                                                    </div>
+
                                                 </div>
                                                 <div class="col-xl-2 col-lg-2 col-sm-2">
-                                                    <q-btn flat round color="dark" icon="visibility" v-show="item.id != ''"
-                                                        @click="openView(item)">
-                                                        <q-tooltip class="text-body2" :offset="[10, 10]">
-                                                            查看设备详情
-                                                        </q-tooltip>
-                                                    </q-btn>
+
                                                 </div>
                                             </div>
                                         </q-card-section>
@@ -81,21 +75,21 @@
                                 </div>
                             </template>
                         </q-card-section>
-                        <!-- <q-card-section>
-                                <div class=" text-h6 text-weight-bold text-center ">第三涂层室</div>
-                            </q-card-section> -->
+                        <q-card-section>
+                            <div class=" text-h6 text-weight-bold text-center ">过道</div>
+                        </q-card-section>
                     </q-card>
                 </div>
-                <div class=" col-xs-4 col-xl-4 col-lg-4 col-sm-4">
+                <div class=" col-xs-5 col-xl-5 col-lg-5 col-sm-5">
                     <q-card class="my-card">
                         <q-card-section class="row q-pa-xs">
-                            <template v-for="(item, index) in list3" v-bind:key="item">
-                                <div class="q-pa-xs col-xs-6 col-xl-6 col-lg-6 col-sm-6">
-                                    <q-card :class="'my-card no-shadow ' + helper.getEquipmentStateColor(item.state)"
+                            <template v-for="(item, index) in list2" v-bind:key="item">
+                                <div class="q-pa-xs col-xs-6 col-xl-6 col-lg-6 col-sm-6 ">
+                                    <q-card :class="'my-card no-shadow  ' + helper.getEquipmentStateColor(item.state)"
                                         :bordered="item.id != ''" :flat="item.id == ''" style="height:70px;">
-                                        <q-card-section class="col-xs-3 col-xl-3 col-lg-4 col-sm-12 ">
+                                        <q-card-section class="col-xs-3 col-xl-3 col-lg-4 col-sm-12  ">
                                             <div class="row q-col-gutter-md items-center">
-                                                <div class="col-xl-9 col-lg-9 col-sm-9">
+                                                <div class="col-xl-10 col-lg-10 col-sm-10">
                                                     <div class="text-h5 text-weight-bold ">
                                                         {{ item.equipmentName }}
                                                     </div>
@@ -114,46 +108,12 @@
                                 </div>
                             </template>
                         </q-card-section>
-                        <!-- <q-card-section>
-                                <div class="text-h6 text-weight-bold text-center ">
-                                    第二涂层室</div>
-                            </q-card-section> -->
+                        <q-card-section>
+                            <div class="text-h6 text-weight-bold text-center ">第二
+                            </div>
+                        </q-card-section>
                     </q-card>
                 </div>
-                <!-- <div class=" col-xs-4 col-xl-4 col-lg-4 col-sm-4">
-                        <q-card class="my-card">
-                            <q-card-section class="row q-pa-xs">
-                                <template v-for="(item, index) in list4" v-bind:key="item">
-                                    <div class="q-pa-xs col-xs-6 col-xl-6 col-lg-6 col-sm-6 ">
-                                        <q-card :class="'my-card no-shadow  ' + helper.getEquipmentStateColor(item.state)"
-                                            :bordered="item.id != ''" :flat="item.id == ''" style="height:70px;">
-                                            <q-card-section class="col-xs-3 col-xl-3 col-lg-4 col-sm-12  ">
-                                                <div class="row q-col-gutter-md items-center">
-                                                    <div class="col-xl-10 col-lg-10 col-sm-10">
-                                                        <div class="text-h5 text-weight-bold ">
-                                                            {{ item.equipmentName }}
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-xl-2 col-lg-2 col-sm-2">
-                                                        <q-btn flat round color="dark" icon="visibility"
-                                                            v-show="item.state != ''" @click="openView(item)">
-                                                            <q-tooltip class="text-body2" :offset="[10, 10]">
-                                                                查看设备详情
-                                                            </q-tooltip>
-                                                        </q-btn>
-                                                    </div>
-                                                </div>
-                                            </q-card-section>
-                                        </q-card>
-                                    </div>
-                                </template>
-                            </q-card-section>
-                            <q-card-section>
-                                <div class="text-h6 text-weight-bold text-center ">第一涂层室
-                                </div>
-                            </q-card-section>
-                        </q-card>
-                    </div> -->
 
             </div>
         </q-card-section>
@@ -204,10 +164,9 @@ import { useScreenStore } from 'src/stores/useScreenStore'
 // ])
 
 const screenStore = useScreenStore();
-const BalzersList = ref();
+const guodao = ref(11);
+const list1 = ref();
 const list2 = ref();
-const list3 = ref();
-const list4 = ref();
 const equipmentSearchEntity = ref(new EquipmentSearchEntity());
 let equipmentListTimer: NodeJS.Timer | null = null; // 设备列表
 
@@ -228,8 +187,6 @@ onBeforeUnmount(() => {
 const EquipmentList = () => {
     let Coating1 = [] as any
     let Coating2 = [] as any
-    let Coating3 = [] as any
-    let BalzersCoating = [] as any
     let templateJSON = {
         id: '',
         equipmentCode: null,
@@ -244,21 +201,17 @@ const EquipmentList = () => {
     // 设备状态,运行:Run，待机:Stop，报警:Alarm
     equipmentApi.getEquipmentList(equipmentSearchEntity.value).then((res: any) => {
         res.forEach((item: any) => {
-            if (item.remark == '第一涂层室') {
+            if (item.remark == '第一') {
                 Coating1.push(item);
-            } else if (item.remark == 'CemeCon') {
+            } else if (item.remark == '第二') {
                 Coating2.push(item);
-            } else if (item.remark == 'Ionbond') {
-                Coating3.push(item);
-            } else if (item.remark == 'Balzers') {
-                BalzersCoating.push(item);
             }
         });
 
-        // 第一涂层室
+        // 第一
         Coating1.sort((a: any, b: any) => a.ordrNo - b.ordrNo);
         let Coating1Val = [] as any
-        for (let i = 1; i <= 14; i++) {
+        for (let i = 1; i <= 22; i++) {
             for (let j = 0; j < Coating1.length; j++) {
                 if (Coating1[j].ordrNo == i) {
                     Coating1Val.push(Coating1[j])
@@ -270,16 +223,12 @@ const EquipmentList = () => {
                 }
             }
         }
-        // var obj4 = JSON.parse(JSON.stringify(screen3_4)); //由JSON字符串转换为JSON对象
-        // obj4.splice(0, 0, templateJSON);
-        // obj4.splice(4, 0, templateJSON);
-        // obj4.splice(10, 0, templateJSON, templateJSON);
-        list4.value = Coating1Val //obj4
+        list1.value = Coating1Val //obj4
 
-        // 第二涂层室
+        // 第二
         Coating2.sort((a: any, b: any) => a.ordrNo - b.ordrNo);
         let Coating2Val = [] as any
-        for (let i = 1; i <= 18; i++) {
+        for (let i = 1; i <= 22; i++) {
             for (let j = 0; j < Coating2.length; j++) {
                 if (Coating2[j].ordrNo == i) {
                     Coating2Val.push(Coating2[j])
@@ -299,54 +248,12 @@ const EquipmentList = () => {
         // obj3.splice(7, 0, templateJSON);
         // obj3.splice(10, 0, templateJSON);
         // obj3.splice(11, 0, templateJSON);
-        list3.value = Coating2Val //obj3
-
-
-        // 第三涂层室
-        Coating3.sort((a: any, b: any) => a.ordrNo - b.ordrNo);
-        let Coating3Val = [] as any
-        for (let i = 1; i <= 9; i++) {
-            for (let j = 0; j < Coating3.length; j++) {
-                if (Coating3[j].ordrNo == i) {
-                    Coating3Val.push(Coating3[j])
-                    Coating3.splice(j, 1);
-                    break
-                } else {
-                    Coating3Val.push(templateJSON)
-                    break
-                }
-            }
+        debugger
+        for (let i = 1; Coating2Val.length < 22; i++) {
+            debugger
+            Coating2Val.push(templateJSON)
         }
-
-        // var obj2 = JSON.parse(JSON.stringify(screen3_2)); //由JSON字符串转换为JSON对象
-        // obj2.splice(1, 0, templateJSON);
-        // obj2.splice(2, 0, templateJSON);
-        // obj2.splice(5, 0, templateJSON, templateJSON, templateJSON);
-        // obj2.splice(9, 0, templateJSON, templateJSON);
-        // obj2.splice(11, 0, templateJSON);
-        list2.value = Coating3Val  //obj2
-
-        // 第四涂层室 Balzers
-        BalzersCoating.sort((a: any, b: any) => a.ordrNo - b.ordrNo);
-        let BalzersCoatingVal = [] as any
-        for (let i = 1; i <= 27; i++) {
-            for (let j = 0; j < BalzersCoating.length; j++) {
-                if (BalzersCoating[j].ordrNo == i) {
-                    BalzersCoatingVal.push(BalzersCoating[j])
-                    BalzersCoating.splice(j, 1);
-                    break
-                } else {
-                    BalzersCoatingVal.push(templateJSON)
-                    break
-                }
-            }
-        }
-
-        // var obj1 = JSON.parse(JSON.stringify(screen3_1)); //由JSON字符串转换为JSON对象
-        // obj1.splice(0, 0, templateJSON, templateJSON);
-        // obj1.splice(3, 0, templateJSON);
-        // obj1.splice(5, 0, templateJSON);
-        BalzersList.value = BalzersCoatingVal // obj1
+        list2.value = Coating2Val //obj3
 
     })
 }
diff --git a/src/pages/screen/screen4/index.vue b/src/pages/screen/screen4/index.vue
index e7d3666..3107db1 100644
--- a/src/pages/screen/screen4/index.vue
+++ b/src/pages/screen/screen4/index.vue
@@ -77,11 +77,11 @@
                                 <q-td style="font-size: 16px;" key="equipmentName" :props="props">{{
                                     props.row.equipmentName }}</q-td>
                                 <q-td style="font-size: 16px;" key="equipmentType" :props="props">{{
-                                    props.row.equipmentType
-                                    }}</q-td>
+                                    helper.getEquipmentType(props.row.equipmentType)
+                                }}</q-td>
                                 <q-td style="font-size: 16px;" key="furnaceNum" :props="props">{{
                                     props.row.furnaceNum
-                                    }}</q-td>
+                                }}</q-td>
                                 <q-td style="font-size: 16px;" key="totalRunningTime" :props="props">{{
                                     props.row.totalRunningTime }}</q-td>
                                 <q-td style="font-size: 16px;" key="totalAlarmTime" :props="props">{{
@@ -101,6 +101,7 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
 import { Notify, Screen, date, Platform, exportFile, Loading, Dialog, QSpinnerIos } from 'quasar';
+import helper from 'src/Utils/helper';
 import * as XLSX from 'XLSX'
 import { Pagination, cconvert } from 'src/api/class';
 import { EquipmentRecord, EquipmentNoTimeRecord } from 'src/api/equipmentRecord/model/equipmentRecord'
@@ -320,7 +321,7 @@ const exportTable = () => {
                     index + 1,
                     item.equipmentCode,
                     item.equipmentName,
-                    item.equipmentType,
+                    helper.getEquipmentType(item.equipmentType),
                     item.furnaceNum,
                     item.totalRunningTime,
                     item.totalAlarmTime,