bug修改

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

@@ -494,6 +494,81 @@ export const tabConfigList = [
               },
             ],
           },
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              const classify = formList.find(
+                (it) => it.key == "dcEventTrafficControl.classify"
+              );
+              let ss = {
+                "3-1": "主线",
+                "3-2": "收费站",
+                "3-3": "立交",
+                "3-4": "服务区",
+              };
+              let ad = {
+                1: [
+                  {
+                    key: "1",
+                    label: `${ss[value]}关闭`,
+                  },
+                ],
+                2: [
+                  {
+                    key: "2",
+                    label: "主线限行",
+                  },
+                  {
+                    key: "3",
+                    label: "主线间隔放行",
+                  },
+                  {
+                    key: "4",
+                    label: "主线并道",
+                  },
+                  {
+                    key: "5",
+                    label: "主线限速",
+                  },
+                ],
+              };
+              classify.options.options = ad[data.dcEventTrafficControl.controlType];
+
+              if(data.dcEventTrafficControl) {
+                data.dcEventTrafficControl.facilityId = null;
+              }
+              let facilityType = 1;
+              if (value == '3-2') {
+                facilityType = 1;
+              } else if (value == '3-3') {
+                facilityType = 3;
+              } else if (value == '3-4') {
+                facilityType = 6;
+              }
+              if(value && value != '3-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 == "dcEventTrafficControl.facilityId"){
+                      it.options.options = lwss;
+                    }
+                  });
+                  
+                }).catch((err) => {
+                  console.log('err',err)
+                  Message.error("查询失败1", err);
+                })
+              }
+
+            },
+          },
         },
         {
           label: "管制分类:",
@@ -518,7 +593,7 @@ export const tabConfigList = [
           ons: {
             input(value, ...args) {
               const { data, formList } = args.slice(-1)[0];
-              const config = formList.find(
+              const classify = formList.find(
                 (it) => it.key == "dcEventTrafficControl.classify"
               );
               const measure = formList.find(
@@ -591,7 +666,7 @@ export const tabConfigList = [
                 ],
               };
               measure.options.options = cs[value];
-              config.options.options = ad[value];
+              classify.options.options = ad[value];
             },
           },
         },
@@ -608,24 +683,7 @@ export const tabConfigList = [
               {
                 key: "1",
                 label: "主线关闭",
-              },
-              {
-                key: "2",
-                label: "主线限行",
-              },
-              {
-                key: "3",
-                label: "主线间隔放行",
-              },
-              {
-                key: "4",
-                label: "主线并道",
-              },
-              {
-                key: "5",
-                label: "主线限速",
-              },
-            ],
+              },],
           },
         },
         {
@@ -743,7 +801,7 @@ export const tabConfigList = [
         PresetFormItems.emptyLine,
         {
           label: "出入口:",
-          key: "dcEventTrafficControl.controlCause",
+          key: "dcEventTrafficControl.exitsInlets",
           type: "RadioGroup",
           isAlone: true,
           required: true,
@@ -762,7 +820,7 @@ export const tabConfigList = [
             ],
           },
           visible: (data) => {
-            if (data?.eventSubclass == "3-2") {
+            if (data?.eventSubclass == "3-2" || data?.eventSubclass == "3-4") {
               return true;
             }
             return false;
@@ -784,6 +842,83 @@ export const tabConfigList = [
             return false;
           },
         },
+        {
+          label: "立交桥:",
+          key: "dcEventTrafficControl.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-3") {
+              return true;
+            }
+            return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  // console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventTrafficControl.rampId") {
+                      console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败3", err);
+                });
+            },
+          },
+        },
+        {
+          label: "匝道:",
+          key: "dcEventTrafficControl.rampId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-3") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "服务区:",
+          key: "dcEventTrafficControl.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-4") {
+              return true;
+            }
+            return false;
+          },
+        },
         {
           label: "措施:",
           required: true,

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

@@ -109,7 +109,7 @@ export const gjSearchFormList = [
     required: false,
     type: "datePicker",
     options: {
-      type: "daterange",
+      type: "datetimerange",
       format: "yyyy-MM-dd HH:mm:ss",
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },