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

ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js

@@ -100,7 +100,7 @@ export const station = {
 };
 
 export const startStation = {
-  label: "开始桩号:",
+  label: "起始桩号:",
   key: "startStakeMark",
   required: false,
   type: "MultipleLabelItem",
@@ -205,15 +205,30 @@ export const startEndStation = {
   },
 };
 
+// export const direction = {
+//   label: "方向:",
+//   key: "direction",
+//   required: true,
+//   type: "select",
+//   options: {
+//     options: [
+//       // { key: "济南方向", label: "济南方向" },
+//       // { key: "菏泽方向", label: "菏泽方向" },
+//     ],
+//   },
+// };
+
 export const direction = {
-  label: "方向:",
+  label: "路段方向:",
   key: "direction",
-  required: true,
+  type: "CheckboxGroup",
-  type: "select",
+  isAlone: true,
+  default: [],
   options: {
     options: [
-      // { key: "济南方向", label: "济南方向" },
+      { key: "1", label: "济南方向" },
-      // { key: "菏泽方向", label: "菏泽方向" },
+      { key: "3", label: "菏泽方向" },
+      { key: "2", label: "双向" },
     ],
   },
 };
@@ -290,6 +305,7 @@ export const eventLevel = {
   },
 };
 
+
 export const laneOccupancy = {
   label: "车道占用:",
   key: "lang",

ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue

@@ -31,7 +31,8 @@ export default {
       for (const key in callbacks) {
         result[key] = (...args) => callbacks[key](...args, {
           data: this.getFormData(),
-          formList: this.parent.formList
+          formList: this.parent.formList,
+          self: this
         })
       }
 

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

@@ -1,15 +1,9 @@
 import { cloneDeep, merge } from "lodash";
-import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import * as PresetFormItems from "@screen/common/PresetFormItems.js";
 
 export const searchFormList = [
-  {
+  PresetFormItems.startStation,
-    label: "开始桩号:",
+  PresetFormItems.endStation
-    key: "startStakeMark",
-  },
-  {
-    label: "结束桩号:",
-    key: "endStakeMark",
-  },
 ];
 
 export const addEditFormList = [

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

@@ -0,0 +1,22 @@
+import * as PresetFormItems from "@screen/common/PresetFormItems.js";
+import { merge, cloneDeep } from "lodash";
+
+export const searchFormList = [
+  PresetFormItems.eventType,
+  PresetFormItems.direction,
+  {
+    label: "时间范围:",
+    key: "daterange",
+    required: false,
+    type: "datePicker",
+    options: {
+      type: "daterange",
+      format: "yyyy-MM-dd HH:mm:ss",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
+    },
+  },
+  PresetFormItems.startStation,
+  PresetFormItems.endStation
+
+
+];

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

@@ -1,4 +1,5 @@
-import { options } from "runjs";
+import request from '@/utils/request'
+import { Message } from "element-ui";
 
 export const source = {
   label: "来源:",
@@ -713,6 +714,42 @@ export const locationMode = {
       { key: "4", label: "收费站" },
     ],
   },
+  ons: {
+    change(value, ...args) {
+      const { formList } = args.slice(-1)[0];
+
+      let facilityType = 1;
+      if (value == 2) {
+        facilityType = 6;
+      } else if (value == 3) {
+        facilityType = 3;
+      } else if (value == 4) {
+        facilityType = 1;
+      }
+      if(value && value != 1){
+        //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+        request({
+          url: `/business/facility/query?facilityType=${facilityType}`,
+          method: "get"
+        }).then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          let lwss = [];
+          result.data.forEach(it => lwss.push({ key: it.id, label: it.facilityName}))
+
+          formList.forEach((it) => {
+            if(it.key == "dcEventAccident.facilityId" || it.key == "dcEventVehicleAccident.facilityId"){
+              it.options.options = lwss;
+            }
+          });
+          
+        }).catch((err) => {
+          console.log('err',err)
+          Message.error("查询失败", err);
+        })
+      }
+      
+    },
+  },
 };
 
 export const route = {
@@ -1130,7 +1167,7 @@ export const congestionCause = {
             label: "备注项添加",
           },
         ],
