diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue index b170bd8c..e24e8e8a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue @@ -33,6 +33,7 @@ import { merge, cloneDeep, find } from "lodash"; import request from "@/utils/request"; import { log } from "mathjs"; import { ChildTypes } from "@screen/utils/enum.js" +import { initSearch } from "@screen/utils/enum/common.js" const DeviceTypeIds = [1, 2]; export default { @@ -128,7 +129,7 @@ export default { async handleResetForm() { this.$refs.FormConfigRef?.reset(); this.activeIcon = "filter"; - this.filterEnd(null); + this.filterEnd(initSearch); }, async handleSearch() { const data = await this.$refs.FormConfigRef.validate(); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue index 5bbd9a78..31acbadd 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue @@ -34,6 +34,7 @@ import { markerClusterIns } from "@screen/pages/Home/components/RoadAndEvents/ut import { ChildTypes } from "@screen/utils/enum.js" import { getDeviceList } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"; import { delay } from "@screen/utils/common"; +import { initSearch } from "@screen/utils/enum/common.js" import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent" const DeviceTopics = {} @@ -112,7 +113,7 @@ export default { }, }, key: "startStakeMark[0]", - default: "55", + default: initSearch.startStakeMark[0], rules: [ { message: "请补全桩号", @@ -140,7 +141,7 @@ export default { color: "#3DE8FF", }, }, - default: "378", + default: initSearch.startStakeMark[1], key: "startStakeMark[1]", ons: { //on监听 element事件 change(value, ...args) { @@ -163,7 +164,7 @@ export default { }, }, key: "endStakeMark[0]", - default: "208", + default: initSearch.endStakeMark[0], rules: [ { message: "请补全桩号", @@ -190,7 +191,7 @@ export default { color: "#3DE8FF", }, }, - default: "153", + default: initSearch.endStakeMark[1], key: "endStakeMark[1]", ons: { //on监听 element事件 change(value, ...args) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue index 63d8f0af..47fbe238 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -9,55 +9,47 @@ - - - - + + + + - - - + + + - - 在线 - 离线 - + + 在线 + 离线 + K - + + - + K - + + - + @@ -67,55 +59,35 @@
- - + +
- - - + + +
{{ itm.deviceName }}
 - +
{{ itm.deviceName }}
{{ itm.deviceName }}
- - + + - +
-
+
暂无数据
@@ -128,20 +100,10 @@
- 添加信息 - 发布信息 + 添加信息 + 发布信息
- -
+ +
- +
-

+

-

+

- +
@@ -219,29 +159,17 @@
-->
- 添加模板 + 添加模板
-
+

{{ item.dictLabel }}

- +
-

+

-

+

@@ -274,21 +194,12 @@
- + - + @@ -299,14 +210,8 @@ - +
@@ -336,6 +241,7 @@ import testDeviceInfo from "@screen/testData/infoBoard.js"; import WgtTitle from "@screen/pages/perception/widgets/title"; import InfoBoard from "@screen/mixins/InfoBoard"; +import { initSearch } from "@screen/utils/enum/common.js" export default { name: "Device", @@ -519,18 +425,18 @@ export default { this.____getIotBoard(); }, - ____onSearchDevice(){ + ____onSearchDevice() { this.____getIotBoard(); }, - ____resetForm(){ + ____resetForm() { this.form = { selectedDirection: "", status: ["0", "1"], - stakeFrom: [55, 378], - stakeTo: [208, 153] + stakeFrom: initSearch.startStakeMark, + stakeTo: initSearch.endStakeMark } }, - ____onResetSearchDevice(){ + ____onResetSearchDevice() { this.____resetForm(); this.____initDirection(); this.____getIotBoard(); @@ -548,10 +454,10 @@ export default { let stakeFrom = this.form.stakeFrom[0] * 1000 + this.form.stakeFrom[1]; let stakeTo = this.form.stakeTo[0] * 1000 + this.form.stakeTo[1]; let statusForm = _.cloneDeep(this.form.status); - if(statusForm.includes("0")){ + if (statusForm.includes("0")) { statusForm.push(null) - } - + } + if (IS_TESTING) { let res = testDeviceList; res.data.forEach((item) => { @@ -574,10 +480,10 @@ export default { item.otherConfig = JSON.parse(item.otherConfig); } item.iotDeviceId = item.iotDeviceId || "null_" + item.id; - + let stakeThis = +item?.stakeMark?.replace(/[K\+]/g, "") || -1; - if(stakeThis >= stakeFrom && stakeThis <= stakeTo && statusForm.includes(item.deviceState)){ + if (stakeThis >= stakeFrom && stakeThis <= stakeTo && statusForm.includes(item.deviceState)) { this.boardSizeDic[item.otherConfig.screenSize].list.push(item); } if (!this.selectedSize) { @@ -612,11 +518,11 @@ export default { this.isHideCtt = false; }); }) - .catch((err) => {}); + .catch((err) => { }); } }, ____onAddTemplate() { - + // if(selectedSize){ // fontSize = "64px" // } @@ -798,7 +704,7 @@ export default { }, // 接收子组件form表单 修改 - receiveForm(form) { + receiveForm(form) { console.log(form, "接收子组件form表单 修改"); this.contentList.splice(this.index_, 1, form); this.$forceUpdate(); @@ -812,11 +718,11 @@ export default { if (this.checkedDeviceIds.length == 0) { return; } - - this.selectedDevices = _.filter(this.boardSizeDic[this.selectedSize].list, (item)=>{ + + this.selectedDevices = _.filter(this.boardSizeDic[this.selectedSize].list, (item) => { return this.checkedDeviceIds.includes(item.iotDeviceId) }); - + // this.____forkDeviceInfo(this.selectedDevices); }, @@ -1037,11 +943,14 @@ export default { };