Browse Source

更新

wangqin
hui 10 months ago
parent
commit
112a0bb804
  1. 2
      ruoyi-ui/src/main.js
  2. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
  3. 122
      ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

2
ruoyi-ui/src/main.js

@ -78,7 +78,7 @@ Vue.filter('dateformat', function (dataStr, pattern = 'YYY-MM-DD HH:mm:ss') {
window.IS_TESTING = false;
if (process.env.NODE_ENV == 'development'){
window.IS_TESTING = true;
window.IS_TESTING = false;
}
import Empty from "@screen/components/empty";

2
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue

@ -236,7 +236,7 @@ export default {
getSystemStatusType().then((res) => {
if (!res.data || res.msg == "暂无数据") {
if (IS_TESTING && (!res.data || res.msg == "暂无数据")) {
this.equipments = [];
this.equipSeries.forEach(item => {

122
ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

@ -44,7 +44,13 @@
<!-- ++++++++++中间部分单个设备++++++++++ -->
<div style="width: 37.8%" class="part partMiddle">
<!-- <WgtTitle :title="'待下发信息'"></WgtTitle> -->
<div class="partTitle partDeviceTempateTitle">
<WgtTitle :title="`待下发信息 ${selectedSize? selectedSize:''}`">
<div class="titleBtnBox">
<el-button class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()">添加信息</el-button>
<el-button class="btnInfoBoard" type="publish" @click="____onPublish" :disabled="selectedBdMsg.length <= 0">发布信息</el-button>
</div>
</WgtTitle>
<!-- <div class="partTitle partDeviceTempateTitle">
<div>
<div style="display: flex;justify-content: start !important;align-items: center;">
<img class="qbbBigDot" src="@/assets/screen/xtb/qbbdot.png" alt="">
@ -54,11 +60,12 @@
<img class="qbbBigDotBa" src="@/assets/screen/xtb/qbba.png" alt="">
</div>
<div class="controlBox">
<el-button class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()">添加信息</el-button>
<el-button class="btnInfoBoard" type="publish" @click="____onPublish" :disabled="selectedBdMsg.length <= 0">发布信息</el-button>
</div>
</div>
</div> -->
<div class="partCon">
<!-- {{ selectedBdMsg }} -->
<vuescroll :ops="scrollOptions" class="templateBox" v-if="selectedBdMsg.length>0" :class="{'hide': isHideCtt }">
@ -81,21 +88,23 @@
</div>
<!-- ++++++++++右边部分信息模板++++++++++ -->
<div style=" width: 42.2%" class="part partRight">
<div class="partTitle partDeviceTempateTitle">
<!-- <div class="partTitle partDeviceTempateTitle">
<div>
<div style="display: flex;justify-content: start !important;align-items: center;">
<img class="qbbBigDot" src="@/assets/screen/xtb/qbbdot.png" alt="">
<div>信息模板<span v-if="selectedSize">{{ selectedSize }}</span></div>
</div>
<img class="qbbBigDotBa" src="@/assets/screen/xtb/qbba.png" alt="">
<!-- <span>信息模板</span>
<span v-if="form.selectedPixel"> {{ form.selectedPixel }}</span> -->
</div>
<div class="controlBox">
<el-button class="btnInfoBoard" type="add" @click="____onAddTemplate">添加模板</el-button>
</div>
</div>
</div> -->
<WgtTitle :title="`信息模板 ${selectedSize? selectedSize :''}`">
<div class="titleBtnBox">
<el-button class="btnInfoBoard" type="add" @click="____onAddTemplate">添加模板</el-button>
</div>
</WgtTitle>
<div class="partCon">
<vuescroll :ops="scrollOptions" class="templateBox">
<div v-for="(item, index) in templateAvailable" :key="item.dictValue">
@ -978,15 +987,27 @@ export default {
margin-right: 0;
}
.partTitle {
padding: 0px 0;
/* // border-bottom: 1px solid #05afe3; */
margin-bottom: 10px;
// .partTitle {
// padding: 0px 0;
// /* // border-bottom: 1px solid #05afe3; */
// margin-bottom: 10px;
// display: flex;
// justify-content: space-between;
// height: 60px;
// font-size: 18px;
// align-items: center;
// .controlBox {
// border: 1px solid #f00;
// display: flex;
// justify-content: center;
// margin-bottom: 10px;
// }
// }
.titleBtnBox{
flex: 1;
display: flex;
justify-content: space-between;
height: 60px;
font-size: 18px;
align-items: center;
justify-content: flex-end;
padding: 0 10px;
}
.partCon {
@ -1005,13 +1026,6 @@ export default {
align-items: center;
border: 2px solid #004c64;
}
/* // } */
.controlBox {
display: flex;
justify-content: center;
margin-bottom: 10px;
}
}
.templateBox {
@ -1113,13 +1127,13 @@ export default {
}
}
.qbbBigDotBa {
width: 64px;
height: 9px;
position: absolute;
right: 5%;
top: 35%;
}
// .qbbBigDotBa {
// width: 64px;
// height: 9px;
// position: absolute;
// right: 5%;
// top: 35%;
// }
::v-deep .el-collapse-item__content {
line-height: normal;
@ -1160,19 +1174,19 @@ export default {
color: #05afe3 !important;
}
.boardListTitle {
// margin-top: 1vh;
color: #fff;
height: 35px !important;
background-image: url('~@/assets/screen/xtb/qbbtit.png');
background-size: 100% 100%;
background-repeat: no-repeat;
background-position: center;
display: flex;
justify-content: start !important;
align-items: center;
position: relative;
}
// .boardListTitle {
// // margin-top: 1vh;
// color: #fff;
// height: 35px !important;
// background-image: url('~@/assets/screen/xtb/qbbtit.png');
// background-size: 100% 100%;
// background-repeat: no-repeat;
// background-position: center;
// display: flex;
// justify-content: start !important;
// align-items: center;
// position: relative;
// }
.qbbBigDot {
width: 18px;
@ -1180,17 +1194,17 @@ export default {
margin: 0 0.5vw 0 0.5vw;
}
.partDeviceTempateTitle {
width: 100%;
color: #fff;
padding-right: 110px !important;
height: 35px !important;
background-image: url('~@/assets/screen/xtb/qbbti.png');
background-size: 100% 100%;
background-repeat: no-repeat;
background-position: center;
position: relative;
}
// .partDeviceTempateTitle {
// width: 100%;
// color: #fff;
// padding-right: 110px !important;
// height: 35px !important;
// background-image: url('~@/assets/screen/xtb/qbbti.png');
// background-size: 100% 100%;
// background-repeat: no-repeat;
// background-position: center;
// position: relative;
// }
::v-deep .sortable-chosen:not(th) {
background-color: rgba(5, 175, 227, 0.1) !important;
@ -1230,7 +1244,7 @@ export default {
::v-deep .el-collapse-item__wrap {
background-color: #053b4f;
padding: 0 1vw;
padding: 0 10px;
}
::v-deep .el-collapse {

Loading…
Cancel
Save