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

ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue

@@ -126,6 +126,8 @@ export default {
         return require(`@screen/images/device/气象监测器B.png`)
       } else if(warningSource ===8){
         return require(`@screen/images/device/边坡.png`)
+      } else if(warningSource ===9){
+        return require(`@screen/images/layer/路网设施/桥梁.svg`)
       } else {
         return require(`@screen/images/device/view.png`)
       }

ruoyi-ui/src/views/JiHeExpressway/pages/Home/carbon.vue

@@ -278,7 +278,6 @@ export default {
     btnClick(val) {
       if (val) {
         this.active = val
-        this.getEnergyAnalysisBySiteCode()
       }
     },
   }

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js

@@ -123,8 +123,8 @@ export const tabList = {
           gridColumn: "3",
         },
         {
-          label: "跨径组合",
+          label: "结构类型",
-          key: "spanCombination",
+          key: "crossingType",
           gridColumn: "3",
         },
         {
@@ -133,8 +133,8 @@ export const tabList = {
           gridColumn: "3",
         },
         {
-          label: "桥梁长度",
+          label: "跨径组合",
-          key: "bridgeLength",
+          key: "spanCombination",
           gridColumn: "3",
         },
         {
@@ -142,37 +142,6 @@ export const tabList = {
           key: "bridgeWidth",
           gridColumn: "3",
         },
-        {
-          label: "集团公司",
-          key: "groupCompany",
-          gridColumn: "3",
-        },
-        {
-          label: "管养公司",
-          key: "maintenanceAndOperatingCompany",
-          gridColumn: "3",
-        },
-        {
-          label: "功能名称",
-          key: "functionName",
-          gridColumn: "3",
-        },
-        {
-          label: "桥梁方向",
-          key: "bridgeDirection",
-          gridColumn: "3",
-        },
-        {
-          label: "是否子桥",
-          key: "subBridge",
-          enum: "boolType",
-          gridColumn: "3",
-        },
-        {
-          label: "总跨径",
-          key: "totalSpan",
-          gridColumn: "3",
-        },
         {
           label: "经度",
           key: "longitude",
@@ -184,41 +153,16 @@ export const tabList = {
           gridColumn: "3",
         },
         {
-          label: "跨越类型",
+          label: "设计单位",
-          key: "crossingType",
+          key: "designUnit",
-          gridColumn: "3",
-        },
-        {
-          label: "最大跨径",
-          key: "maximumSpan",
-          gridColumn: "3",
-        },
-        {
-          label: "通车时间",
-          key: "openingTime",
-          gridColumn: "3",
-        },
-        {
-          label: "跨径类型名称",
-          key: "spanTypeName",
           gridColumn: "3",
         },
         {
-          label: "跨域结构名称",
+          label: "监测点数目",
-          key: "crossDomainStructureName",
+          key: "numberOfMonitor",
-          gridColumn: "3",
-        },
-        {
-          label: "上部结构名称",
-          key: "superstructureName",
           gridColumn: "3",
         },
 
-        {
-          label: "分中心全称",
-          key: "branchCenterFullName",
-          gridColumn: "3",
-        },
       ],
     },
   ],
@@ -233,11 +177,11 @@ export const tabList = {
           key: "facilityName",
           gridColumn: "3",
         },
