admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain

Browse Source
This commit is contained in:
X_Rian 2024-06-20 23:20:04 +08:00
commit cb90879199
2 changed files with 58 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue
View File

@ -4,17 +4,24 @@
<div class="mainContainer" v-if="qualityData.length != 0"> <div class="mainContainer" v-if="qualityData.length != 0">
<el-scrollbar style="height:107%"> <el-scrollbar style="height:107%">
<div class="itemBox" v-for="(item,i) in qualityData" :key="i"> <div class="itemBox" v-for="(item,i) in qualityData" :key="i">
<div class="itemLine1">{{item.dangerItemContent || '--'}}</div> <div class="itemLine1">
<div class="line1Inner1 overHiddenText">
{{item.dangerItemContent || '--'}}
</div>
<div class="line1Inner2">
<span style="color: #e25f64;float:right" v-if="item.overTime">已逾期</span>
</div>
</div>
<div class="itemLine2"> <div class="itemLine2">
<div class="line2Inner1">整改结果：<span style="color:#19bfef">{{ <div class="line2Inner1">整改结果：<span style="color:#19bfef">{{
item.status == 2 ? '待整改' : item.status == 3 ? '待复查' : item.status == 4 ? '待核验' : item.status == 2 ? '待整改' : item.status == 3 ? '待复查' : item.status == 4 ? '待核验' :
item.status == 5 ? '合格' : item.status == 6 ? '已撤回' : '--' item.status == 5 ? '合格' : item.status == 6 ? '已撤回' : '--'
}}</span></div> }}</span></div>
<div class="line2Inner2">责任单位：<span style="color:#19bfef">{{item.enterpriseName || '--'}}</span></div> <div class="line2Inner2 overHiddenText">责任单位：<span style="color:#19bfef">{{item.enterpriseName || '--'}}</span></div>
</div> </div>
<div class="itemLine3"> <div class="itemLine3">
<div class="line3Inner1">整改人：<span style="color:#19bfef">{{item.changeName || '--'}}</span></div> <div class="line3Inner1 overHiddenText">整改人：<span style="color:#19bfef">{{item.changeName || '--'}}</span></div>
<div class="line3Inner2">检查人：<span style="">{{item.inspectManName || '--'}}</span></div> <div class="line3Inner2 overHiddenText">检查人：<span style="">{{item.inspectManName || '--'}}</span></div>
<div class="line3Inner3">检查时间：<span style="">{{item.inspectTime || '--'}}</span></div> <div class="line3Inner3">检查时间：<span style="">{{item.inspectTime || '--'}}</span></div>
</div> </div>
</div> </div>
@ -94,10 +101,16 @@ onMounted( async () => {
box-shadow: inset 0 0 8px 2px rgba($color: #0c58a2, $alpha: 1.0); /* 使用box-shadow属性添加发光效果，参数分别代表向内扩散、水平偏移、垂直偏移、模糊半径、阴影尺寸和颜色 */ box-shadow: inset 0 0 8px 2px rgba($color: #0c58a2, $alpha: 1.0); /* 使用box-shadow属性添加发光效果，参数分别代表向内扩散、水平偏移、垂直偏移、模糊半径、阴影尺寸和颜色 */
// box-shadow: inset 0 0 5px 2px rgba(255, 255, 255, 0.7); /* 向内发光效果 */ // box-shadow: inset 0 0 5px 2px rgba(255, 255, 255, 0.7); /* 向内发光效果 */
.itemLine1{ .itemLine1{
display: flex;
justify-content: space-between;
font-size: 14px; font-size: 14px;
white-space: nowrap; /* 防止文字换行 */ .line1Inner1{
overflow: hidden; /* 超出部分隐藏 */ width: 85%;
text-overflow: ellipsis; /* 超出部分显示省略号 */ }
.line1Inner2{
float: right;
width: 15%;
}
} }
.itemLine2{ .itemLine2{
font-size: 11px; font-size: 11px;
@ -105,7 +118,7 @@ onMounted( async () => {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
.line2Inner1{ .line2Inner1{
width: 28%; width: 28.5%;
} }
.line2Inner2{ .line2Inner2{
width: 72%; width: 72%;
@ -117,13 +130,15 @@ onMounted( async () => {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.line3Inner1{ .line3Inner1{
width: 28%; width: 28.5%;
} }
.line3Inner2{ .line3Inner2{
width: 28%; width: 28.5%;
color: #a1accb;
} }
.line3Inner3{ .line3Inner3{
width: 44%; width: 43%;
color: #a1accb;
} }
} }
} }
@ -133,6 +148,11 @@ onMounted( async () => {
height: 80%; height: 80%;
margin-top: 4%; margin-top: 4%;
} }
.overHiddenText{
white-space: nowrap; /* 防止文字换行 */
overflow: hidden; /* 超出部分隐藏 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
.not-data { .not-data {
top: 40%; top: 40%;
width: 30%; width: 30%;

34
src/views/agjtLiveScreen/liveScreen/rightBottom.vue
View File

@ -15,17 +15,24 @@
<div class="line3Inner3">检查时间：<span style="">2024-03-01 12:00:00</span></div> <div class="line3Inner3">检查时间：<span style="">2024-03-01 12:00:00</span></div>
</div> --> </div> -->
<div class="itemLine1">{{item.dangerItemContent || '--'}}</div> <div class="itemLine1">
<div class="line1Inner1 overHiddenText">
{{item.dangerItemContent || '--'}}
</div>
<div class="line1Inner2">
<span style="color: #e25f64;float:right" v-if="item.overTime">已逾期</span>
</div>
</div>
<div class="itemLine2"> <div class="itemLine2">
<div class="line2Inner1">整改结果：<span style="color:#19bfef">{{ <div class="line2Inner1">整改结果：<span style="color:#19bfef">{{
item.status == 2 ? '待整改' : item.status == 3 ? '待复查' : item.status == 4 ? '待核验' : item.status == 2 ? '待整改' : item.status == 3 ? '待复查' : item.status == 4 ? '待核验' :
item.status == 5 ? '合格' : item.status == 6 ? '已撤回' : '--' item.status == 5 ? '合格' : item.status == 6 ? '已撤回' : '--'
}}</span></div> }}</span></div>
<div class="line2Inner2">责任单位：<span style="color:#19bfef">{{item.enterpriseName || '--'}}</span></div> <div class="line2Inner2 overHiddenText">责任单位：<span style="color:#19bfef">{{item.enterpriseName || '--'}}</span></div>
</div> </div>
<div class="itemLine3"> <div class="itemLine3">
<div class="line3Inner1">整改人：<span style="color:#19bfef">{{item.changeName || '--'}}</span></div> <div class="line3Inner1 overHiddenText">整改人：<span style="color:#19bfef">{{item.changeName || '--'}}</span></div>
<div class="line3Inner2">检查人：<span style="">{{item.inspectManName || '--'}}</span></div> <div class="line3Inner2 overHiddenText">检查人：<span style="">{{item.inspectManName || '--'}}</span></div>
<div class="line3Inner3">检查时间：<span style="">{{item.inspectTime || '--'}}</span></div> <div class="line3Inner3">检查时间：<span style="">{{item.inspectTime || '--'}}</span></div>
</div> </div>
</div> </div>
@ -103,10 +110,16 @@ onMounted( async () => {
box-shadow: inset 0 0 8px 2px rgba($color: #0c58a2, $alpha: 1.0); /* 使用box-shadow属性添加发光效果，参数分别代表向内扩散、水平偏移、垂直偏移、模糊半径、阴影尺寸和颜色 */ box-shadow: inset 0 0 8px 2px rgba($color: #0c58a2, $alpha: 1.0); /* 使用box-shadow属性添加发光效果，参数分别代表向内扩散、水平偏移、垂直偏移、模糊半径、阴影尺寸和颜色 */
// box-shadow: inset 0 0 5px 2px rgba(255, 255, 255, 0.7); /* 向内发光效果 */ // box-shadow: inset 0 0 5px 2px rgba(255, 255, 255, 0.7); /* 向内发光效果 */
.itemLine1{ .itemLine1{
display: flex;
justify-content: space-between;
font-size: 14px; font-size: 14px;
white-space: nowrap; /* 防止文字换行 */ .line1Inner1{
overflow: hidden; /* 超出部分隐藏 */ width: 85%;
text-overflow: ellipsis; /* 超出部分显示省略号 */ }
.line1Inner2{
float: right;
width: 15%;
}
} }
.itemLine2{ .itemLine2{
font-size: 11px; font-size: 11px;
@ -129,9 +142,11 @@ onMounted( async () => {
} }
.line3Inner2{ .line3Inner2{
width: 30%; width: 30%;
color: #a1accb;
} }
.line3Inner3{ .line3Inner3{
width: 40%; width: 40%;
color: #a1accb;
} }
} }
} }
@ -141,6 +156,11 @@ onMounted( async () => {
::v-deep .h-card .content { ::v-deep .h-card .content {
height: 80%; height: 80%;
} }
.overHiddenText{
white-space: nowrap; /* 防止文字换行 */
overflow: hidden; /* 超出部分隐藏 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
.not-data { .not-data {
top: 38%; top: 38%;
width: 30%; width: 30%;