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

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

@@ -281,7 +281,7 @@ export default {
 
             return result
           });
-          this.total = result.total;
+          this.setTotal(result.total);
         })
         .finally(() => {
           this.isFirst = false;

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue

@@ -133,10 +133,10 @@ export default {
             ]
           }
         }),
-        {
-          label: "救援单位:",
-          key: "rescueUnit"
-        },
+        // {
+        //   label: "救援单位:",
+        //   key: "rescueUnit"
+        // },
         {
           label: "描述:",
           key: "description",

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

@@ -157,7 +157,6 @@ export default {
         params: {},
       })
         .then(({ data, code }) => {
-          console.log("Success", data);
           if (code != 200) return; //Message.error("详情获取失败");
           this.vehicleTypeList = data;
         })
@@ -223,7 +222,6 @@ export default {
               if (item.car.length > 0) {
                 for (var i = 0; i < item.car.length; i++) {
                   if (item.car[i].vehicleType == items.dictValue) {
-                    // let data =
                     data.push(items.dictLabel + "*" + item.car[i].carNum);
                     // item.cars = items.dictLabel + "*" + item.car[i].carNum;
                   }
@@ -231,8 +229,7 @@ export default {
               }
             });
           });
-          console.log(999, this.dataList);
-          console.log(999, data);
+          
           this.dataList.forEach((item) => {
             if (item.car.length > 0) {
               item.cars = data.join("、");

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue

@@ -115,8 +115,8 @@ export default {
           data: {}
         }),
 
-        // 机构
-        getSelectOptionsStation()
+        // 机构,返回数据中去掉 济菏运管中心
+        getSelectOptionsStation(2)
 
       ])
         .then(([post, organization]) => {

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

@@ -1,11 +1,20 @@
 import { cloneDeep, merge } from "lodash";
 import * as PresetFormItems from "@screen/common/PresetFormItems.js";
+import { formList } from "../../../dispatch/EventDetailDialog/data";
 
 export const searchFormList = [
   PresetFormItems.startStation,
   PresetFormItems.endStation
 ];
 
+//里程计算
+const mileCal = (data) => {
+  const { startStakeMark, endStakeMark } = data;
+  const start = startStakeMark[0] + "." + Number(startStakeMark[1]);
+  const end = endStakeMark[0] + "." + Number(endStakeMark[1]);
+  data.mileage = (Number(end) - Number(start)).toFixed(3);
+}
+
 export const addEditFormList = [
   {
     label: "部门:",
@@ -38,9 +47,49 @@ export const addEditFormList = [
 
   merge(cloneDeep(PresetFormItems.startStation), {
     required: true,
+    options: {
+      options: [
+        {
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              mileCal(data);
+            }
+          },
+        },
+        {
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              mileCal(data);
+            }
+          },
+        },
+      ]
+    }
   }),
   merge(cloneDeep(PresetFormItems.endStation), {
     required: true,
+    options: {
+      options: [
+        {
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              mileCal(data);
+            }
+          },
+        },
+        {
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              mileCal(data);
+            }
+          },
+        },
+      ]
+    }
   }),
 
   {