-        2 : [
+        2: [
           {
             key: "1",
             label: "主线车流量大",
@@ -1139,9 +1176,9 @@ export const congestionCause = {
             key: "2",
             label: "收费站出口车流量大导致主线压车",
           },
-        ]
+        ],
-      }
+      };
-      config.options.options = (value != 1 ? ad[1] : ad[2]);
+      config.options.options = value != 1 ? ad[1] : ad[2];
     },
   },
 };

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

@@ -67,7 +67,43 @@ export const tabConfigList = [
                return true;
             }
             return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+        
+              let facilityType = 1;
+              if (value == 2) {
+                facilityType = 6;
+              } else if (value == 3) {
+                facilityType = 3;
+              } else if (value == 4) {
+                facilityType = 1;
               }
+              if(value && value != 1){
+                //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+              //   request({
+              //     url: `/business/facility/query?facilityType=${facilityType}`,
+              //     method: "get"
+              //   }).then((result) => {
+              //     if (result.code != 200) return Message.error(result?.msg);
+              //     let lwss = [];
+              //     result.data.forEach(it => lwss.push({ key: it.id, label: it.facilityName}))
+        
+              //     formList.forEach((it) => {
+              //       if(it.key == "dcEventAccident.facilityId" || it.key == "dcEventVehicleAccident.facilityId"){
+              //         it.options.options = lwss;
+              //       }
+              //     });
+                  
+              //   }).catch((err) => {
+              //     console.log('err',err)
+              //     Message.error("查询失败", err);
+              //   })
+              }
+              
+            },
+          },
         },
         {
           label: "匝道:",

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue

@@ -49,7 +49,8 @@ export default {
       tabConfigList,
       index: 1,
       roads: [],
-      direction: []
+      direction: [],
+      lwss: []
     }
   },
   created() {
@@ -77,6 +78,7 @@ export default {
   methods: {
     initData() {
       return Promise.all([
+        //道路 
         request({
           url: `/business/road/query`,
           method: "get",
@@ -85,10 +87,10 @@ export default {
           result.data.forEach(it => {
             this.roads.push({ key: it.id, label: it.roadName })
           })
-        })
+        }).catch((err) => {
-          .catch((err) => {
           Message.error("查询失败", err);
         }),
+        //方向字典
         request({
           url: `/system/dict/data/type/iot_event_direction`,
           method: "get",
@@ -97,40 +99,26 @@ export default {
           result.data.forEach(it => {
             this.direction.push({ key: it.dictValue, label: it.dictLabel })
           })
-        })
+        }).catch((err) => {
-          .catch((err) => {
           Message.error("查询失败", err);
-          })
+        }),
-      ])
+        //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
-    },
-    handleChange({ index }) {
-      // console.log('index',index)
-      this.index = index;
-      let formConfig = tabConfigList[index].formConfig;
-
-      if (index == 0 || index == 1 ||  index == 7) {
-        let fwq = [];
-
         request({
-          url: `/business/facility/query?facilityType=6`,
+          url: `/business/facility/query`,
           method: "get"
         }).then((result) => {
           if (result.code != 200) return Message.error(result?.msg);
-          result.data.forEach(it => {
+          result.data.forEach(it => this.lwss.push({ key: it.id, label: it.facilityName, type: facilityType }))
-            fwq.push({ key: it.id, label: it.facilityName })
+        }).catch((err) => {
-          })
-        })
-          .catch((err) => {
           Message.error("查询失败", err);
-          });
-
-        formConfig.list.forEach(it => {
-          if (it.key === 'dcEventServiceArea.facilityId' || it.key === 'dcEventAccident.facilityId') {
-            it.options.options = fwq;
-          }
         })
 
-      }
+      ])
+    },
+    handleChange({ index }) {
+      // console.log('index',index)
+      this.index = index;
+      let formConfig = tabConfigList[index].formConfig;
 
       formConfig.list.forEach(it => {
         if (it.key == 'direction') {
@@ -139,6 +127,15 @@ export default {
         if (it.key == 'roadId') {
           it.options.options = this.roads;
         }
+        if (index == 7 || it.key === 'dcEventServiceArea.facilityId') {
+          it.options.options = this.lwss.filter(ss => ss.type == 6);
+        }
+        // if (index == 0 || index == 1 || index == 7) {
+        //   if (it.key === 'dcEventAccident.facilityId' || it.key === 'dcEventVehicleAccident.facilityId' || it.key === 'dcEventServiceArea.facilityId') {
+        //     it.options.options = this.lwss.filter(ss => ss.type == 6);
+        //   }
+        // }
+
       })
 
       this.formConfig = formConfig;

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

@@ -1,6 +1,35 @@
 import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
 import { merge, cloneDeep } from "lodash";
 
+const station = {
+  label: "桩号:",
+  key: "stakeMark",
+  required: true,
+  type: "MultipleLabelItem",
+  options: {
+    options: [
+      {
+        prefix: {
+          text: "K",
+          style: {
+            color: "#3DE8FF",
+          },
+        },
+        key: "stakeMark[0]",
+      },
+      {
+        prefix: {
+          text: "+",
+          style: {
+            color: "#3DE8FF",
+          },
+        },
+        key: "stakeMark[1]",
+      },
+    ],
+  },
+};
+
 export const tabMap = {
   "-1": {
     state: 5,
@@ -86,7 +115,7 @@ export const gjSearchFormList = [
     },
   },
   {
-    ...PresetFormItems.station,
+    ...station,
     label: "桩号:",
     required: false,
   },
@@ -142,11 +171,11 @@ export const gzSearchFormList = [
     },
   },
   {
-    ...PresetFormItems.station,
+    ...station,
     label: "开始桩号:",
     required: false,
   },
-  merge(cloneDeep(PresetFormItems.station), {
+  merge(cloneDeep(station), {
     options: {
       options: [
         {

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/monthlyAnalysis/assets/charts.js

@@ -4,6 +4,7 @@ var data1 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15];
 var data2 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15];
 var options = {
   tooltip: {
+    show:true
     // trigger: "axis",
     // backgroundColor: 'rgba(17,95,182,0.5)',
     // textStyle: {
@@ -238,6 +239,8 @@ var options = {
       },
       symbolPosition: "end",
       data: data1,
+      tooltip: {
+        show:false}
     },
     {
       name: "增涨率",
@@ -269,6 +272,8 @@ var options = {
         opacity: 0.7,
       },
       data: [18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18],
+      tooltip: {
+        show:false}
     },
   ],
 };

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue

@@ -14,14 +14,14 @@
         <el-table :border="false" :data="tableData" style="width: 100%">
           <el-table-column prop="nem" label="" width="30">
           </el-table-column>
-          <el-table-column prop="address" label="桩号范围">
+          <el-table-column prop="address" label="路段名称">
           </el-table-column>
-          <el-table-column prop="name" label="能见度" class-name="showClass">
+          <el-table-column prop="name" label="指标名称" class-name="showClass">
             <template slot-scope="scope">
               <span class="showClass">{{ scope.row.name }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="date" label="发生时间">
+          <el-table-column prop="date" label="统计时间">
           </el-table-column>
         </el-table>
       </div>

ruoyi-ui/src/views/websocket.vue

@@ -30,8 +30,8 @@ export default {
       // console.log(location.hostname )
       // 建立 websocket 连接
       this.socket.initialize({
-        // url: 'ws://' + location.hostname + ':' + port + path,
+        url: 'ws://' + location.hostname + ':' + port + path,
-        url: "ws://10.7.179.15" + ":" + port + path,
+        // url: "ws://10.7.179.15" + ":" + port + path,
         // url: "ws://10.168.64.171" + ":" + port + path,
         //  url: 'ws://10.168.78.127'+ ':' + port + path,