diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue index b8a36fac..4c9b449e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue @@ -1,726 +1,691 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue index 1d340e97..1d0ad427 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue @@ -13,30 +13,20 @@ @@ -44,42 +34,44 @@ @@ -93,6 +85,9 @@ + + + @@ -100,6 +95,7 @@ import Table from '@screen/components/Table.vue'; import Button from '@screen/components/Buttons/Button.vue'; import request from "@/utils/request"; +import QbbDialog from "../qbbDialog/index.vue"; import { Message } from 'element-ui' @@ -108,6 +104,7 @@ export default { components: { Button, Table, + QbbDialog }, model: { prop: 'visible', @@ -121,7 +118,7 @@ export default { default: () => [{ deviceType: 1, searchRule: 1, - qbb: '安全行驶' + qbb: '' }] } }, @@ -134,10 +131,11 @@ export default { // qbb: '安全行驶' // } // ], + isShowDialog: false, deviceOptions: [ { value: 1, - label: '门架式可变信息标志' + label: '可变信息标志' }, { value: 2, @@ -166,64 +164,106 @@ export default { label: '最近公里数' }, ], - options: [ + gzztOptions: [ { - value: 1, - label: '交通事故' + value: "01", + label: "常亮" }, { - value: 2, - label: '车辆故障' + value: "02", + label: "流水" }, { - value: 3, - label: '交通管制' + value: "03", + label: "闪烁" }, { - value: 4, - label: '交通拥堵' + value: "04", + label: "关闭", + } + ], + gzmsOptions: [ + { + value: "SETMD0", + label: "激光关闭" + }, + { + value: "SETMD1", + label: "常亮模式" }, { - value: 5, - label: '非法上路' + value: "SETMD2", + label: "间隔100ms闪烁模式" }, { - value: 6, - label: '路障清除' + value: "SETMD3", + label: "间隔200ms闪烁模式", }, { - value: 7, - label: '施工建设' + value: "SETMD4", + label: "间隔500ms闪烁模式", }, { - value: 8, - label: '服务区异常' + value: "SETMD5", + label: "2次闪烁模式" }, { - value: 9, - label: '设施设备隐患' + value: "SETMD6", + label: "SOS模式" }, { - value: 10, - label: '异常天气' + value: "SETMD7", + label: "自定义模式1", }, { - value: 11, - label: '其他事件' + value: "SETMD8", + label: "自定义模式2", + }, + { + value: "SETMD9", + label: "自定义模式3", } ], + sbOptions: [], deviceType: 1, + index: 1 } }, + created() { + this.initData(); + }, methods: { + initData() { + + request({ + url: `business/device/query?deviceType=2`, + method: "get", + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + this.sbOptions = result.data; + + }).catch(() => { + Message.error("查询可变信息标识失败"); + }) + + }, changeDeviceType(value) { this.deviceType = value; + // if(value == 1){ + // this.searchRule = 1 + // }else if(value == 2){ + // this.searchRule = 1 + // }else if(value == 3){ + // this.searchRule = 1 + // }else if(value == 4){ + // this.searchRule = 1 + // } }, onAdd(id) { this.tableData.push({ deviceType: 1, - // searchRule: 1, - // qbb: '安全行驶' + searchRule: 1, + qbb: '' }) }, onDel(index) { @@ -232,6 +272,17 @@ export default { } this.tableData.splice(index, 1) }, + clickQbb(index) { + this.index = index; + this.isShowDialog = true; + }, + onCloseDialog() { + this.isShowDialog = false; + }, + dialogSubmit(data) { + this.tableData[this.index].qbb = data.content; + this.tableData[this.index].otherConfig = JSON.stringify({ dcInfoBoardTemplate: data }); + } } } @@ -264,6 +315,16 @@ export default { display: flex; } + ::v-deep { + .el-tag.el-tag--info { + max-width: 100px; + } + + .el-range-editor--medium .el-range__icon, + .el-range-editor--medium .el-range__close-icon { + display: none; + } + } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue new file mode 100644 index 00000000..faccbff2 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue @@ -0,0 +1,276 @@ + + + + + \ No newline at end of file