chenyh
/
xiuos_IoT
forked from floraachy/xiuos_IoT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs

This commit is contained in:
龚祖望 2022-11-17 15:21:37 +08:00
parent d365fc8667
commit cc62eefcbb
3 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xiuosiot-frontend/src/views/dashboard/index.vue
View File

@ -222,8 +222,8 @@ export default {
} }
}], }],
color: [ color: [
'#33BFFF',
'#F3F3F3', '#F3F3F3',
'#33BFFF',
'#F25656' '#F25656'
] ]
} }
@ -283,10 +283,10 @@ export default {
const status2Num = runStatusData.data.filter(item => item.runstatus === 2)[0]?.count || 0 const status2Num = runStatusData.data.filter(item => item.runstatus === 2)[0]?.count || 0
const runstatusData = [{ const runstatusData = [{
value: status0Num, value: status0Num,
name: '运行' name: '待机'
}, { }, {
value: status1Num, value: status1Num,
name: '待机' name: '运行'
}, { }, {
value: status2Num, value: status2Num,
name: '警告' name: '警告'

5
xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
View File

@ -104,11 +104,11 @@
<span v-else>{{ form.sql }}</span> <span v-else>{{ form.sql }}</span>
</el-form-item> </el-form-item>
</el-col> </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-button @click="runSql">在线运行</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row v-if="type === 0">
<el-col :span="20"> <el-col :span="20">
<el-form-item label="输出结果："> <el-form-item label="输出结果：">
<!-- <el-input v-model="form.result" type="textarea" readonly :rows="6" /> --> <!-- <el-input v-model="form.result" type="textarea" readonly :rows="6" /> -->
@ -204,7 +204,6 @@ export default {
runSql() { runSql() {
executeSql({ sql: this.form.sql }) executeSql({ sql: this.form.sql })
.then((res) => { .then((res) => {
console.log('res', res)
if (res.data && res.data.length) { if (res.data && res.data.length) {
this.form.datalist = res.data this.form.datalist = res.data
} }

54
xiuosiot-frontend/src/views/terminal/add/index.vue
View File

@ -312,33 +312,33 @@ export default {
this.date = new Date().toLocaleDateString() this.date = new Date().toLocaleDateString()
this.getList(0) this.getList(0)
this.getList(1) this.getList(1)
axios.get('/cgi-bin/mqtt_get', { headers: { // axios.get('/cgi-bin/mqtt_get', { headers: {
Authorization: 'Basic YWRtaW46YWRtaW4=' // Authorization: 'Basic YWRtaW46YWRtaW4='
}}).then(res => { // }}).then(res => {
this.form.topic = res.data.pub_topic // this.form.topic = res.data.pub_topic
this.form.serveraddr = res.data.server_addr // this.form.serveraddr = res.data.server_addr
this.form.serverport = res.data.server_port // this.form.serverport = res.data.server_port
this.form.username = res.data.username // this.form.username = res.data.username
this.form.password = res.data.password // this.form.password = res.data.password
this.form.clientid = res.data.clientID // this.form.clientid = res.data.clientID
}) // })
axios.get('/cgi-bin/tcpip_get', { headers: { // axios.get('/cgi-bin/tcpip_get', { headers: {
Authorization: 'Basic YWRtaW46YWRtaW4=' // Authorization: 'Basic YWRtaW46YWRtaW4='
}}).then(res => { // }}).then(res => {
this.form.ipaddr = res.data.local_ipaddr // this.form.ipaddr = res.data.local_ipaddr
this.form.netmask = res.data.netmask_addr // this.form.netmask = res.data.netmask_addr
this.form.gateway = res.data.gateway_addr // this.form.gateway = res.data.gateway_addr
this.form.dnsserver0 = res.data.dns_server0 // this.form.dnsserver0 = res.data.dns_server0
this.form.dnsserver1 = res.data.dns_server1 // this.form.dnsserver1 = res.data.dns_server1
}) // })
axios.get('/cgi-bin/private_prt_get', { headers: { // axios.get('/cgi-bin/private_prt_get', { headers: {
Authorization: 'Basic YWRtaW46YWRtaW4=' // Authorization: 'Basic YWRtaW46YWRtaW4='
}}).then(res => { // }}).then(res => {
this.form.privateserveraddr = res.data.server_addr // this.form.privateserveraddr = res.data.server_addr
this.form.privateserverport = res.data.server_port // this.form.privateserverport = res.data.server_port
this.form.privateserverusername = res.data.username // this.form.privateserverusername = res.data.username
this.form.privateserverpassword = res.data.passward // this.form.privateserverpassword = res.data.passward
}) // })
// this.randomData() // this.randomData()
}, },
methods: { methods: {