diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue index ee6c019b..02448b8f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue @@ -95,13 +95,13 @@ export default { }, { label: "设备状态", - key: "deviceState", + key: "deviceStateName", // enum: "DeviceTypeEnum", - visible: false, }, { label: "设备状态", key: "deviceStateLiteral", + visible: false, // enum: "DeviceTypeEnum", }, { @@ -121,14 +121,14 @@ export default { this.camId = oConfig.camId } } - this.data = { ...this.dialogData, roadName: '济菏高速' }; let deviceInfo = await this.getDeviceInfo(); this.data = { roadName: '济菏高速' , deviceStateLiteral: deviceInfo?.data.formatValue.deviceState, - ...this.data + ...this.data, + deviceStateName: (this.data === '0'?'离线':'在线') }; // console.log( diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 9d8f215b..dc46ec67 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -38,7 +38,7 @@ module.exports = { [process.env.VUE_APP_BASE_API]: { // target: `http://127.0.0.1:8087`, // target:`http://localhost:3001`, - // target:`http://10.0.111.11:8097`, + target:`http://10.0.111.11:8097`, // target:`http://10.0.111.11:8097`, // target: `http://10.168.66.196:8087`, //刘文阁 // target: `http://10.168.68.42:8087`, //王思祥