Browse Source

fix-

wangqin
IAMHERE 11 months ago
parent
commit
050cf34709
  1. 112
      ruoyi-ui/src/views/information/board/index.vue

112
ruoyi-ui/src/views/information/board/index.vue

@ -1,5 +1,5 @@
<template>
<div class="container infoBoardBox" style="height:93.2vh;;background-color: #11232a;">
<div class="container infoBoardBox" style="height:93.2vh;;background-color: #11232a;">
<div style="
height: 100%;
margin-left: 0px;
@ -9,7 +9,7 @@
">
<div style="width: 20%" class="verticalBox">
<div style="width:100%;height:100%;padding:1vh 0.2vw;">
<div style="width:100%;height:100%;background-color:#112d3b">
<div style="width:100%;height:100%;background-color:#112d3b;padding:0 0 1vh 0;">
<div class="bigTitle qbbBigTitle">
<img class="qbbBigDot" src="@/assets/screen/xtb/qbbdot.png" alt="">
<div>情报板列表</div>
@ -48,7 +48,7 @@
</div>
<div style="width: 37.8%" class="verticalBox verticalBoxBorderLeft">
<div style="width:100%;height:100%;padding:1vh 0.2vw;">
<div style="width:100%;height:100%;background-color:#112d3b">
<div style="width:100%;height:100%;background-color:#112d3b;">
<div class="bigTitle awaitBigTitle">
<div>
@ -70,7 +70,7 @@
</div>
</div>
<div class="contentBox">
<el-table :data="contentList" row-key="ID" v-loading="loading" max-height="700" :key="toggleIndex">
<el-table :data="contentList" row-key="ID" v-loading="loading" style="height: 100%;padding: 0 1vh;background-color: #112d3b;overflow-y: scroll;" :key="toggleIndex">
<el-table-column width="545">
<template slot-scope="scope">
<div class="con">
@ -1261,13 +1261,13 @@ export default {
})
},
//
allVmsTemplate(type) {
const param = {
devicePixel: this.form.devicePixel,
};
//TODO
/*let data = []
//
allVmsTemplate(type) {
const param = {
devicePixel: this.form.devicePixel
}
//TODO
/*let data = []
if( this.form.devicePixel == '768*64'){
data = {
"0": [
@ -3120,25 +3120,25 @@ export default {
}
this.$forceUpdate();*/
//TODO
getAllVmsTemplate(param).then((res) => {
let data = res.data;
console.log(res, "情报板管理右侧查询接口");
let jArr = [];
for (let j = 0; j < this.iotTemplateCategoryList.length; j++) {
let arr = this.iotTemplateCategoryList[j];
let brr = data[j];
arr.list = brr;
jArr.push(j.toString());
}
if (type != "no") {
this.activeNames = jArr;
}
this.$forceUpdate();
console.log(this.iotTemplateCategoryList, "新模板");
});
},
//TODO
getAllVmsTemplate(param).then(res => {
let data = res.data
console.log(res, '情报板管理右侧查询接口')
let jArr = []
for (let j = 0; j < this.iotTemplateCategoryList.length; j++) {
let arr = this.iotTemplateCategoryList[j]
let brr = data[j]
arr.list = brr
jArr.push(j.toString())
}
if (type != 'no') {
this.activeNames = jArr
}
this.$forceUpdate()
console.log(this.iotTemplateCategoryList, '新模板')
})
},
//
delQbbDrawer(index) {
@ -3316,23 +3316,23 @@ export default {
return (Array(length).join('0') + parseInt(num)).slice(-length)
},
//
getFontValue(font) {
if (font == "黑体" || font == "SimHei") return "1";
if (font == "楷体" || font == "KaiTi") return "2";
if (font == "仿宋" || font == "FangSong") return "4";
if (font == "隶书" || font == "LiSu") return "5";
else return "3"; //
},
//
getColorValue(color) {
if (color == "蓝色" || color == "blue") return "0000FF";
if (color == "绿色" || color == "#00FF00" || color == "GreenYellow") return "00FF00";
if (color == "红色" || color == "red") return "FF0000";
if (color == "黄色" || color == "yellow") return "FFFF00";
return "FFFFFF"; //
},
//
getFontValue(font) {
if (font == '黑体' || font == 'SimHei') return '1'
if (font == '楷体' || font == 'KaiTi') return '2'
if (font == '仿宋' || font == 'FangSong') return '4'
if (font == '隶书' || font == 'LiSu') return '5'
else return '3' //
},
//
getColorValue(color) {
if (color == '蓝色' || color == 'blue') return '0000FF'
if (color == '绿色' || color == '#00FF00' || color == 'GreenYellow') return '00FF00'
if (color == '红色' || color == 'red') return 'FF0000'
if (color == '黄色' || color == 'yellow') return 'FFFF00'
return 'FFFFFF' //
},
//
addContentDisplayInfos(addId, no, disContent) {
@ -3605,6 +3605,7 @@ export default {
.contentBox {
width: 100%;
height: calc(100% - 46px);
padding: 0 0 1vh 0;
/* // overflow: auto; */
.con {
@ -3616,6 +3617,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
border: 2px solid #004c64;
}
.menuBox {
@ -3626,6 +3628,7 @@ export default {
height: 75px;
justify-content: space-around;
align-items: center;
border: 2px solid #004c64;
div {
background-repeat: no-repeat;
@ -3680,7 +3683,7 @@ export default {
.templateBox {
width: 100%;
height: calc(100% - 46px);
padding: 0 0.5vw 1vh 0.5vw;
padding: 0 0 1vh 0;
.con {
height: 75px;
@ -3779,6 +3782,7 @@ export default {
overflow: auto;
border-bottom: none;
border-top: none;
padding: 0 0.5vw;
}
}
}
@ -3938,7 +3942,17 @@ export default {
border-radius: 15px;
}
::v-deep .el-table__body-wrapper {
background-color: #112d3b;
background-color: #053b4f;
padding: 0 1vw;
}
::v-deep .el-table tr {
background-color: #053b4f;
}
::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
background-color: #053b4f;
}
::v-deep .el-table td.el-table__cell {
border: none;
}
.el-table::before,
.el-table--group::after,

Loading…
Cancel
Save