diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 6ec632b5..5a8efaf2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -36,7 +36,7 @@ import Video from "@screen/components/Video";
import request from "@/utils/request";
import { delay } from "@screen/utils/common.js";
import { handle3CResult } from "@screen/utils/deviceControl.js";
-import { controlModelMap, gzztMap } from "@screen/utils/enum.js";
+import { inducerModeDic, inducerWorkTypeDic } from "@screen/utils/enum.js";
import { find, assign } from "lodash";
import { dialogDelayVisible } from "./../mixin";
import LineChart from "../../LineChart/index.vue";
@@ -154,11 +154,11 @@ export default {
methods: {
updateFormData(formData) {
formData.workMode &&
- this.$set(this.data, "workMode", controlModelMap[formData.workMode]); //(this.data.workMode = controlModelMap[formData.controlType]);
+ this.$set(this.data, "workMode", inducerModeDic[formData.workMode]); //(this.data.workMode = inducerModeDic[formData.controlType]);
formData.inWorkStatus &&
- this.$set(this.data, "inWorkStatus", gzztMap[formData.inWorkStatus]); //(this.data.inWorkStatus = gzztMap[formData.inWorkStatus]);
+ this.$set(this.data, "inWorkStatus", inducerWorkTypeDic[formData.inWorkStatus]); //(this.data.inWorkStatus = inducerWorkTypeDic[formData.inWorkStatus]);
formData.onWorkStatus &&
- this.$set(this.data, "onWorkStatus", gzztMap[formData.onWorkStatus]); //(this.data.onWorkStatus = gzztMap[formData.onWorkStatus]);
+ this.$set(this.data, "onWorkStatus", inducerWorkTypeDic[formData.onWorkStatus]); //(this.data.onWorkStatus = inducerWorkTypeDic[formData.onWorkStatus]);
},
handleClickTabs() { },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
index a0efe10c..3da4843a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
@@ -29,7 +29,7 @@ import Video from "@screen/components/Video";
import Form from "@screen/components/FormConfig";
import request from "@/utils/request";
import { Message } from "element-ui";
-import moment from "moment";
+import moment, { fn } from "moment";
import Carousel from "@screen/pages/control/event/event/EventDetailDialog/Carousel";
import {
WarningTypeList,
@@ -183,8 +183,10 @@ export default {
};
},
async created() {
- this.getDetails();
- this.getVehicleTypeList();
+ let self = this;
+ this.getVehicleTypeList(function(){
+ self.getDetails();
+ });
},
async mounted() { },
beforeDestroy() {
@@ -220,8 +222,11 @@ export default {
});
});
},
- getVehicleTypeList() {
- if (vehicleTypeList.length) return;
+ getVehicleTypeList(fn) {
+ if (vehicleTypeList.length) {
+ fn()
+ return
+ };
request({
url: `/system/dict/data/type/${"sys_vehicle_type"}`,
@@ -230,13 +235,13 @@ export default {
})
.then(({ data, code }) => {
if (code != 200) return Message.error("详情获取失败");
-
vehicleTypeList = this.formList[5].options.options = data.map(
(item) => ({
key: item.dictValue,
label: item.dictLabel,
})
);
+ fn();
})
.catch((err) => { });
},
@@ -301,10 +306,6 @@ export default {
setTimeout(() => {
this.$refs.FormConfigRef.reset(true);
});
- setTimeout(() => {
- this.formList[5].options = { options:
- WarningSubclassList[data.warningType] || []};
- }, 100);
this.data.direction = DirectionTypes[this.data.direction];
this.data.duration = getDuration(this.data.warningTime);
this.interval = setInterval(() => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
index f43ad33b..ba20ca4d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
@@ -155,7 +155,7 @@ div.switcher {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
index cdebf164..e2d45106 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
@@ -70,29 +70,36 @@
-
+
+
-
+ 分钟
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -100,19 +107,19 @@
-
+
-
+ 分钟
-
+
保存
@@ -123,7 +130,7 @@