fix: 解决部分BUG,修改数据配合演示

This commit is contained in:
cjp 2023-12-02 11:47:17 +08:00
parent fac1bef1b1
commit 33ca18fa16
11 changed files with 117 additions and 64 deletions

11
package-lock.json generated
View File

@ -26,6 +26,7 @@
"echarts-liquidfill": "^3.1.0",
"element-china-area-data": "^5.0.2",
"element-plus": "^2.2.30",
"ezuikit-js": "^7.7.8",
"js-base64": "^3.7.5",
"js-md5": "^0.7.3",
"mars3d": "^3.5.6",
@ -7542,6 +7543,11 @@
"node": ">=0.10.0"
}
},
"node_modules/ezuikit-js": {
"version": "7.7.8",
"resolved": "https://registry.npmjs.org/ezuikit-js/-/ezuikit-js-7.7.8.tgz",
"integrity": "sha512-DfcPxUhLgchkQU5+0WllD3QghAJYG9mCybCCs0znLoSnMupup6WB1+wjrxPtpt49praQDuMrGoBVe0Mtl1z9/w=="
},
"node_modules/fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@ -21521,6 +21527,11 @@
"to-regex": "^3.0.1"
}
},
"ezuikit-js": {
"version": "7.7.8",
"resolved": "https://registry.npmjs.org/ezuikit-js/-/ezuikit-js-7.7.8.tgz",
"integrity": "sha512-DfcPxUhLgchkQU5+0WllD3QghAJYG9mCybCCs0znLoSnMupup6WB1+wjrxPtpt49praQDuMrGoBVe0Mtl1z9/w=="
},
"fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",

View File

@ -38,6 +38,7 @@
"echarts-liquidfill": "^3.1.0",
"element-china-area-data": "^5.0.2",
"element-plus": "^2.2.30",
"ezuikit-js": "^7.7.8",
"js-base64": "^3.7.5",
"js-md5": "^0.7.3",
"mars3d": "^3.5.6",

View File

