From 65338b5ec0a9b79b96398739e0c55f0bb6e19251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 21 Nov 2024 15:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=EF=BC=9A=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=20=E9=93=BE=E8=B7=AF?=
 =?UTF-8?q?=EF=BC=9Aorder=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/WindBlower/overview.vue |  7 +++++--
 .../src/views/backend/alarms/index.vue        | 20 +++++++++----------
 ui/dasadmin/src/views/backend/alarms/type.ts  |  2 +-
 ui/dasadmin/src/views/backend/node/univer.vue |  3 +--
 ui/dasadmin/src/views/backend/node/utils.ts   |  7 +++----
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/WindBlower/overview.vue b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
index 63529776..844b3b2c 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/overview.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
@@ -30,15 +30,18 @@
 <script setup lang="ts">
 import { ref, reactive, computed, watch, onMounted } from 'vue'
 
-const props = withDefaults(defineProps<{ visible: boolean; type: string; type138: any; type140: any }>(), {
+const props = withDefaults(defineProps<{ visible: boolean; type: string; type138: any; type140: any; type199: any }>(), {
     visible: false,
     type: '138',
     type138: [],
     type140: [],
+    type199: [],
 })
 
 const showData = computed(() => {
-    let data = props.type === '138' ? props.type138 : props.type140
+    console.log(props);
+    
+    let data = props.type === '138' ? props.type138 : props.type === '140' ? props.type140 : props.type199
     return data.slice((pageSetting.current - 1) * pageSetting.pageSize, pageSetting.current * pageSetting.pageSize)
 })
 
diff --git a/ui/dasadmin/src/views/backend/alarms/index.vue b/ui/dasadmin/src/views/backend/alarms/index.vue
index 5899ed07..950e84b1 100644
--- a/ui/dasadmin/src/views/backend/alarms/index.vue
+++ b/ui/dasadmin/src/views/backend/alarms/index.vue
@@ -40,11 +40,11 @@
                         <el-table-column prop="eventTimeFormate" :label="AlarmsFieldsEnums['alarmTime']" align="center"> </el-table-column>
                         <el-table-column prop="deviceCode" :label="AlarmsFieldsEnums['airBlowerNumber']" align="center"> </el-table-column>
                         <el-table-column prop="eventText" :label="AlarmsFieldsEnums['faultDescription']" align="center"> </el-table-column>
-                        <el-table-column prop="eventType" :label="AlarmsFieldsEnums['alarmType']" align="center">
+                        <el-table-column prop="eventLevel" :label="AlarmsFieldsEnums['alarmType']" align="center">
                             <template #default="scope">
-                                <div class="tip" v-if="scope.row.eventType===0">提示</div>
-                                <div class="alarm" v-if="scope.row.eventType===1">告警</div>
-                                <div class="fault" v-if="scope.row.eventType===2">故障</div>
+                                <div class="tip" v-if="scope.row.eventType === 0">提示</div>
+                                <div class="alarm" v-if="scope.row.eventType === 1">告警</div>
+                                <div class="fault" v-if="scope.row.eventType === 2">故障</div>
                             </template>
                         </el-table-column>
 
@@ -142,11 +142,11 @@ const getFormattedDate = (offset: number) => {
 const airBlowerNumberValue = ref('')
 const airBlowerList = ref([{ label: '', value: '' }])
 // 类别
-const alarmTypeValue = ref('')
+const alarmTypeValue = ref(2)
 const alarmTypes = ref([
-    { label: '提示', value: 0 },
-    { label: '告警', value: 1 },
     { label: '故障', value: 2 },
+    { label: '告警', value: 1 },
+    { label: '提示', value: 0 },
 ])
 
 const searchalarms = (): GetAlarmsTableParam => {
@@ -160,7 +160,7 @@ const searchalarms = (): GetAlarmsTableParam => {
             deviceCode.push(item.value)
         })
     }
-    
+
     return {
         startTime: new Date(start).getTime() || new Date().setHours(0, 0, 0, 0).valueOf(),
         endTime: new Date(end).getTime() || new Date().valueOf(),
@@ -345,13 +345,13 @@ $paginationHeight: 32px;
                 }
                 .tablePart {
                     height: 100%;
-                    .tip{
+                    .tip {
                         border: 1px solid #39baf4;
                         width: fit-content;
                         margin: 0 auto;
                         padding: 5px;
                         border-radius: 6px;
-                        color: #39baf4;   
+                        color: #39baf4;
                     }
                     .alarm {
                         border: 1px solid rgb(228, 161, 18);
diff --git a/ui/dasadmin/src/views/backend/alarms/type.ts b/ui/dasadmin/src/views/backend/alarms/type.ts
index 43b570ab..fffbdbe1 100644
--- a/ui/dasadmin/src/views/backend/alarms/type.ts
+++ b/ui/dasadmin/src/views/backend/alarms/type.ts
@@ -23,7 +23,7 @@ export type GetAlarmsTableParam = {
     startTime: string | number
     endTime: string | number
     deviceCode: any
-    eventLevel?: string | null
+    eventLevel?: string | number | null
     pageNum?: Number
     pageSize?: Number
 }
diff --git a/ui/dasadmin/src/views/backend/node/univer.vue b/ui/dasadmin/src/views/backend/node/univer.vue
index 175ab04b..1e42ab09 100644
--- a/ui/dasadmin/src/views/backend/node/univer.vue
+++ b/ui/dasadmin/src/views/backend/node/univer.vue
@@ -182,7 +182,7 @@ let univerAPI: any = null
 //#endregion
 const init = async () => {
     const reqSheetData = await getMappingList()
-    const sheetData = createSheetData(reqSheetData, 12)
+    const sheetData = createSheetData(reqSheetData, route.query.protocol as any)
     const data = createWookbookData(route.query.protocol as any, route.query.id as string, sheetData)
     initExcel(data)
     getTreeDataType()
@@ -379,7 +379,6 @@ const tipsPos = reactive({
 const saveExcelData = () => {
     const data = getData()
     const val = createUpLoadExcelData(data)
-    console.log(val)
 
     saveMappingList(val)
 }
diff --git a/ui/dasadmin/src/views/backend/node/utils.ts b/ui/dasadmin/src/views/backend/node/utils.ts
index a20bc112..7d37a9ad 100644
--- a/ui/dasadmin/src/views/backend/node/utils.ts
+++ b/ui/dasadmin/src/views/backend/node/utils.ts
@@ -1075,8 +1075,6 @@ const DEFAULT_WORKBOOK_DATA = {
 const createHeaderData = (protocol: string | number) => {
     if (!protocol) return {}
     const headerData: any = {}
-    console.log(protocol);
-    console.log(excelDefaultConfig[protocol]);
 
     Object.keys(excelDefaultConfig[protocol!]).forEach((item) => {
         const dynamicData: any = {}
@@ -1238,8 +1236,10 @@ export const createUpLoadExcelData = (workbookData: any) => {
 }
 
 export const createSheetData = (data: any, protocol: string | number) => {
+    console.log('createSheetData')
     if (!protocol) return {}
-    const excelCellDataMap: any = {}        
+
+    const excelCellDataMap: any = {}
     const headerData = createHeaderData(protocol)
     const resultData: any = {}
     Object.keys(headerData).forEach((item) => {
@@ -1254,7 +1254,6 @@ export const createSheetData = (data: any, protocol: string | number) => {
             const row = index + 1
             result[row] = {}
             Object.keys(obj).forEach((field) => {
-
                 const col = excelCellDataMap[field]
                 if (col) {
                     let custom: any