From 56e76adb02a1d8b0dd703240dd8e408326f9445d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Mon, 4 Nov 2024 10:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4desc=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=A3=8E=E6=9C=BA=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/api/backend/airBlower/request.ts          | 2 +-
 ui/dasadmin/src/views/backend/WindBlower/index.vue        | 4 ++--
 .../src/views/backend/equipment/airBlower/index.vue       | 8 ++++++--
 .../backend/equipment/equipmentManagement/control.vue     | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ui/dasadmin/src/api/backend/airBlower/request.ts b/ui/dasadmin/src/api/backend/airBlower/request.ts
index a2fa3dc8..93da9094 100644
--- a/ui/dasadmin/src/api/backend/airBlower/request.ts
+++ b/ui/dasadmin/src/api/backend/airBlower/request.ts
@@ -15,7 +15,7 @@ export const getBelongLineListReq = () => {
 }
 
 export const runAirBlowerReq = (data: (CommandReqType & { measType: 199 | 147 | 146 | 138 | 139 | 140 })[]) => {
-    return createAxios({
+    return createAxios<unknown,Promise<{code:number,msg:string,success:boolean}>>({
         url: '/api/page/turbines/windTurbinesControl',
         method: 'post',
         data: data
diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue
index 529057c1..453c048a 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue
@@ -1375,7 +1375,7 @@ const sendCommand = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setTurbin
         type: 'warning',
     }).then(() => {
         const serviceName = sendTypeEnum[type]
-        const optDesc = serviceName + 1
+        const optDesc = serviceName + ',设定值为：1'
         sendCommandReq({
             deviceId: route.query.irn as string,
             serviceCode: type,
@@ -1403,7 +1403,7 @@ const sendManualCommand = (type: 1 | 0) => {
             deviceId: route.query.irn as string,
             serviceCode: 'Locked',
             serviceName,
-            optDesc: serviceName + type,
+            optDesc: serviceName +',设定值为：'+ type,
             opValue: type,
         }).then((res) => {
             if (res.code == 200) {
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
index f92fc83c..16f5f95f 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
@@ -246,7 +246,7 @@ const airBlowerOperate = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setT
             deviceId: item,
             serviceName: sendTypeEnum[type],
             serviceCode: type,
-            optDesc: sendTypeEnum[type] + 1,
+            optDesc: sendTypeEnum[type] +'，设定值为：'+ 1,
             opValue: 1 as const,
             measType: 147 as const,
         }
@@ -255,8 +255,12 @@ const airBlowerOperate = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setT
 
     runAirBlowerReq(data).then((res) => {
         console.log(res);
-        
+        if(res.success){
+            ElMessage.success('指令发送成功')
+        }
         // ElMessage.success('操作成功')
+    }).catch(()=>{
+        ElMessage.error('操作失败')
     })
 }
 
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue
index c7d1babb..db8923dd 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue
@@ -192,7 +192,7 @@ const sendValue = (data: { serviceCode: string; opValue: number }, type: 146 | 1
         type === 146
             ? deviceServiceType146List.value.find((item) => item.value === val.serviceCode)?.label
             : deviceServiceType147List.value.find((item) => item.value === val.serviceCode)?.label
-    val.optDesc = val.serviceName + val.opValue
+    val.optDesc = val.serviceName +'，设定值为：'+ val.opValue
     sendCommandReq(val)
         .then((res) => {
             console.log(res)