diff --git a/components/Cn-device-card/Cn-device-card.vue b/components/Cn-device-card/Cn-device-card.vue index fca58f6..97bc1ec 100644 --- a/components/Cn-device-card/Cn-device-card.vue +++ b/components/Cn-device-card/Cn-device-card.vue @@ -2,7 +2,7 @@ - + + + + + + @@ -123,6 +132,7 @@ export default { }, data() { return { + remarkContent: '', dialogType: '', domLoading: true, loading: true, @@ -252,7 +262,7 @@ export default { if (this.dialogType == '取消调试') { cancelDebug({ deviceId: this.devId, - remark: val, + remark: this.remarkContent, type: Number(this.pageOptions.process), }).then((res) => { this.$util.toast(res.message) @@ -263,7 +273,7 @@ export default { } else { finishDebug({ deviceId: this.devId, - remark: val, + remark: this.remarkContent, type: Number(this.pageOptions.process), }).then((res) => { console.log(res) @@ -448,11 +458,11 @@ export default { text: '编辑', }, { - iconPath: '/static/delate.png', + iconPath: '/static/cancel.png', text: '取消调试', }, { - iconPath: '/static/delate.png', + iconPath: '/static/confirm.png', text: '完成调试', }, ) diff --git a/pages/index/mine.vue b/pages/index/mine.vue index 07bb405..d44bd8f 100644 --- a/pages/index/mine.vue +++ b/pages/index/mine.vue @@ -29,7 +29,7 @@ - + 工程管理 diff --git a/pages/mine/audit.vue b/pages/mine/audit.vue index 542899d..e7414a3 100644 --- a/pages/mine/audit.vue +++ b/pages/mine/audit.vue @@ -3,13 +3,13 @@ - + - +