From f25e3c4bb44b93a60f417a16458e155f750a50c2 Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Wed, 6 Mar 2024 10:53:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/utils/request.js | 8 +++ .../components/infoBoard/BoardInfoEditor.vue | 54 +++++++++++++++---- .../components/infoBoard/BoardPreview.vue | 4 +- .../components/infoBoard/BoardTplPreview.vue | 2 + .../views/JiHeExpressway/mixins/InfoBoard.js | 3 +- .../pages/service/board/index.vue | 19 ++++--- ruoyi-ui/vue.config.js | 4 +- 7 files changed, 72 insertions(+), 22 deletions(-) diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index d31b22f7..1acab51b 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -141,6 +141,14 @@ service.interceptors.response.use(res => { else if (message.includes("Request failed with status code")) { message = "系统接口" + message.substr(message.length - 3) + "异常"; } + else if (message.includes("client_offline")) + { + message = "设备离线" + } + else if (message.includes("time_out")) + { + message = "连接超时" + } Message({ message: message, type: 'error', diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue index 5a34ea16..54ba5735 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue @@ -101,6 +101,7 @@ :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue" + v-if="+(item.dictValue.replace('px',''))<=maxFontSize" > @@ -191,6 +192,7 @@ import { debounce } from "lodash"; export default { data() { return { + maxFontSize:100, alignmentNum: 2, content: "", boardWidth: "", @@ -316,6 +318,17 @@ export default { speechSpeed: "0", font: "3", }, + templateDefault: { + category: "", + formatStyle: "2", + content: "", + fontColor: "", + fontSize: "", + fontType: "", + stopTime: 50, + inScreenMode: "", + screenSize: "", + }, isLocked: false, }; }, @@ -361,6 +374,26 @@ export default { }, }, watch: { + screenSize(newV){ + + if(newV){ + let boardH = newV.split("*")[1]; + let fontSize = "20"; + if (['64', '48'].includes(boardH)) { + this.maxFontSize = +boardH + fontSize = boardH + "" + } else if (['80'].includes(boardH)) { + this.maxFontSize = +boardH / 2 + fontSize = +boardH / 2 + "" + } else if (['160'].includes(boardH)) { + this.maxFontSize = +boardH / 2 + fontSize = +boardH / 4 + "" + } + this.deviceCttDefault.fontSize = fontSize + this.templateDefault.screenSize = newV; + this.templateDefault.fontSize = fontSize; + } + }, visible: { handler(newV) { this.dialogVisible = newV; @@ -400,21 +433,30 @@ export default { }, mounted() {}, created() { + this.templateDefault.fontType = this.fontTypeList[0].dictValue //设置模板的默认值 this.getDicts("iot_devices_font_color").then((res) => { this.colorList = res.data; + this.templateDefault.fontColor = this.colorList[0].dictValue // console.log(this.colorList, "字体颜色"); }); this.getDicts("iot_device_font_inScreen_mode").then((res) => { this.inScreenModeList = res.data; + this.templateDefault.inScreenMode = this.inScreenModeList[0].dictValue // console.log(this.inScreenModeList, "入屏方式"); }); this.getDicts("iot_template_category").then((res) => { this.templateCategoryList = res.data; + this.templateDefault.category = this.templateCategoryList[0].dictValue }); this.getDicts("iot_device_font_size").then((res) => { this.fontSizeList = res.data; + // this.templateDefault.fontSize = this.fontSizeList[0].dictValue // this.dataForm.FONT_SIZE = res.data[1].dictValue }); + + + + }, methods: { initData() { @@ -433,17 +475,7 @@ export default { if (this.mode == "add") { let tempTpl = null; if (this.type == "template") { - tempTpl = { - category: this.templateCategoryList[0].dictValue, - formatStyle: 0, - content: "", - fontColor: this.colorList[0].dictValue, - fontSize: this.fontSizeList[0].dictValue, - fontType: this.fontTypeList[0].dictValue, - stopTime: 50, - inScreenMode: this.inScreenModeList[0].dictValue, - screenSize: this.screenSize, - }; + tempTpl = _.merge({}, this.templateDefault, this.tpl); } else { tempTpl = _.merge({}, this.deviceCttDefault, this.tpl.origin); //首页弹窗，新增设备项时，需要传设备尺寸过来 } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue index 005fa7d5..51c3e6da 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue @@ -40,7 +40,7 @@ export default { }, tpl:{ handler(newV){ - this.contentArr = this.tpl.textContent.replaceAll(/\\\\n/g, '\n').replaceAll(/ /g, ' ').split('\n'); + this.contentArr = this.tpl.textContent.replaceAll(/\\\\n/g, '\n').replaceAll(/\\=/g, '=').replaceAll(/\\,/g, ',').replaceAll(/ /g, ' ').split('\n'); this.setStyle(); }, deep:true, @@ -113,6 +113,8 @@ export default { color: #f00; line-height: 1; margin-bottom: 0; + word-break: keep-all; + white-space: nowrap; } } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue index 71f8144c..473dbb38 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue @@ -110,6 +110,8 @@ export default { color: #f00; line-height: 1; margin-bottom: 0; + word-break: keep-all; + white-space: nowrap; } } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js index 0dcc45a8..5d9b420e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js +++ b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js @@ -11,13 +11,14 @@ export default{ // 新增待下发 ____onAddDeviceItem() { let arr = this.selectedSize.split("*"); + this.editDialog = { visible: true, mode: "add", type: "device", tpl: { "textContent": "", - origin: { + "origin": { displayAreaWidth: +arr[0], displayAreaHeight: +arr[1] } 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 516e4897..14477d93 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -57,8 +57,8 @@ :key="index" >
{{ itm.deviceName }}
- - + + @@ -455,7 +455,7 @@ export default { res.data.forEach((item) => { this.boardSizeDic[item.dictValue] = { label: item.dictLabel, - list: [], + list: [] }; }); }); @@ -533,6 +533,7 @@ export default { if (_.isString(item.otherConfig)) { item.otherConfig = JSON.parse(item.otherConfig); } + item.iotDeviceId = item.iotDeviceId || "null_" + item.id; this.boardSizeDic[item.otherConfig.screenSize].list.push(item); if (!this.selectedSize) { this.selectedSize = item.otherConfig.screenSize; @@ -569,7 +570,7 @@ export default { this.selectedBdMsg = []; this.selectedBdMsg = _.cloneDeep(testDeviceInfo.data["3A"].content); } else { - if (!deviceFrom.iotDeviceId) { + if (!deviceFrom.iotDeviceId || deviceFrom.iotDeviceId.includes("null_")) { this.$message.warning("设备未接入！"); return; } @@ -586,12 +587,16 @@ export default { } }, ____onAddTemplate() { + + // if(selectedSize){ + // fontSize = "64px" + // } this.editDialog = { visible: true, mode: "add", type: "template", tpl: { - content: "", + content: "" }, }; }, @@ -783,8 +788,8 @@ export default { return; } this.checkedDeviceIds = [arr.pop()]; - if (!this.checkedDeviceIds[0]) { - this.$message.warning("该设备缺少iotDeviceId参数!"); + if (!this.checkedDeviceIds[0] || this.checkedDeviceIds[0].includes("null_")) { + this.$message.warning("设备未接入！"); } this.selectedDevice = _.find(this.boardSizeDic[this.selectedSize].list, { iotDeviceId: this.checkedDeviceIds[0], diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 25f5969a..388187f1 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -51,8 +51,8 @@ module.exports = { // target: `http://10.0.81.204:8087`, //现场后台 刘文阁 // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁 // target: `http://10.168.78.135:8087`, //王钦 - // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 - target: `http://10.168.68.42:8087`, //王思祥 + target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 + // target: `http://10.168.68.42:8087`, //王思祥 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "",