From a545692e338c3dde86b156c6fb260cec7062d5bd Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Wed, 24 Jul 2024 20:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7-=E4=BE=BF?=
 =?UTF-8?q?=E6=90=BA=E5=BC=8F=E8=AE=BE=E5=A4=87-=E6=9A=82=E6=80=81?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../govern/device/control/tabs/event.vue      | 67 ++++++++++++++-----
 1 file changed, 52 insertions(+), 15 deletions(-)

diff --git a/src/views/govern/device/control/tabs/event.vue b/src/views/govern/device/control/tabs/event.vue
index e32a81c..d88fb74 100644
--- a/src/views/govern/device/control/tabs/event.vue
+++ b/src/views/govern/device/control/tabs/event.vue
@@ -1,7 +1,11 @@
 <template>
     <div class="header_btn">
-        <el-button type="primary" size="small" @click="handleWaveFormAnalysis(0)" v-if="!isWaveCharts">波形解析</el-button>
-        <el-button type="primary" size="small" @click="handleBack" v-if="isWaveCharts" :icon="ArrowLeft">返回</el-button>
+        <el-button type="primary" size="small" @click="handleWaveFormAnalysis(0)" v-if="!isWaveCharts">
+            波形解析
+        </el-button>
+        <el-button type="primary" size="small" @click="handleBack" v-if="isWaveCharts" :icon="ArrowLeft">
+            返回
+        </el-button>
     </div>
     <div class="view">
         <Table ref="tableRef" v-if="!isWaveCharts" />
@@ -14,7 +18,7 @@ import { getTabsDataByType } from '@/api/cs-device-boot/EquipmentDelivery'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import waveFormAnalysis from './components/waveFormAnalysis.vue'
-import {ArrowLeft} from '@element-plus/icons-vue'
+import { ArrowLeft } from '@element-plus/icons-vue'
 const tableParams: any = ref({})
 const tableStore: any = new TableStore({
     url: '/cs-device-boot/csGroup/deviceDataByType',
@@ -23,18 +27,51 @@ const tableStore: any = new TableStore({
     column: [
         // { width: '60', type: 'checkbox', fixed: 'left' },
         { title: '序号', type: 'seq', width: 80 },
-        { field: 'devName', title: '发生时刻', minWidth: 170 },
-        { field: 'lineName', title: '工程名称', minWidth: 170 },
-        { field: 'startTime', title: '项目名称', minWidth: 170 },
-        { field: 'endTime', title: '测试项名称', minWidth: 170 },
-        { field: 'endTime', title: '事件描述', minWidth: 170 },
-        { field: 'endTime', title: '相别', minWidth: 170 },
-        { field: 'endTime', title: '持续时间(s)', minWidth: 170 },
-        { field: 'endTime', title: '暂降幅值(%)', minWidth: 170 },
+        { field: 'startTime', title: '发生时刻', minWidth: 170 },
+        {
+            field: 'gcName',
+            title: '工程名称',
+            minWidth: 170,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
+        { field: 'itemName', title: '测试项名称', minWidth: 170 },
+        { field: 'showName', title: '事件描述', minWidth: 170 },
+        {
+            field: 'phaseType',
+            title: '相别',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
+        {
+            field: 'persistTime',
+            title: '持续时间(s)',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
+        {
+            field: 'amplitude',
+            title: '暂降幅值(%)',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
         {
             title: '操作',
-            width: '180',
+            width: 180,
             render: 'buttons',
+            fixed: 'right',
             buttons: [
                 {
                     name: 'edit',
@@ -73,8 +110,8 @@ const handleWaveFormAnalysis = (val: any) => {
     isWaveCharts.value = true
 }
 //返回
-const handleBack=()=>{
-    isWaveCharts.value = false;
+const handleBack = () => {
+    isWaveCharts.value = false
     tableStore.index()
 }
 defineExpose({ getTableParams })
@@ -83,7 +120,7 @@ onMounted(() => {
 })
 </script>
 <style lang="scss" scoped>
-.header_btn{
+.header_btn {
     width: 100%;
     height: 30px;
     display: flex;