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/emergencyAgencies/index.vue

@@ -61,6 +61,8 @@ import { setLoading } from "@screen/utils/index.js"
 import { delay, exportFile, confirm } from "@screen/utils/common";
 import { Message } from "element-ui";
 
+let vehicleTypeList = [];
+
 // 应急机构
 export default {
   name: 'EmergencyAgencies',
@@ -105,18 +107,48 @@ export default {
           key: "dcOrganizations.stakeMark",
           label: "桩号"
         },
+        // {
+        //   key: "dcOrganizations.latitude",
+        //   label: "救援外协单位"
+        // },
         {
-          key: "dcOrganizations.latitude",
+          key: "car",
-          label: "救援外协单位"
+          label: "驻点车辆",
+          value: "aaa"
+        },
+        {
+          key: "employeesNum",
+          label: "驻点人员"
         }
       ],
-      isFirst: true,
+      isFirst: true
     }
   },
   created() {
     this.getData();
+    this.getVehicleTypeList();
   },
   methods: {
+    getVehicleTypeList() {
+      if (vehicleTypeList.length) return;
+
+      request({
+        url: `/system/dict/data/type/sys_vehicle_type`,
+        method: "GET",
+        params: {}
+      })
+        .then(({ data, code }) => {
+          if (code != 200) return ;//Message.error("详情获取失败");
+
+          // vehicleTypeList = this.formList[5].options.options = data.map(item => ({
+          //   key: item.dictValue,
+          //   label: item.dictLabel
+          // }))
+        })
+        .catch((err) => {
+
+        });
+    },
     async handleDelete(data) {
       await confirm({ message: "是否要删除该机构?" });