diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue index 48d7dfe5..2f4e53ed 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue @@ -268,22 +268,21 @@ export default { const options={ "ASK":"7" } - let ask = await this.requestURL("ASKDF",options); - - let workingMode = await this.requestURL("ASKMD"); - // if (result.data == 7) { - // this.activeName = "second"; - // this.tabClick(); - // } else { - console.log("工作模式") - console.log(workingMode.data) - this.formData.controlType = workingMode.data + "" || "0"; + // let ask = await this.requestURL("ASKDF",options); //查询时间 let resultTime = await this.requestURL("ASKTM"); console.log("工作时长") console.log(resultTime.data) - this.formData.onWorkStatus = resultTime.data || 0; + this.formData.onWorkStatus = resultTime.data + "" || "0"; this.activeName = "first"; + + + let workingMode = await this.requestURL("ASKMD"); + + console.log("工作模式") + console.log(workingMode.data) + this.formData.controlType = workingMode.data + "" || "0"; + // } }, async requestURL(functionId, options = {}) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue index 4c4e52a5..39fb85e2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue @@ -228,7 +228,7 @@ export default { }, { type: "text", - label: "G3021德上高速", + label: "G0321德上高速", x: width - 50, y: height / 2 - 21, attrs: {