diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss index 36e5c973..660da6bd 100644 --- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss +++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss @@ -1,14 +1,17 @@ .theme-jihe { + $lightBlue: #3de8ff; $textColor: #f4f4f4; $inputHeight: 26px; color: $textColor; + .text-center{ text-align: center;} + .tc-lb{ color: $lightBlue;} .el-tabs__item { color: $textColor; } .el-form-item { - margin-bottom: 14px; + margin-bottom: 8px; } .el-form-item__label { @@ -47,11 +50,14 @@ // 多选框组 .el-checkbox-group { + // height: $inputHeight; .el-checkbox__label { color: $textColor; + padding-left: 6px; } .el-checkbox { + margin-right: 16px; .el-checkbox__inner { width: 20px; height: 20px; @@ -92,12 +98,17 @@ color: #fff; &.is-disabled { - color: #006a99; + color: #096d8c; } } .el-input { margin: 0; + .el-input__inner{ + height: calc($inputHeight + 2px); + background-color: #096d8c; + padding:0 28px; + } } } // 单选按钮 diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue index 8d34a74d..ff5a269d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue @@ -101,10 +101,10 @@ export default { mounted() { this.initScale(); - // window.addEventListener( - // "resize", - // _.debounce(this.initScale.bind(this), 360) - // ); + window.addEventListener( + "resize", + _.debounce(this.initScale.bind(this), 360) + ); }, }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue index 52426051..f5e4f510 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue @@ -165,7 +165,7 @@ export default { "reset" ); }, - async handleSearch() { + async handleSearch(value) { if (this.types === "input") { let params = {}; params[this.params] = this.value; 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 14477d93..cb8fa6b1 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -10,28 +10,63 @@ - - - - + + + + + + + + + + + + + 在线 + 离线 + + + + + K + + + + + + + + + + + K + + + + + + + + - + + 搜索 + 重置 + + +
+
- +
@@ -357,13 +392,7 @@ export default { deviceList: [], //分辨率 checkedDeviceIds: [], //多选 选中项 templateAvailable: [], - form: { - selectedDirection: "", - company: null, - mechanism: null, - localInfo: null, - selectedPixel: null, - }, //情报板列表表单 + form: {}, supplier: null, //报文类型 activeNames: [], //模板 展开项 tplCategory: [], //模板 @@ -408,6 +437,7 @@ export default { // } }, created() { + this.____resetForm(); Promise.all([ this.____initDirection(), this.____getBoardPixel(), @@ -501,9 +531,25 @@ export default { this.____getIotBoard(); }, + ____onSearchDevice(){ + this.____getIotBoard(); + }, + ____resetForm(){ + this.form = { + selectedDirection: "", + status: ["0", "1"], + stakeFrom: [55, 378], + stakeTo: [208, 153] + } + }, + ____onResetSearchDevice(){ + this.____resetForm(); + this.____initDirection(); + this.____getIotBoard(); + }, // 情报板设备 折叠面板 ____getIotBoard() { - this.checkAll = false; + // this.checkAll = false; for (let key in this.boardSizeDic) { this.boardSizeDic[key].list = []; } @@ -511,6 +557,13 @@ export default { let param = { direction: this.form.selectedDirection, }; + 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")){ + statusForm.push(null) + } + if (IS_TESTING) { let res = testDeviceList; res.data.forEach((item) => { @@ -534,7 +587,12 @@ export default { item.otherConfig = JSON.parse(item.otherConfig); } item.iotDeviceId = item.iotDeviceId || "null_" + item.id; - this.boardSizeDic[item.otherConfig.screenSize].list.push(item); + + let stakeThis = +item?.stakeMark?.replace(/[K\+]/g, "") || -1; + + if(stakeThis >= stakeFrom && stakeThis <= stakeTo && statusForm.includes(item.deviceState)){ + this.boardSizeDic[item.otherConfig.screenSize].list.push(item); + } if (!this.selectedSize) { this.selectedSize = item.otherConfig.screenSize; } @@ -1109,10 +1167,15 @@ export default { };