Browse Source

改bug

wangqin
hui 8 months ago
parent
commit
2cd83a2e9e
  1. 10
      ruoyi-ui/src/assets/styles/JiHeExpressway.scss
  2. 21
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue

10
ruoyi-ui/src/assets/styles/JiHeExpressway.scss

@ -277,4 +277,14 @@
.el-time-spinner__item.active{ color: #fff !important;} .el-time-spinner__item.active{ color: #fff !important;}
} }
.el-picker-panel{
.today div a,.today div span{
color: #ff0 !important;
font-weight: bold !important;
}
.current div a.cell {
// background-color: #000 !important;
}
}
} }

21
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue

@ -61,20 +61,20 @@
<el-tabs v-model="activeTab" @tab-click="tabClickFn"> <el-tabs v-model="activeTab" @tab-click="tabClickFn">
<el-tab-pane label="详情信息" name="first"> <el-tab-pane label="详情信息" name="first">
<div class="show_bottom_tab_box"> <div class="show_bottom_tab_box">
<div class="deviceInfo"> <div class="deviceInfo title">
<div class="deviceInfo_l">设备名称</div> <div class="deviceInfo_l">设备名称:</div>
<div class="deviceInfo_r"> <div class="deviceInfo_r">
{{ selectedDevice.deviceName }} {{ selectedDevice.deviceName }}
</div> </div>
</div> </div>
<div class="deviceInfo"> <div class="deviceInfo">
<div class="deviceInfo_l">设备桩号</div> <div class="deviceInfo_l">设备桩号:</div>
<div class="deviceInfo_r"> <div class="deviceInfo_r">
{{ selectedDevice.stakeMark }} {{ selectedDevice.stakeMark }}
</div> </div>
</div> </div>
<div class="deviceInfo"> <div class="deviceInfo">
<div class="deviceInfo_l">屏幕像素</div> <div class="deviceInfo_l">屏幕像素:</div>
<div class="deviceInfo_r"> <div class="deviceInfo_r">
{{ {{
JSON.parse(selectedDevice.otherConfig).screenSize JSON.parse(selectedDevice.otherConfig).screenSize
@ -82,6 +82,12 @@
px px
</div> </div>
</div> </div>
<div class="deviceInfo">
<div class="deviceInfo_l">设备状态</div>
<div class="deviceInfo_r">
{{ selectedDevice.deviceState == 1 ? "在线" : "离线" }}
</div>
</div>
<!-- <div class="deviceInfo" v-for="item in tabDataInfoList" :key="item.id"> <!-- <div class="deviceInfo" v-for="item in tabDataInfoList" :key="item.id">
<div class="deviceInfo_l">{{ item.tit }}: </div> <div class="deviceInfo_l">{{ item.tit }}: </div>
<div class="deviceInfo_r" :style="{ 'color': item.col }"> {{ item.txt }}</div> <div class="deviceInfo_r" :style="{ 'color': item.col }"> {{ item.txt }}</div>
@ -763,11 +769,12 @@ export default {
} }
.deviceInfo { .deviceInfo {
width: 50%; width: 33.333%;
padding: 10px 0; padding: 10px 0;
display: flex; display: flex;
// flex-wrap: wrap; // flex-wrap: wrap;
align-items: stretch; align-items: center;
&.title{ width: 100%;}
} }
.show_bottom_tab_box { .show_bottom_tab_box {
@ -780,7 +787,7 @@ export default {
.deviceInfo_l { .deviceInfo_l {
color: #3de8ff; color: #3de8ff;
font-size: 14px; font-size: 14px;
width: 70px; width: 60px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;

Loading…
Cancel
Save