Merge branch 'dev-Rain' into shenzhen-dev

This commit is contained in:
kun 2024-05-12 09:37:47 +08:00
commit fdba33e4dc
2 changed files with 48 additions and 13 deletions

View File

@ -39,7 +39,7 @@
<div class="cbHeaderLine"></div> <div class="cbHeaderLine"></div>
</div> </div>
<div class="cbContent"> <div class="cbContent">
<vue3-seamless-scroll :list="listData" :step="1" :limitScrollNum="13" :hover="true" class="scroll"> <vue3-seamless-scroll v-show="listData.length>0" :list="listData" :step="1" :limitScrollNum="10" :hover="true" class="scroll">
<div class="item" v-for="(item, index) in listData" :key="index"> <div class="item" v-for="(item, index) in listData" :key="index">
<div class="itemHead"> <div class="itemHead">
<div class="itemHeadInner" v-if="item.type === 1">{{ item.title }}</div> <div class="itemHeadInner" v-if="item.type === 1">{{ item.title }}</div>
@ -53,6 +53,10 @@
</div> </div>
</div> </div>
</vue3-seamless-scroll> </vue3-seamless-scroll>
<div class="notoDta" v-if="listData.length == 0">
<img src="@/assets/images/noData.png" alt="" />
<p>暂无数据</p>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -86,15 +90,17 @@ let overdueMajorDangerCount = ref(20 as any);
let overdueMajorDangerRate = ref(50 as any); let overdueMajorDangerRate = ref(50 as any);
let listData = ref([ let listData = ref([
{ title: '隐患分类', type: 1, msg: '经过智能分析统计,近一个月脚手架类安全隐患最多达...' }, // { title: '', type: 1, msg: '...' },
{ title: '重大隐患', type: 2, msg: '组织专业人员对隐患进行彻底排查和评估,明确隐患的性质、范围和...' }, // { title: '', type: 2, msg: '...' },
{ title: '隐患分类', type: 1, msg: '经过智能分析统计,近一个月脚手架类安全隐患最多达...' }, // { title: '', type: 1, msg: '...' },
{ title: '重大隐患', type: 2, msg: '组织专业人员对隐患进行彻底排查和评估,明确隐患的性质、范围和...' }, // { title: '', type: 2, msg: '...' },
{ title: '隐患分类', type: 1, msg: '经过智能分析统计,近一个月脚手架类安全隐患最多达...' }, // { title: '', type: 1, msg: '...' },
{ title: '重大隐患', type: 2, msg: '组织专业人员对隐患进行彻底排查和评估,明确隐患的性质、范围和...' }, // { title: '', type: 2, msg: '...' },
{ title: '隐患分类', type: 1, msg: '经过智能分析统计,近一个月脚手架类安全隐患最多达...' }, // { title: '', type: 1, msg: '...' },
{ title: '重大隐患', type: 2, msg: '组织专业人员对隐患进行彻底排查和评估,明确隐患的性质、范围和...' }, // { title: '', type: 2, msg: '...' },
{ title: '隐患分类', type: 1, msg: '经过智能分析统计,近一个月脚手架类安全隐患最多达...' }, // { title: '', type: 1, msg: '...' },
// { title: '', type: 2, msg: '...' },
// { title: '', type: 1, msg: '...' },
]) ])
let dataList = ref([ let dataList = ref([
@ -767,6 +773,27 @@ onMounted(async () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.notoDta {
top: 35%;
width: 50%;
// left: 40%;
position: absolute;
text-align: center;
left:50%;
transform: translateX(-50%);
img {
width: 40%;
margin: 5% 30%;
}
p {
color: #fff;
font-size: calc(100vw * 14 / 1920);
margin: -6% 30%;
}
}
.scroll { .scroll {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
@ -913,7 +940,7 @@ onMounted(async () => {
.cbContent { .cbContent {
width: 100%; width: 100%;
height: calc(100% - 40px); height: calc(100% - 60px);
// background: #fff; // background: #fff;
.item { .item {

View File

@ -1,7 +1,8 @@
<template> <template>
<div class="political-outlook"> <div class="political-outlook">
<div class="content"> <div class="content">
<div class="top-statistics"> <!-- v-show="topDangerList.length > 0" -->
<div class="top-statistics" v-show="topDangerList.length > 0">
<div class="statistics-item" v-for="(item,index) in topDangerList" :key="index"> <div class="statistics-item" v-for="(item,index) in topDangerList" :key="index">
<span class="title">{{item.alarmTypeName}}</span> <span class="title">{{item.alarmTypeName}}</span>
<span class="statistics-item-content">今日报警次数0</span> <span class="statistics-item-content">今日报警次数0</span>
@ -51,6 +52,13 @@
<span class="statistics-item-content">历史报警次数1</span> <span class="statistics-item-content">历史报警次数1</span>
</div> --> </div> -->
</div> </div>
<div style="position: relative; height: 180px;">
<div class="notoDta" v-if="topDangerList.length == 0">
<img src="@/assets/images/noData.png" alt="" />
<p>暂无数据</p>
</div>
</div>
<div class="table-one"> <div class="table-one">
<div class="tabList"> <div class="tabList">
<div>序号</div> <div>序号</div>
@ -370,7 +378,7 @@ onMounted(async () => {
margin: 0 auto; margin: 0 auto;
.statistics-item{ .statistics-item{
width: 200px; width: 200px;
height: 95px; // height: 95px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: relative; position: relative;