Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue

@@ -4,20 +4,11 @@
       <Video class="video-stream" :pileNum="dialogData.stakeMark" />
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="基本信息" name="first">
-          <Descriptions
-            labelWidth="72px"
-            :list="list"
-            :data="data"
-            style="gap: 18px"
-          />
+          <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" />
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">设备参数</ElTabPane>
         <ElTabPane label="在线率统计" name="third">
-          <LineChart
-            v-if="activeName === 'third'"
-            :productId="dialogData.productId"
-            style="height: 180px"
-          />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" style="height: 180px" />
         </ElTabPane>
       </ElTabs>
     </div>
@@ -26,10 +17,7 @@
       <Button @click.native="deviceControlVisible = true">设备操作</Button>
     </template>
 
-    <DeviceControlDialog
-      v-model="deviceControlVisible"
-      :deviceId="dialogData.iotDeviceId"
-    />
+    <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId" />
   </Dialog>
 </template>
 
@@ -37,7 +25,7 @@
 import Dialog from "@screen/components/Dialog/index.vue";
 import Descriptions from "@screen/components/Descriptions.vue";
 import Button from "@screen/components/Buttons/Button.vue";
-// import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
 import Video from "@screen/components/Video";
 import DeviceControlDialog from "./components/DeviceControlDialog.vue";
 
@@ -108,10 +96,10 @@ export default {
 
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
-    if (roadInfo) this.data.roadName = roadInfo.roadName;
+    if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
   },
   methods: {
-    handleClickTabs() {},
+    handleClickTabs() { },
   },
 };
 </script>
@@ -152,7 +140,7 @@ export default {
     align-items: center;
     justify-content: end;
 
-    > div {
+    >div {
       font-size: 16px;
       padding: 6px 12px;
     }

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue

@@ -48,15 +48,14 @@ export default {
     }
   },
   created() {
-    // https://www.yuque.com/dayuanzhong-ovjwn/gkht0m/ww776d5kzs72ilzh?singleDoc=
-    // 获取设备参数
-    request({
-      url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/1`,
-      method: "get",
-      params: {}
-    }).then(result => {
-        if (result.code != 200) return;
-        const deviceInfo = result.data;
+
+    Promise.all([this.getAc(), this.getDc()]).then(res=>{
+        // if (result.code != 200) return;
+
+      let ac = res[0].data;
+      let dc = res[1].data;
+      let deviceInfo = _.merge({}, ac, dc);
+
         const typeMap = {
           ac: '220v',
           dc: '12v',
@@ -129,6 +128,20 @@ export default {
       })
   },
   methods: {
+    getAc(){
+      return request({
+        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/1ac`,
+        method: "get",
+        params: {}
+      })
+    },
+    getDc(){
+      return request({
+        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/1dc`,
+        method: "get",
+        params: {}
+      })
+    },
     async handleSwitcherChange(value, data) {
       let str = data.state ? "关闭" : "开启";
       let deviceName = "";

ruoyi-ui/vue.config.js

@@ -54,9 +54,9 @@ module.exports = {
         // target: `http://10.168.78.135:8087`,  //王钦
         // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
         // target: `http://10.168.68.42:8087`, //王思祥
-        target: `http://10.168.65.194:8087`, //赵祥龙
+        // target: `http://10.168.65.194:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
-        // target: `http://10.168.76.181:8087`, //王家宝
+        target: `http://10.168.76.181:8087`, //王家宝
         // target: `http://10.168.65.103:8097`,
         changeOrigin: true,
         pathRewrite: {