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

ruoyi-ui/src/assets/jihe/images/offline.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1709521132238" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1653" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M0 352.832l93.12 98.752c231.296-245.44 606.464-245.44 837.76 0L1024 352.832C741.44 53.056 283.008 53.056 0 352.832z m372.352 395.008L512 896l139.648-148.16c-76.8-81.92-202.048-81.92-279.296 0zM186.24 550.4l93.12 98.752c128.448-136.32 336.96-136.32 465.408 0L837.824 550.4c-179.648-190.592-471.488-190.592-651.648 0z" fill="#154b5f" p-id="1654"></path></svg>

ruoyi-ui/src/assets/jihe/images/online.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1709521132238" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1653" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M0 352.832l93.12 98.752c231.296-245.44 606.464-245.44 837.76 0L1024 352.832C741.44 53.056 283.008 53.056 0 352.832z m372.352 395.008L512 896l139.648-148.16c-76.8-81.92-202.048-81.92-279.296 0zM186.24 550.4l93.12 98.752c128.448-136.32 336.96-136.32 465.408 0L837.824 550.4c-179.648-190.592-471.488-190.592-651.648 0z" p-id="1654" fill="#ffffff"></path></svg>

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

@@ -354,8 +354,8 @@ export default {
       } else {
         //改下判断条件 iotDeviceId为null时不要请求后台  加个提示 设备未接入
         const iotDeviceId = this.selectedDevice.iotDeviceId;
-        if (!(iotDeviceId === null || iotDeviceId === undefined))
+        if (iotDeviceId != null && iotDeviceId != undefined)
-          getBoardDeviceInfo()
+          getBoardDeviceInfo(iotDeviceId)
             .then((res) => {
               this.selectedBdMsg = res.data["3A"].content;
             })

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js

@@ -62,6 +62,9 @@ var options = {
   },
   tooltip: {
     trigger: "item",
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
   },
   series: [
     {

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/assets/charts.js

@@ -35,7 +35,7 @@ var options = {
   },
   tooltip: {
     valueFormatter: function (value) {
-      return value + minNumber;
+      return value + minNumber + " 起";
     },
   },
   grid: {

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts.js

@@ -66,7 +66,11 @@ var options = {
     bottom: "2%", //下边距
     containLabel: true,
   },
-  tooltip: {},
+  tooltip: {
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
+  },
   xAxis: {
     type: "category",
     data: [],

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js

@@ -99,8 +99,8 @@ for (let i = 0; i < chartData.length; i++) {
 var options = {
   tooltip: {
     confine: true,
-    textStyle: {
+    valueFormatter: function (value) {
-      fontSize: 14, // 字体大小
+      return value + " 起";
     },
   },
   title: {

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js

@@ -16,7 +16,11 @@ let xData = [
 ];
 let data1 = [200, 530, 920, 400, 600, 700, 300, 800, 900, 120, 570, 800];
 let options = {
-  tooltip: {},
+  tooltip: {
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
+  },
   grid: {
     left: "2%",
     right: "4%",
@@ -39,7 +43,7 @@ let options = {
       },
     },
     axisLabel: {
-      interval: 'auto',
+      interval: "auto",
       align: "center",
       rotate: "1",
       margin: "20",

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js

@@ -55,11 +55,9 @@ for (let i = 0; i < chartData.length; i++) {
 var options = {
   tooltip: {
     confine: true,
-    textStyle: {
+    valueFormatter: function (value) {
-      color: "#333",
+      return value + " 起";
     },
-    color: "#333",
-    backgroundColor: "#ffffff",
   },
   title: {
     //圆环中间内容

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/assets/charts.js

@@ -3,8 +3,8 @@ var options = {
   color: ["#5090FF", "#01B3E4"],
   tooltip: {
     trigger: "axis",
-    textStyle: {
+    valueFormatter: function (value) {
-      color: "#333",
+      return value + " 起";
     },
   },
   grid: {

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js

@@ -64,7 +64,7 @@ var options = {
   },
   tooltip: {
     valueFormatter: function (value) {
-      return value + minNumber;
+      return value + minNumber + " 起";
     },
   },
   xAxis: {

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/assets/charts.js

@@ -80,6 +80,9 @@ var options = {
   },
   tooltip: {
     trigger: "item",
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
   },
   series: [
     {

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/assets/charts.js

@@ -64,12 +64,9 @@ for (var i of datas) {
 var options = {
   tooltip: {
     show: true,
-    // trigger: "item",
+    valueFormatter: function (value) {
-    // formatter: "{a} <br/>{b}: {c} ({d}%)",
+      return value + " 辆";
-    // backgroundColor: "#ffffff",
+    },
-    // textStyle: {
-    //   color: "#666",
-    // },
   },
   legend: {
     orient: "vertical",

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/assets/charts.js

@@ -58,6 +58,9 @@ var options = {
   tooltip: {
     show: true,
     trigger: "axis",
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
   },
   grid: {
     top: "5%", //上边距

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js

@@ -7,9 +7,9 @@ var options = {
       return `${params[0].name.replace(/-/g, "")}${params[1].name.replace(
         /-/g,
         ""
-      )}<br/>${params[0].marker}${params[0].seriesName} : ${
+      )}<br/>${params[0].marker}${
-        params[0].value
+        params[0].seriesName
-      } 辆`;
+      }: <span style="font-weight:bold;"> ${params[0].value}  辆</span>`;
     },
   },
   axisPointer: {

ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

@@ -56,8 +56,12 @@
                       :label="itm.iotDeviceId"
                       :key="index"
                     >
-                      <div>{{ itm.deviceName }}</div>
+                      <div class="title">{{ itm.deviceName }}</div>
-                      <el-tooltip content="回读当前信息" placement="right">
+                      <el-tooltip :content="(item.deviceState == 0 || item.deviceState == null) ? '离线' : '在线'" placement="top">
+                        <img src="@/assets/jihe/images/offline.svg" class="state" v-if="item.deviceState==0 || item.deviceState==null">
+                        <img src="@/assets/jihe/images/online.svg" class="state" v-else>
+                      </el-tooltip>
+                      <el-tooltip content="回读" placement="top">
                         <el-button
                           class="el-icon-tickets huiduButton"
                           @click.stop.prevent="____forkDeviceInfo(itm)"
@@ -525,7 +529,7 @@ export default {
         // this.____getDeviceInfo();
       } else {
         getBoardList(param).then((res) => {
-          res.data.forEach((item) => {
+          res.data.forEach((item, index) => {
             if (_.isString(item.otherConfig)) {
               item.otherConfig = JSON.parse(item.otherConfig);
             }
@@ -1257,12 +1261,15 @@ export default {
   }
 
   .checkbox {
-    label {
+    .boardLabel{
-      width: 100%;
+
-      padding: 10px 0;
-      box-sizing: border-box;
-      display: flex;
     }
+    // label {
+    //   width: 100%;
+    //   padding: 10px 0;
+    //   box-sizing: border-box;
+    //   display: flex;
+    // }
   }
 }
 
@@ -1283,11 +1290,28 @@ export default {
   display: flex !important;
   justify-content: space-between;
   width: 100%;
+  .title{ flex:1; width:0; overflow: hidden; text-overflow: ellipsis; word-break: keep-all;}
+  .state{ width: 18px; height: 18px; margin-right: 4px;}
+  .huiduButton {
+    background: transparent;
+    border: none;
+    height: 18px;
+    width: 18px;
+    line-height: 20px;
+    padding: 0;
+    color: #fff;
+    font-size: 16px;
+  }
+
+  .huiduButton:hover {
+    color: #05afe3 !important;
+  }
 }
 
 .el-checkbox {
   display: flex !important;
   padding-top: 10px;
+  margin: 0;
 }
 
 ::v-deep .el-table {
@@ -1299,20 +1323,6 @@ export default {
   }
 }
 
-.huiduButton {
-  background: transparent;
-  border: none;
-  height: 19px;
-  line-height: 20px;
-  padding: 0;
-  color: #fff;
-  font-size: 16px;
-}
-
-.huiduButton:hover {
-  color: #05afe3 !important;
-}
-
 // .boardListTitle {
 //   // margin-top: 1vh;
 //   color: #fff;