@ -11,13 +11,13 @@
</div>
</div>
<div class="decivList">
<div class="menuDev" v-for="item in deciData" :class="item.isClosed == 0 ? 'online' : 'offline'">
<div class="menuDev" v-for="item in deciData" :class="item.devOnline == 1 ? 'online' : 'offline'">
<div class="decName">
<span v-show="item.isClosed == 1"><img src="@/assets/images/dustNoise/onlineImg.png" alt="" /></span>
<span v-show="item.isClosed == 2"><img src="@/assets/images/dustNoise/offImg.png" alt="" /></span>
<span v-show="item.devOnline == 1"><img src="@/assets/images/dustNoise/onlineImg.png" alt="" /></span>
<span v-show="item.devOnline == 0"><img src="@/assets/images/dustNoise/offImg.png" alt="" /></span>
<span> {{ item.deviceName }}</span>
</div>
<div class="status">{{ item.isClosed == 1 ? "在线" : "离线" }}</div>
<div class="status">{{ item.devOnline == 1 ? "在线" : "离线" }}</div>
</div>
<div class="notoDta" v-if="deciData.length == 0">
<img src="@/assets/images/noData.png" alt="" />
@ -46,7 +46,7 @@ const getList = async () => {
onlineDevNum.value = 0;
offlineDevNum.value = 0;
deciData.value.forEach(element => {
if (element.isClosed == 2) {
if (element.devOnline == 0) {
offlineDevNum.value++;
} else {
onlineDevNum.value++;

View File

@ -4,7 +4,7 @@
<div class="header">
<!-- <div class="hearderIcon"><img src="@/assets/images/jxjLogo.png" alt="" /></div> -->
<span class="projectTitle">
<p>数字化项目监管平台</p>
<p>东沙一号大桥监管平台</p>
</span>
<div class="rightIcon" @click.stop>
<div class="time">{{ nowTime }}</div>
@ -201,16 +201,16 @@ let menuList = ref([
}
]
},
{
moduleName: "BIM模型",
modulePath: "/bImModel",
menuList: [
{
menuName: "BIM模型",
companyPath: "/bImModel"
}
]
}
// {
// moduleName: "BIM",
// modulePath: "/bImModel",
// menuList: [
// {
// menuName: "BIM",
// companyPath: "/bImModel"
// }
// ]
// }
]);
// let menuList = ref([
// {

View File

@ -82,7 +82,7 @@
</div>
</div>
</div>
{{ baseURL }}
<!-- {{ baseURL }} -->
<div class="select-right">
<el-select v-model="devValue" class="m-2" placeholder="请选择" size="small" @change="selectChange">
<el-option v-for="item in noiseList" :key="item.value" :label="item.label" :value="item.value" />

View File

@ -20,11 +20,11 @@
</div>
<div class="box-contain">
<div class="title">门机跨度</div>
<div class="number">23<span>m</span></div>
<div class="number">30<span>m</span></div>
</div>
<div class="box-contain">
<div class="title">吊装高度</div>
<div class="number">34<span>m</span></div>
<div class="number">10<span>m</span></div>
</div>
</div>
<div class="list-detail" v-if="showDialog" @click="handleClick">

View File

@ -6,11 +6,11 @@
<el-option v-for="item in noiseList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="deadline-time">数据截至: 2023-06-29 15:23:59</div>
<div class="deadline-time">数据截至: 2023-12-01 09:00:00</div>
<div class="monitor-data">
<div class="monitor-content">
<div class="text">挂篮是否有人</div>
<div class="number">24</div>
<div class="number">0</div>
</div>
<div class="monitor-content">
<div class="text">倾角</div>

View File

@ -78,7 +78,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 2,
@ -90,7 +90,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 3,
@ -102,7 +102,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 4,
@ -114,7 +114,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 5,
@ -126,7 +126,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 6,
@ -138,7 +138,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 7,
@ -150,7 +150,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
@ -163,7 +163,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 9,
@ -175,7 +175,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 10,
@ -187,7 +187,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 11,
@ -199,7 +199,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
},
{
id: 12,
@ -211,7 +211,7 @@ const list = reactive([
heightDiff: 10,
backBoltLeft: "265",
backBoltRight: "352.6",
monitorTime: "2023-01-01 12:00:00"
monitorTime: "2023-12-01 09:00:00"
}
]);

View File

@ -2,18 +2,18 @@
<Card title="后梁固定锚杆安装状态">
<div class="hang-basket-content">
<div class="install-content">
<div class="install-warn" v-for="(item, index) in 5">
<!-- <div class="install-warn" v-for="(item, index) in 5">
<div class="dev-name">{{ index + 1 }}#</div>
<div class="warn-text">报警</div>
</div>
<div class="install-common" v-for="(item, index) in 2">
<div class="dev-name">{{ index + 6 }}#</div>
</div> -->
<div class="install-common" v-for="(item, index) in 8">
<div class="dev-name">{{ index + 1 }}#</div>
<div class="warn-text">正常</div>
</div>
<div class="install-unconnect">
<!-- <div class="install-unconnect">
<div class="dev-name">8#</div>
<div class="warn-text">未连接</div>
</div>
</div> -->
</div>
</div>
</Card>

View File

@ -5,13 +5,13 @@
<el-scrollbar style="height: 100%">
<div class="warn-item">
<div class="title">1#后梁固定锚杆报警</div>
<div class="text">牛尤淆笨闹避案劈深眨随慈勉秧填腕鸣抚噬竹雇容虏埃挑纷采拱食恭仓禽退档茨殿句</div>
<div class="time">2023.06.08 12:00:00</div>
<!-- <div class="text">牛尤淆笨闹避案劈深眨随慈勉秧填腕鸣抚噬竹雇容虏埃挑纷采拱食恭仓禽退档茨殿句</div> -->
<div class="time">2023-12-01 09:00:00</div>
</div>
<div class="warn-item">
<div class="title">1#后梁固定锚杆报警</div>
<div class="text">牛尤淆笨闹避案劈深眨随慈勉秧填腕鸣抚噬竹雇容虏埃挑纷采拱食恭仓禽退档茨殿句</div>
<div class="time">2023.06.08 12:00:00</div>
<div class="title">2#后梁固定锚杆报警</div>
<!-- <div class="text">牛尤淆笨闹避案劈深眨随慈勉秧填腕鸣抚噬竹雇容虏埃挑纷采拱食恭仓禽退档茨殿句</div> -->
<div class="time">2023-12-01 09:00:00</div>
</div>
</el-scrollbar>
</div>

View File

@ -8,33 +8,64 @@
</div> -->
<div class="menuD">
<el-scrollbar style="height: 100%">
<div class="menuL" v-for="item in 10">
<div class="leftNum">
<div class="name" style="font-size: 18px">测试</div>
<div class="name">整改结果<span style="color: #e25f64">已逾期</span></div>
<div class="name">编号ZLJC20230608001</div>
</div>
<div class="rightDate">
<div class="date">
检查结果<span>通过<span style="color: #6dc86f; margin-left: 2%">1</span></span>
<span style="margin-left: 10%">整改 <span style="color: #da9d56; margin-left: 2%">2</span></span>
<div class="menuL" v-for="item in list">
<div class="leftNum">
<div class="single-text" :title="item.name" style="font-size: 18px">
{{ item.name || "" }}
</div>
<div class="name">整改结果<span style="color: #e25f64">已逾期</span></div>
<div class="name">编号ZLJC20230608001</div>
</div>
<div class="rightDate">
<div class="date">
检查结果<span>通过<span style="color: #6dc86f; margin-left: 2%">1</span></span>
<span style="margin-left: 10%">整改 <span style="color: #da9d56; margin-left: 2%">2</span></span>
</div>
<div class="date">发起日期2023.06.08</div>
</div>
<div class="date">发起日期2023.06.08</div>
</div>
</div>
</el-scrollbar>
</div>
</Card>
</div>
</template>
<script setup lang="ts">
<script setup lang="ts">
import Card from "@/components/card.vue";
import { ref } from "vue";
let airType = ref(1);
let list = ref([
{
name: "防水砂浆原材料的检测不合格"
},
{
name: "外框与结构间的塞缝"
},
{
name: "颜色均匀度差"
},
{
name: "吊顶原材料的检查"
},
{
name: "大于35MM加强措施"
},
{
name: "管道、支吊架除锈、油漆观感"
},
{
name: "系统联动调试"
},
{
name: "自动喷淋头的平面位置与尺寸"
},
{
name: "预留箱盒的位置、固定牢固性"
}
]);
</script>
<style scoped lang="scss">
<style scoped lang="scss">
.rightBigBox {
width: 100%;
height: 100%;
@ -72,13 +103,23 @@ let airType = ref(1);
background-size: 100% 100%;
margin-top: 4%;
display: flex;
position: relative;
.leftNum {
width: 40%;
height: 90%;
text-align: left;
color: #fff;
margin: 2% 0 0 4%;
padding-bottom: 2%;
color: #a1accb;
margin: 6% 0 0 4%;
padding-bottom: 3%;
.single-text {
color: #fff;
position: absolute;
width: 90%;
top: 10%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.name {
margin-top: 4%;
}
@ -105,4 +146,4 @@ let airType = ref(1);
::v-deep .h-card .content {
height: 94.2% !important;
}
</style>
</style>