From cc62eefcbb51435fe588c6855f22e0ad0459809b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=9A=E7=A5=96=E6=9C=9B?= <573413756@qq.com>
Date: Thu, 17 Nov 2022 15:21:37 +0800
Subject: [PATCH] fix bugs

---
 .../src/views/dashboard/index.vue             |  6 +--
 .../src/views/rule/dataTransfer/index.vue     |  5 +-
 .../src/views/terminal/add/index.vue          | 54 +++++++++----------
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/xiuosiot-frontend/src/views/dashboard/index.vue b/xiuosiot-frontend/src/views/dashboard/index.vue
index f6ce88d..b41c0ea 100644
--- a/xiuosiot-frontend/src/views/dashboard/index.vue
+++ b/xiuosiot-frontend/src/views/dashboard/index.vue
@@ -222,8 +222,8 @@ export default {
             }
           }],
           color: [
-            '#33BFFF',
             '#F3F3F3',
+            '#33BFFF',
             '#F25656'
           ]
         }
@@ -283,10 +283,10 @@ export default {
       const status2Num = runStatusData.data.filter(item => item.runstatus === 2)[0]?.count || 0
       const runstatusData = [{
         value: status0Num,
-        name: '运行'
+        name: '待机'
       }, {
         value: status1Num,
-        name: '待机'
+        name: '运行'
       }, {
         value: status2Num,
         name: '警告'
diff --git a/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue b/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
index e53bf2e..30add23 100644
--- a/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
+++ b/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
@@ -104,11 +104,11 @@
                     <span v-else>{{ form.sql }}</span>
                   </el-form-item>
                 </el-col>
-                <el-col :span="3" :offset="1">
+                <el-col v-if="type === 0" :span="3" :offset="1">
                   <el-button @click="runSql">在线运行</el-button>
                 </el-col>
               </el-row>
-              <el-row>
+              <el-row v-if="type === 0">
                 <el-col :span="20">
                   <el-form-item label="输出结果：">
                     <!-- <el-input v-model="form.result" type="textarea" readonly :rows="6" /> -->
@@ -204,7 +204,6 @@ export default {
     runSql() {
       executeSql({ sql: this.form.sql })
         .then((res) => {
-          console.log('res', res)
           if (res.data && res.data.length) {
             this.form.datalist = res.data
           }
diff --git a/xiuosiot-frontend/src/views/terminal/add/index.vue b/xiuosiot-frontend/src/views/terminal/add/index.vue
index f2d9963..fad2520 100644
--- a/xiuosiot-frontend/src/views/terminal/add/index.vue
+++ b/xiuosiot-frontend/src/views/terminal/add/index.vue
@@ -312,33 +312,33 @@ export default {
     this.date = new Date().toLocaleDateString()
     this.getList(0)
     this.getList(1)
-    axios.get('/cgi-bin/mqtt_get', { headers: {
-      Authorization: 'Basic YWRtaW46YWRtaW4='
-    }}).then(res => {
-      this.form.topic = res.data.pub_topic
-      this.form.serveraddr = res.data.server_addr
-      this.form.serverport = res.data.server_port
-      this.form.username = res.data.username
-      this.form.password = res.data.password
-      this.form.clientid = res.data.clientID
-    })
-    axios.get('/cgi-bin/tcpip_get', { headers: {
-      Authorization: 'Basic YWRtaW46YWRtaW4='
-    }}).then(res => {
-      this.form.ipaddr = res.data.local_ipaddr
-      this.form.netmask = res.data.netmask_addr
-      this.form.gateway = res.data.gateway_addr
-      this.form.dnsserver0 = res.data.dns_server0
-      this.form.dnsserver1 = res.data.dns_server1
-    })
-    axios.get('/cgi-bin/private_prt_get', { headers: {
-      Authorization: 'Basic YWRtaW46YWRtaW4='
-    }}).then(res => {
-      this.form.privateserveraddr = res.data.server_addr
-      this.form.privateserverport = res.data.server_port
-      this.form.privateserverusername = res.data.username
-      this.form.privateserverpassword = res.data.passward
-    })
+    // axios.get('/cgi-bin/mqtt_get', { headers: {
+    //   Authorization: 'Basic YWRtaW46YWRtaW4='
+    // }}).then(res => {
+    //   this.form.topic = res.data.pub_topic
+    //   this.form.serveraddr = res.data.server_addr
+    //   this.form.serverport = res.data.server_port
+    //   this.form.username = res.data.username
+    //   this.form.password = res.data.password
+    //   this.form.clientid = res.data.clientID
+    // })
+    // axios.get('/cgi-bin/tcpip_get', { headers: {
+    //   Authorization: 'Basic YWRtaW46YWRtaW4='
+    // }}).then(res => {
+    //   this.form.ipaddr = res.data.local_ipaddr
+    //   this.form.netmask = res.data.netmask_addr
+    //   this.form.gateway = res.data.gateway_addr
+    //   this.form.dnsserver0 = res.data.dns_server0
+    //   this.form.dnsserver1 = res.data.dns_server1
+    // })
+    // axios.get('/cgi-bin/private_prt_get', { headers: {
+    //   Authorization: 'Basic YWRtaW46YWRtaW4='
+    // }}).then(res => {
+    //   this.form.privateserveraddr = res.data.server_addr
+    //   this.form.privateserverport = res.data.server_port
+    //   this.form.privateserverusername = res.data.username
+    //   this.form.privateserverpassword = res.data.passward
+    // })
     // this.randomData()
   },
   methods: {