From 8b3fe3014d639aeb317200b00c35997bdde3dff3 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Fri, 29 Dec 2023 15:22:12 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E6=A8=A1?=
=?UTF-8?q?=E6=9D=BF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/information/board/editInfo.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ruoyi-ui/src/views/information/board/editInfo.vue b/ruoyi-ui/src/views/information/board/editInfo.vue
index ac17eff4..6f111e62 100644
--- a/ruoyi-ui/src/views/information/board/editInfo.vue
+++ b/ruoyi-ui/src/views/information/board/editInfo.vue
@@ -768,7 +768,7 @@ export default {
})*/
},
getFontStyle(font) {
- if (font == '宋体') {
+ if (font == '宋体' || font == '3') {
return 'Simsun'
} else if (font == '黑体' || font == '1') {
return 'SimHei'
From 67a3a2c552bc5b75f37b699f02565859991090e8 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Fri, 29 Dec 2023 16:45:39 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/api/board/board.js | 9 +++
.../src/views/information/board/addinfo.vue | 4 +-
.../src/views/information/board/editInfo.vue | 4 +-
.../src/views/information/board/index.vue | 68 ++++++++++++-------
4 files changed, 55 insertions(+), 30 deletions(-)
diff --git a/ruoyi-ui/src/api/board/board.js b/ruoyi-ui/src/api/board/board.js
index 543ea86b..98024eb7 100644
--- a/ruoyi-ui/src/api/board/board.js
+++ b/ruoyi-ui/src/api/board/board.js
@@ -1 +1,10 @@
import request from '@/utils/request'
+
+// 查询设备列列表
+export function getBoardList(query) {
+ return request({
+ url: '/iot/board/list',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/ruoyi-ui/src/views/information/board/addinfo.vue b/ruoyi-ui/src/views/information/board/addinfo.vue
index dc968de2..09d47854 100644
--- a/ruoyi-ui/src/views/information/board/addinfo.vue
+++ b/ruoyi-ui/src/views/information/board/addinfo.vue
@@ -149,7 +149,7 @@ import { checkIotBoardContent } from '@/api/board/vocabulary'
export default {
data() {
return {
- radio1: '0',
+ radio1: '2',
alignmentNum: 2,
content: '',
boardWidth: '',
@@ -661,7 +661,6 @@ export default {
width: ''
}
const templateContent = []
- debugger
templateContent.push({
content: this.dataForm.CONTENT,
coordinate: this.dataForm.COORDINATE,
@@ -812,7 +811,6 @@ export default {
var textLeft = this.addZero(textBoard2[0].offsetLeft)
var textTop = this.addZero(textBoard2[0].offsetTop)
this.dataForm.COORDINATE = textLeft + textTop
- debugger
if (alignmentNum != undefined) {
this.dataForm.formatStyle = alignmentNum
}
diff --git a/ruoyi-ui/src/views/information/board/editInfo.vue b/ruoyi-ui/src/views/information/board/editInfo.vue
index 504b9c8c..795a2a82 100644
--- a/ruoyi-ui/src/views/information/board/editInfo.vue
+++ b/ruoyi-ui/src/views/information/board/editInfo.vue
@@ -267,7 +267,8 @@ export default {
CONTENT: '',
STAY: '',
FONT: '',
- COORDINATE: ''
+ COORDINATE: '',
+ formatStyle:'',
// id: "",
// screenSize: "400*40", //屏幕尺寸
@@ -471,6 +472,7 @@ export default {
if (this.boardEmitItem) {
this.boardWidth = this.boardEmitItem.screenSize.split('*')[0]
this.boardHeight = this.boardEmitItem.screenSize.split('*')[1]
+ this.radio1 = this.boardEmitItem.formatStyle
this.init()
}
},
diff --git a/ruoyi-ui/src/views/information/board/index.vue b/ruoyi-ui/src/views/information/board/index.vue
index c902ad85..666e1abb 100644
--- a/ruoyi-ui/src/views/information/board/index.vue
+++ b/ruoyi-ui/src/views/information/board/index.vue
@@ -234,6 +234,7 @@ import { getUserDeptId } from '@/api/system/user'
import { listTunnels, devicessize, information, getBoardInfo, getBoardEditInfo, getIotBoardList, getBoardContentData, deviceControl } from '@/api/information/api.js'
import { uploadBoardEditInfo, getAllVmsTemplate, addTemplate, addTemplateContent, getBoardContent, deleteTemplate, splicingBoard } from '@/api/board/template'
import { invokedFunction, getDeviceRealtimeProperty } from '@/api/device/device'
+import { getBoardList } from '@/api/board/board'
// 对象深拷贝
export const deepClone = data => {
@@ -332,6 +333,7 @@ export default {
created() {
this.getInfoMode()
this.changeDirection()
+ this.getBoardPixel()
},
mounted() {
// this.rowDrop();
@@ -339,6 +341,19 @@ export default {
},
methods: {
+ // 获取信息模板字典表
+ getBoardPixel() {
+ this.iotBoardList = []
+ this.getDicts('iot_board_pixel').then(res => {
+ res.data.forEach(item =>{
+ this.iotBoardList.push({
+ devicePixel: item.dictValue,
+ label: item.dictLabel,
+ list: []
+ })
+ })
+ })
+ },
// 获取信息模板字典表
getInfoMode() {
this.getDicts('iot_template_category').then(res => {
@@ -381,7 +396,7 @@ export default {
this.checkAll = false
//TODO 测试数据 需删除走接口
- let testData = [
+ /* let testData = [
{
devicePixel: '768*64',
label: '门架板768*64',
@@ -702,7 +717,7 @@ export default {
devicePixel: '480*48',
label: '雨棚480*48',
list: [
- /*{
+ /!*{
searchValue: null,
createBy: null,
createTime: null,
@@ -763,14 +778,14 @@ export default {
lAlarmHandleStr: null,
eqDirection: null,
iotDeviceType: null
- }*/
+ }*!/
]
},
{
devicePixel: '192*160',
label: ' 悬臂192*160',
list: [
- /*{
+ /!*{
searchValue: null,
createBy: null,
createTime: null,
@@ -831,7 +846,7 @@ export default {
lAlarmHandleStr: null,
eqDirection: null,
iotDeviceType: null
- }*/
+ }*!/
]
},
{
@@ -910,25 +925,30 @@ export default {
} else {
this.getInfoMode()
}
- this.$forceUpdate()
+ this.$forceUpdate()*/
// TODO 接口
- /*let param = {
- eqDirection: this.form.eqDirection,
- tunnelId: this.form.tunnel,
- manageAgencyId: this.form.deptId,
- };
- getIotBoardList(param).then((res) => {
- console.log(res, "查询情报板设备列表");
- this.iotBoardList = res.data;
- if (res.data.length > 0) {
- this.iotBoardActive = res.data[0].devicePixel;
- this.handleChange(res.data[0].devicePixel);
- } else {
- this.getInfoMode();
- }
- this.$forceUpdate();
- });*/
+ let param = {
+ direction: this.form.eqDirection,
+ };
+ getBoardList(param).then((res) => {
+ console.log(res, "查询情报板设备列表");
+ if (res.length > 0) {
+ this.iotBoardList.forEach(item => {
+ item.list = []
+ res.forEach(board =>{
+ if (item.devicePixel == board.sceenSize){
+ item.list.push(board)
+ }
+ })
+ })
+ this.iotBoardActive = this.iotBoardList[0].devicePixel;
+ this.handleChange(this.iotBoardList[0].devicePixel);
+ } else {
+ this.getInfoMode();
+ }
+ this.$forceUpdate();
+ });
},
// 板子分辨率换算
@@ -1182,19 +1202,16 @@ export default {
invokedFunction(objAll.deviceIds, 11, { size: '65535', fileName: 'play010.lst' })
.then(res => {
- debugger
console.log('发布消息,校验文件名-------------------------------------')
console.log(res)
if (res.data.result == '01') {
invokedFunction(objAll.deviceIds, 13, { parameters: newArr })
.then(res => {
- debugger
console.log('发布消息,发送文件内容-----------------------------')
console.log(res)
if (res.data.result == '01') {
invokedFunction(objAll.deviceIds, '1B', { fileId: '10' })
.then(res => {
- debugger
console.log('发布消息,播放文件-----------------------------')
console.log(res)
})
@@ -1350,7 +1367,6 @@ export default {
if ('3A' in res.data) {
console.log('回读消息------------------------')
console.log(res.data)
- debugger
var contents = res.data['3A'].content
for (let i = 0; i < contents.length; i++) {
let item = contents[i]
From 8fff15ffde3f12651aef67ffbe591a24e377d99d Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Fri, 29 Dec 2023 17:24:46 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/information/board/index.vue | 27 ++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/views/information/board/index.vue b/ruoyi-ui/src/views/information/board/index.vue
index 666e1abb..da7725eb 100644
--- a/ruoyi-ui/src/views/information/board/index.vue
+++ b/ruoyi-ui/src/views/information/board/index.vue
@@ -30,7 +30,7 @@
<div style="margin: 5px 0"></div>
<el-checkbox-group class="checkbox" v-model="checkedCities" @change="handleCheckedCitiesChange" :max="1">
<el-checkbox v-for="(itm, index) in item.list" :label="itm.deviceId" :key="index">
- <el-tooltip :content="itm.deviceIp" placement="top">
+ <el-tooltip :content="itm.ip" placement="top">
<div>{{ itm.deviceName }}</div>
</el-tooltip>
<el-tooltip content="回读当前信息" placement="top">
@@ -933,20 +933,23 @@ export default {
};
getBoardList(param).then((res) => {
console.log(res, "查询情报板设备列表");
- if (res.length > 0) {
- this.iotBoardList.forEach(item => {
- item.list = []
- res.forEach(board =>{
- if (item.devicePixel == board.sceenSize){
+ this.iotBoardList.forEach(item => {
+ item.list = []
+ if (res.length > 0) {
+ res.forEach(board => {
+ if (item.devicePixel == board.sceenSize) {
item.list.push(board)
}
})
- })
- this.iotBoardActive = this.iotBoardList[0].devicePixel;
- this.handleChange(this.iotBoardList[0].devicePixel);
- } else {
- this.getInfoMode();
- }
+
+ this.iotBoardActive = this.iotBoardList[0].devicePixel;
+ this.handleChange(this.iotBoardList[0].devicePixel);
+ } else {
+ this.getInfoMode();
+ }
+ })
+
+
this.$forceUpdate();
});
},
From ad113d9f9489359f235d3259ed130b2bfcd917de Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Fri, 29 Dec 2023 17:32:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/information/board/addinfo.vue | 2 +-
ruoyi-ui/src/views/information/board/editInfo.vue | 2 +-
ruoyi-ui/src/views/information/board/index.vue | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/information/board/addinfo.vue b/ruoyi-ui/src/views/information/board/addinfo.vue
index 09d47854..7adc2eef 100644
--- a/ruoyi-ui/src/views/information/board/addinfo.vue
+++ b/ruoyi-ui/src/views/information/board/addinfo.vue
@@ -887,7 +887,7 @@ export default {
justify-content: left;
}
.boardTextStyle {
- /*line-height: 1;*/
+ line-height: 1;
caret-color: rgba(0, 0, 0, 0);
user-select: none;
position: absolute;
diff --git a/ruoyi-ui/src/views/information/board/editInfo.vue b/ruoyi-ui/src/views/information/board/editInfo.vue
index 795a2a82..9c2f25bc 100644
--- a/ruoyi-ui/src/views/information/board/editInfo.vue
+++ b/ruoyi-ui/src/views/information/board/editInfo.vue
@@ -881,7 +881,7 @@ export default {
padding: 10px 0;
}
.boardTextStyle {
- /*line-height: 1;*/
+ line-height: 1;
caret-color: rgba(0, 0, 0, 0);
user-select: none;
position: absolute;
diff --git a/ruoyi-ui/src/views/information/board/index.vue b/ruoyi-ui/src/views/information/board/index.vue
index da7725eb..af4e24ab 100644
--- a/ruoyi-ui/src/views/information/board/index.vue
+++ b/ruoyi-ui/src/views/information/board/index.vue
@@ -1878,7 +1878,7 @@ export default {
.boardTextStyle {
position: absolute;
- /*line-height: 1;*/
+ line-height: 1;
caret-color: rgba(0, 0, 0, 0);
user-select: none;
white-space: normal;