From 229805f40bdd684594798ac15f6635e1b8c98096 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:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E9=A3=8E=E6=9C=BA=EF=BC=9A=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E9=87=8F=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=9A=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=AF=86=E7=A0=81=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/WindBlower/index.vue |  4 ++--
 .../src/views/backend/WindBlower/overview.vue      |  8 ++++----
 ui/dasadmin/src/views/backend/node/protocol.vue    | 14 +++++++++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue
index df23cd75..b768583e 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue
@@ -1008,6 +1008,7 @@ const createRealTimeData = async () => {
             { type138: [], type140: [], type199: [] },
         ]
         modelList.forEach((item: any) => {
+            
             const realVal = realData[item.attributeCode.toLowerCase()]
             let val = getCutDecimalsValue(realVal)
             if (enumStore.keys.includes(item.attributeCode)) {
@@ -1113,7 +1114,7 @@ const realTimeForSubSystem = reactive<any>({
 })
 const curSubSystem = ref('type1')
 const subSystemDataList = computed(() => {
-    const type = dialogradioactiveName.value === 138 ? 'type138' : 'type140'
+    const type = dialogradioactiveName.value === 138 ? 'type138' : dialogradioactiveName.value === 140 ? 'type140' : 'type199'
     return realTimeForSubSystem[curSubSystem.value][type]
 })
 
@@ -1373,7 +1374,6 @@ const sendManualCommand = (type: 1 | 0) => {
 const getAlarmList = () => {
     const start = dayjs().subtract(3, 'day').startOf('day').toDate().getTime()
     const end = dayjs().endOf('day').toDate().getTime()
-    console.log(route.query.name)
 
     getAlarmListReq({
         startTime: start,
diff --git a/ui/dasadmin/src/views/backend/WindBlower/overview.vue b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
index 844b3b2c..9f107782 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/overview.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
@@ -39,8 +39,6 @@ const props = withDefaults(defineProps<{ visible: boolean; type: string; type138
 })
 
 const showData = computed(() => {
-    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)
 })
@@ -60,11 +58,13 @@ watch(
     () => props.type,
     () => {
         pageSetting.current = 1
-        pageSetting.total = props.type === '138' ? props.type138.length : props.type140.length
+        pageSetting.total =
+            props.type === '138' ? props.type138.length : (pageSetting.total = props.type === '140' ? props.type140.length : props.type199.length)
     }
 )
 onMounted(() => {
-    pageSetting.total = props.type === '138' ? props.type138.length : props.type140.length
+    pageSetting.total =
+        props.type === '138' ? props.type138.length : (pageSetting.total = props.type === '140' ? props.type140.length : props.type199.length)
 })
 </script>
 
diff --git a/ui/dasadmin/src/views/backend/node/protocol.vue b/ui/dasadmin/src/views/backend/node/protocol.vue
index fb04c198..dd301ad9 100644
--- a/ui/dasadmin/src/views/backend/node/protocol.vue
+++ b/ui/dasadmin/src/views/backend/node/protocol.vue
@@ -21,6 +21,14 @@
                                         :disabled="props.disabled"
                                         class="formInput"
                                     ></el-input>
+                                    <el-input
+                                        v-if="itemChild.data.type === 'password'"
+                                        type="password"
+                                        show-password
+                                        v-model="formData[itemChild.key] as string"
+                                        :disabled="props.disabled"
+                                        class="formInput"
+                                    ></el-input>
                                     <el-input-number
                                         v-else-if="itemChild.data.type === 'number'"
                                         v-model="formData[itemChild.key] as number"
@@ -967,7 +975,7 @@ const formColumnList: formColumnType[] = [
                     key: 'ftpPassword',
                     data: {
                         label: 'FTP密码',
-                        type: 'input',
+                        type: 'password',
                         value: '',
                         showKey: 'ftpMode',
                         showValue: '1',
@@ -1085,7 +1093,7 @@ const formColumnList: formColumnType[] = [
                     key: 'ftpPassword',
                     data: {
                         label: 'FTP密码',
-                        type: 'input',
+                        type: 'password',
                         value: '',
                         showKey: 'ftpMode',
                         showValue: '1',
@@ -1105,7 +1113,7 @@ const formColumnList: formColumnType[] = [
                     key: 'adsPassword',
                     data: {
                         label: 'ADS密码',
-                        type: 'input',
+                        type: 'password',
                         value: '',
                         showKey: 'ftpMode',
                         showValue: '1',