Browse Source

feat 优化 行车诱导控制操作回显 provide

wangqin
qingzhengli 1 year ago
parent
commit
5c01c07b73
  1. 25
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
  2. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue
  3. 20
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue

25
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue

@ -21,32 +21,7 @@ import Form from "@screen/components/FormConfig";
import { Message } from "element-ui"; import { Message } from "element-ui";
// import { axiosIns } from "@screen/utils/axios/auth.js"; // import { axiosIns } from "@screen/utils/axios/auth.js";
import { handle3CResult } from "@screen/utils/deviceControl.js";
import DeviceParam from "./DeviceParam.vue"; import DeviceParam from "./DeviceParam.vue";
const workStatus = [
{
key: "00",
label: "不更新状态",
disabled: false,
},
{
key: "01",
label: "常亮",
},
{
key: "02",
label: "流水",
},
{
key: "03",
label: "闪烁",
},
{
key: "04",
label: "关闭",
disabled: false,
},
];
export default { export default {
name: "DeviceControlDialog", name: "DeviceControlDialog",

4
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue

@ -79,7 +79,7 @@ export default {
default: () => [] default: () => []
} }
}, },
inject: ["requestURL"], inject: ["requestURL", "updateFormData"],
data() { data() {
return { return {
formData: {}, formData: {},
@ -267,6 +267,7 @@ export default {
// ); // );
break; break;
} }
console.log(result, "resultxxxxx")
batchFunctions({ batchFunctions({
devices: devices, devices: devices,
functions: functions functions: functions
@ -275,6 +276,7 @@ export default {
.then(() => { .then(() => {
this.$emit("update:value", false); // this.modelVisible = false; this.$emit("update:value", false); // this.modelVisible = false;
Message.success(`操作成功`); Message.success(`操作成功`);
this.updateFormData({ ...result, workMode: result.mode });
}) })
.catch((err) => { .catch((err) => {
console.log( console.log(

20
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue

@ -37,7 +37,7 @@ import request from "@/utils/request";
import { delay } from "@screen/utils/common.js"; import { delay } from "@screen/utils/common.js";
import { handle3CResult } from "@screen/utils/deviceControl.js"; import { handle3CResult } from "@screen/utils/deviceControl.js";
import { controlModelMap, gzztMap } from "@screen/utils/enum.js"; import { controlModelMap, gzztMap } from "@screen/utils/enum.js";
import { find } from "lodash"; import { find, assign } from "lodash";
import { dialogDelayVisible } from "./../mixin"; import { dialogDelayVisible } from "./../mixin";
import LineChart from "../../LineChart/index.vue"; import LineChart from "../../LineChart/index.vue";
@ -48,6 +48,7 @@ export default {
provide() { provide() {
return { return {
requestURL: this.requestURL, requestURL: this.requestURL,
updateFormData: this.updateFormData
}; };
}, },
components: { components: {
@ -138,13 +139,7 @@ export default {
const formData = {}; const formData = {};
formData.controlType = data.mode; formData.controlType = data.mode;
await handle3CResult(data, formData, this.requestURL); await handle3CResult(data, formData, this.requestURL);
this.updateFormData({ ...formData, workMode: data.mode });
formData.controlType &&
this.$set(this.data, "workMode", controlModelMap[formData.controlType]); //(this.data.workMode = controlModelMap[formData.controlType]);
formData.inWorkStatus &&
this.$set(this.data, "inWorkStatus", gzztMap[formData.inWorkStatus]); //(this.data.inWorkStatus = gzztMap[formData.inWorkStatus]);
formData.onWorkStatus &&
this.$set(this.data, "onWorkStatus", gzztMap[formData.onWorkStatus]); //(this.data.onWorkStatus = gzztMap[formData.onWorkStatus]);
}); });
const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark); const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
@ -157,6 +152,15 @@ export default {
if (roadInfo) this.data.roadName = roadInfo.roadName; if (roadInfo) this.data.roadName = roadInfo.roadName;
}, },
methods: { methods: {
updateFormData(formData) {
formData.workMode &&
this.$set(this.data, "workMode", controlModelMap[formData.workMode]); //(this.data.workMode = controlModelMap[formData.controlType]);
formData.inWorkStatus &&
this.$set(this.data, "inWorkStatus", gzztMap[formData.inWorkStatus]); //(this.data.inWorkStatus = gzztMap[formData.inWorkStatus]);
formData.onWorkStatus &&
this.$set(this.data, "onWorkStatus", gzztMap[formData.onWorkStatus]); //(this.data.onWorkStatus = gzztMap[formData.onWorkStatus]);
},
handleClickTabs() { }, handleClickTabs() { },
requestURL(functionId = 52, options = {}) { requestURL(functionId = 52, options = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

Loading…
Cancel
Save