-        {
+/*        {
           label: "方向数量",
           key: "interchangeCount",
           gridColumn: "3",
-        },
+        },*/
         {
           label: "北方方向",
           key: "northDirection",
@@ -253,31 +197,31 @@ export const tabList = {
           key: "southDirection",
           gridColumn: "3",
         },
-        {
+/*        {
           label: "南方道路",
           key: "southernRoad",
           gridColumn: "3",
-        },
+        },*/
-        {
+/*        {
           label: "东方方向",
           key: "eastDirection",
           gridColumn: "3",
-        },
+        },*/
-        {
+/*        {
           label: "东方道路",
           key: "eastRoad",
           gridColumn: "3",
-        },
+        },*/
-        {
+/*        {
           label: "西方方向",
           key: "westDirection",
           gridColumn: "3",
-        },
+        },*/
-        {
+/*        {
           label: "西方道路",
           key: "westRoad",
           gridColumn: "3",
-        },
+        },*/
         {
           label: "经度",
           key: "longitude",
@@ -343,11 +287,11 @@ export const tabList = {
           key: "districtName",
           gridColumn: "3",
         },
-        {
+/*        {
           label: "方向名称",
           key: "directionName",
           gridColumn: "3",
-        },
+        },*/
         {
           label: "简介",
           key: "introduction",
@@ -438,7 +382,7 @@ export const tabList = {
           gridColumn: "3",
         },
         {
-          label: "车辆数",
+          label: "路管车辆",
           key: "vehicleCount",
           gridColumn: "3",
         },

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

@@ -2,19 +2,21 @@
   <Dialog
     v-model="obverseVisible"
     :title="dialogData._itemData && dialogData._itemData.title"
-    @update:close="camClose"
+    :width="isCameraMap?'1300px':'500px'"
-    :width="isCameraMap?'1300px':'500px'" top="10%">
+    top="10%" @update:close="camClose">
     <div class="panelParent" style="display:flex;">
       <div class="RoadNetworkFacilities">
         <div class="header">
-          <Video :facilityType="dialogData.facilityType" ref="refVideo" class="video-stream" @nearload="bindNearLoad" :pileNum="dialogData.stakeMark" :rangeIndex="dialogData.facilityType === 1?'all':'upCamera'" :showHeader="false" />
+          <Video ref="refVideo" :facilityType="dialogData.facilityType" :pileNum="dialogData.stakeMark" :rangeIndex="dialogData.facilityType === 1?'all':'upCamera'"
+                 :showHeader="false" class="video-stream"
+                 @nearload="bindNearLoad"/>
         </div>
         <div class="SolarEnergy">
           <ElTabs v-model="activeName" class="tabs">
             <ElTabPane v-for="item in formList" :key="item.key" :label="item.name" :name="item.key">
-              <Descriptions :labelWidth="item.labelWidth" :list="item.list" :data="data" style="gap: 12px" column="6" />
+              <Descriptions :data="data" :labelWidth="item.labelWidth" :list="item.list" column="6" style="gap: 12px"/>
             </ElTabPane>
-            <ElTabPane label="边坡测点数据" v-if="dialogData.facilityType === 9">
+            <ElTabPane v-if="dialogData.facilityType === 9" label="边坡测点数据">
               <Table :data="bianpoData" height="200px">
                 <ElTableColumn label="项目编号" prop="pro_code" width="80"></ElTableColumn>
                 <ElTableColumn label="标段编号" prop="con_code" width="80"></ElTableColumn>
@@ -23,33 +25,35 @@
                 <ElTableColumn label="测点编号" prop="meaPointNum"></ElTableColumn>
               </Table>
             </ElTabPane>
-            <ElTabPane label="测点历史数据" v-if="dialogData.facilityType === 9">
+            <ElTabPane v-if="dialogData.facilityType === 9" label="测点历史数据">
-              <el-select v-model="bindpoSelecte" placeholder="" @change="bindListAsync" transfer="true"
+              <el-select v-model="bindpoSelecte" placeholder="" style="width: 240px;" transfer="true"
-                  style="width: 240px;">
+                         @change="bindListAsync">
                 <el-option v-for="item in bianpoOptions"
                            :key="item.key" :label="item.label"
                            :value="item.key">
                 </el-option>
               </el-select>
-              <el-date-picker v-model="daterangeChangeTime" size="mini"
+              <el-date-picker v-model="daterangeChangeTime" end-placeholder="结束日期"
-                style="width: 190px;float:right;margin-bottom: 10px;" value-format="yyyy-MM-dd" type="daterange"
+                              range-separator="-" size="mini"
-                range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                              start-placeholder="开始日期"
-              <div class='chart LineChart' ref="chartRef" />
+                              style="width: 190px;float:right;margin-bottom: 10px;" type="daterange" value-format="yyyy-MM-dd"></el-date-picker>
+              <div ref="chartRef" class='chart LineChart'/>
             </ElTabPane>
             <template v-if="dialogData.facilityType === 1">
-              <ElTabPane :label="'UPS'+(index+1)" :key="'UPS_'+item" :name="'UPS_'+item"  v-for="(item,index) in upsList">
+              <ElTabPane v-for="(item,index) in upsList" :key="'UPS_'+item" :label="'UPS'+(index+1)"
-                <Descriptions labelWidth="142px" :list="upsForm" :data="upsData" style="gap: 12px" column="6" />
+                         :name="'UPS_'+item">
+                <Descriptions :data="upsData" :list="upsForm" column="6" labelWidth="142px" style="gap: 12px"/>
               </ElTabPane>
             </template>
 
           </ElTabs>
         </div>
       </div>
-      <div style="margin-left:20px" v-if="isCameraMap">
+      <div v-if="isCameraMap" style="margin-left:20px">
         <div :style="'background-image:url('+imgSrc+')'" class="cameraMap">
-          <img v-for="(item,index) of cameraMaps" :key="index" @click="showCamera(item)"
+          <img v-for="(item,index) of cameraMaps" :key="index" :src="item.status===0?item.iconUn:item.icon"
                :style="'left:'+item.left+'px;top:'+item.top+'px'"
-          width="50px" height="50px" :src="item.status===0?item.iconUn:item.icon" />
+               height="50px" width="50px" @click="showCamera(item)"/>
         </div>
       </div>
     </div>
@@ -71,6 +75,7 @@ import { chartOption } from "./chart"
 import moment from "moment";
 
 import Table from "@screen/components/Table.vue";
+
 const icona = require(`@screen/images/layerb/路测设备/摄像机_active.svg`);// childType==='1-2 高清网络枪机
 const icona_f = require(`@screen/images/layerb/路测设备/摄像机_fault.svg`);
 const iconb = require(`@screen/images/deviceType/ballb_active.svg`); // childType==='1-2 高清网络球形摄像机
@@ -200,8 +205,7 @@ export default {
               {icon: icona, iconUn: icona_f, left: 30, top: 30, status: 0, iotDeviceId: '57953'}
             ]
             this.isCameraMap = true;
-          }
+          } else if (dData.facilityName === '孝里收费站') {
-          else if(dData.facilityName === '孝里收费站'){
             this.imgSrc = require('@screen/images/shoufeiz/孝里收费站.jpg')
             this.isCameraMap = true;
           }
@@ -292,11 +296,33 @@ export default {
         cseries1.push(e.data[0].value)
         cseries2.push(e.data[0].cum)
       });
+
       chartOption.xAxis.data = cdata;
-      chartOption.yAxis[0].name =title+'日计'
+      chartOption.series[0].name = title + '日计';
-      chartOption.yAxis[1].name =title+'累计'
+      chartOption.series[1].name = title + '累计';
+
       chartOption.series[0].data = cseries1;
       chartOption.series[1].data = cseries2;
+// 假设 chartOption 已经初始化
+      chartOption.tooltip = {
+        trigger: 'axis',
+        axisPointer: {
+          type: 'cross'
+        },
+        formatter: function (params) {
+          console.log('Params:', params); // 调试信息
+          let tooltipText = `<div><b>${params[0].name}</b></div>`; // 显示日期
+          params.forEach(function (item) {
+            console.log('Item:', item); // 调试信息
+            if (item.seriesName === (title + '日计')) {
+              tooltipText += `<div>${item.seriesName}: ${item.value}</div>`;
+            } else if (item.seriesName === (title + '累计')) {
+              tooltipText += `<div>${item.seriesName}: ${item.value}</div>`;
+            }
+          });
+          return tooltipText;
+        }
+      };
       const chartIns = echarts.init(this.$refs.chartRef);
       chartIns.setOption(chartOption);
     }
@@ -305,15 +331,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.el-table .cell {
+  font-size: 14px;
+}
+
 .LineChart {
   width: 450px !important;
   height: 160px;
   overflow: hidden;
 }
+
 .panelParent {
   display: flex;
   flex-direction: row;
 }
+
 .RoadNetworkFacilities {
   width: 452px;
   color: #fff;
@@ -378,6 +410,7 @@ export default {
   height: 600px;
   background-repeat: no-repeat;
   background-size: 100% 100%;
+
   img {
     position: absolute;
     cursor: pointer;

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

@@ -28,10 +28,10 @@ export default {
   },
   methods: {
     transitionAnimation() {
-      this.show = false;
+      /*this.show = false;
       setTimeout(() => {
         this.show = true;
-      }, 500);
+      }, 500);*/
     }
   }
 }

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue

@@ -166,6 +166,9 @@ export default {
       if(newVehiclesMap.length === 0 && newEmployees.length === 0){
         this.$message.warning('未选择人员或车辆')
         return;
+      } else if (newEmployees.length < newVehiclesMap.length){
+        this.$message.warning('人员数量不得少于车辆数量')
+        return;
       }
       if(this.action===0){
         this.form.eventId = this.provideData.detail.id

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js

@@ -97,6 +97,10 @@ export const gjSearchFormList = [
           key: "8",
           label: "边坡监测",
         },
+        {
+          key: "9",
+          label: "桥梁监测",
+        },
       ],
     },
   },
@@ -276,6 +280,10 @@ export const gzSearchFormList = [
           key: "14",
           label: "边坡监测",
         },
+        {
+          key: "15",
+          label: "桥梁监测",
+        },
       ],
     },
   },

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index_v1.vue

@@ -265,7 +265,8 @@
               const idx = parseInt(i.substr(11,2));
               data[idx] = result.data[i];
             }
-            this.chart1Total2 = total;
+            this.chart1Total2 = parseFloat(total.toFixed(2)); // 保留两位小数
+
             option2.series[0].data = data;
             this.chart2.setOption(option2);
             this.chart2.resize();
@@ -285,7 +286,7 @@
               const idx = parseInt(i.substr(11,2));
               data[idx] = result.data[i];
             }
-            this.chart1Total3 = total;
+            this.chart1Total3 = parseFloat(total.toFixed(2)); // 保留两位小数
             option3.series[0].data = data;
             this.chart3.setOption(option3);
             this.chart3.resize()
@@ -385,4 +386,3 @@
       }
     }
   </style>
-  

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js

@@ -143,6 +143,10 @@ export const searchFormList = [
           key: "8",
           label: "边坡监测",
         },
+        {
+          key: "9",
+          label: "桥梁监测",
+        },
       ],
     },
   },

ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue

@@ -68,7 +68,7 @@ export default {
           class: "",
         },
         {
-          text: "能见度检测器",
+          text: "能见度",
           type: "arrayRed",
           value: [],
           class: ["", ""],

ruoyi-ui/src/views/JiHeExpressway/utils/enum.js

@@ -908,6 +908,9 @@ export const InfoWarningSource = {
   8: {
     text: "边坡监测",
   },
+  9: {
+    text: "桥梁监测",
+  },
 };
 
 export const warningSourceMapping = {
@@ -919,6 +922,7 @@ export const warningSourceMapping = {
   6: "非机预警",
   7: '气象检测器',
   8: '边坡监测',
+  9: '桥梁监测',
 };
 
 export const warningStateMapping = {

ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js

@@ -88,6 +88,10 @@ export const source = {
         key: 14,
         label: "边坡监测",
       },
+      {
+        key: 15,
+        label: "桥梁监测",
+      },
     ],
   },
 };