Commit 15033859 by huangqy

提交下

parent 4fb486bd
...@@ -214,7 +214,8 @@ export default { ...@@ -214,7 +214,8 @@ export default {
this.dialogVisible = true this.dialogVisible = true
}, },
dialogClose() { dialogClose() {
this.logList = [] this.logList = []
this.loading = false
this.websock.close() this.websock.close()
this.init() this.init()
}, },
...@@ -242,7 +243,7 @@ export default { ...@@ -242,7 +243,7 @@ export default {
websocketOnmessage(e) { websocketOnmessage(e) {
var backMessObj = JSON.parse(e.data); var backMessObj = JSON.parse(e.data);
console.log(backMessObj) console.log(backMessObj)
this.loading = false // this.loading = false
if (backMessObj.Cmd === 1){ if (backMessObj.Cmd === 1){
this.uid = backMessObj.Data this.uid = backMessObj.Data
this.websock.send(JSON.stringify({Cmd: 5})) this.websock.send(JSON.stringify({Cmd: 5}))
...@@ -265,6 +266,7 @@ export default { ...@@ -265,6 +266,7 @@ export default {
this.websock.send(JSON.stringify({Cmd: 1, Data: ''})) this.websock.send(JSON.stringify({Cmd: 1, Data: ''}))
}, 1000) }, 1000)
} else { } else {
this.loading = false
this.$refs.audio.play() this.$refs.audio.play()
this.logList.unshift({time: this.parseTimes(new Date()), log: backMessObj.Data.Message, status: 2 }) this.logList.unshift({time: this.parseTimes(new Date()), log: backMessObj.Data.Message, status: 2 })
setTimeout(() => alert(backMessObj.Data.Message), 500) setTimeout(() => alert(backMessObj.Data.Message), 500)
......
...@@ -302,6 +302,7 @@ export default { ...@@ -302,6 +302,7 @@ export default {
}, },
bindDialogClose() { bindDialogClose() {
this.logList = [] this.logList = []
this.loading = false
this.websock.close() this.websock.close()
}, },
subFormData () { subFormData () {
...@@ -397,7 +398,7 @@ export default { ...@@ -397,7 +398,7 @@ export default {
websocketOnmessage(e) { websocketOnmessage(e) {
var backMessObj = JSON.parse(e.data); var backMessObj = JSON.parse(e.data);
console.log(backMessObj) console.log(backMessObj)
this.loading = false // this.loading = false
if (backMessObj.Cmd == 2) { if (backMessObj.Cmd == 2) {
this.updateContent(backMessObj.Data.Access, backMessObj.Data.Data) this.updateContent(backMessObj.Data.Access, backMessObj.Data.Data)
} else if (backMessObj.Cmd === 1){ } else if (backMessObj.Cmd === 1){
...@@ -422,6 +423,7 @@ export default { ...@@ -422,6 +423,7 @@ export default {
this.websock.send(JSON.stringify({Cmd: 1, Data: ''})) this.websock.send(JSON.stringify({Cmd: 1, Data: ''}))
}, 1000) }, 1000)
} else { } else {
this.loading = false
this.logList.unshift({time: this.parseTime(new Date()), log: backMessObj.Data.Message, status: 2 }) this.logList.unshift({time: this.parseTime(new Date()), log: backMessObj.Data.Message, status: 2 })
this.$refs.audio.play() this.$refs.audio.play()
setTimeout(() => alert(backMessObj.Data.Message), 500) setTimeout(() => alert(backMessObj.Data.Message), 500)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- 顶部区域 S --> <!-- 顶部区域 S -->
<el-header class="ltk-header"> <el-header class="ltk-header">
<div class="logo"> <div class="logo">
<img src="../assets/logo.png" alt="logo" /> <!-- <img src="../assets/logo.png" alt="logo" /> -->
<span>贵金属生产管理系统</span> <span>贵金属生产管理系统</span>
</div> </div>
<div class="time_box" @click="cut"> <div class="time_box" @click="cut">
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论