From abed7685a7a2be6e5b2bb10e2d05393977f81a38 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 18 Mar 2024 19:27:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smokeSensor/smoke-bottom-left.vue | 10 +- .../vehicleManagement/bottom-left.vue | 2 +- .../vehicleManagement/bottom-right.vue | 240 ++++++++++-------- 3 files changed, 137 insertions(+), 115 deletions(-) diff --git a/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-bottom-left.vue b/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-bottom-left.vue index 51a4e85..8831045 100644 --- a/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-bottom-left.vue +++ b/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-bottom-left.vue @@ -46,14 +46,13 @@ const deviceStatusOptions = ref([ { label: "心跳", value: 2 }, ]) as any; -let list = ref([]); +let list = ref([] as any); const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 -const ScrollbarTop = ref(0); let moreScroll = ref(true as any); let pageNo = ref(1 as any); -let pageSize = ref(20 as any); +let pageSize = ref(30 as any); // 获取烟感监测告警监测记录列表 const getSmokeAlarmRecordList = async () => { @@ -96,7 +95,6 @@ onMounted(() => { getMoreSmokeRecordList(); } } - ScrollbarTop.value = scrollTop; }); getSmokeAlarmRecordList(); }); @@ -124,7 +122,7 @@ onMounted(() => { padding: 2%; position: relative; .list-content { - height: 95%; + height: 100%; width: 100%; // background: url("@/assets/images/cardImg.png") no-repeat; // background-size: 100% 100%; @@ -148,7 +146,7 @@ onMounted(() => { } } .list-box { - height: 100%; + height: 92%; .list-style:nth-child(even) { background: rgba(39, 88, 192, 0.06); } diff --git a/src/views/sevenLargeScreen/vehicleManagement/bottom-left.vue b/src/views/sevenLargeScreen/vehicleManagement/bottom-left.vue index c0e4bbe..c13d084 100644 --- a/src/views/sevenLargeScreen/vehicleManagement/bottom-left.vue +++ b/src/views/sevenLargeScreen/vehicleManagement/bottom-left.vue @@ -23,7 +23,7 @@ const store = GlobalStore(); const realCountTotal = ref({} as any); //获取出入场车辆统计 const getMemberCareList = async () => { - const res: any = await getEntryAndExitCountApi({ projectSn: store.sn, isOpen: 1 }); + const res: any = await getEntryAndExitCountApi({ projectSn: store.sn }); console.log("获取出入场车辆统计", res); if (res.success) { realCountTotal.value = res.result; diff --git a/src/views/sevenLargeScreen/vehicleManagement/bottom-right.vue b/src/views/sevenLargeScreen/vehicleManagement/bottom-right.vue index a9a2b06..9fe42d1 100644 --- a/src/views/sevenLargeScreen/vehicleManagement/bottom-right.vue +++ b/src/views/sevenLargeScreen/vehicleManagement/bottom-right.vue @@ -17,40 +17,41 @@
进出场图片
全景图照片
- -
-
-
{{ index + 1 }}
-
{{ item.carNumber }}
-
{{ item.passTime }}
-
{{ item.type==1?'出':'进' }}
-
{{ item.location }}
-
{{ item.carColor }}
-
{{ item.carType ? carTypeList[item.carType-1].name:''}}
-
- - + +

暂无数据

-
+
@@ -61,41 +62,71 @@ import { getEntryAndExitListApi } from "@/api/modules/vehicle"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); const BASEURL = import.meta.env.VITE_API_URL; -const carTypeList = ref([{ - value: '1', - name: '白名单', - },{ - value: '2', - name: '黑名单', - },{ - value: '3', - name: '临时车', - }]) +const pageNo = ref(1 as any); +const pageSize = ref(10 as any); +const moreScroll = ref(true as any); +const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 +const carTypeList = ref([ + { + value: "1", + name: "白名单" + }, + { + value: "2", + name: "黑名单" + }, + { + value: "3", + name: "临时车" + } +]); const vehicleData = ref([] as any); // 选中 const checked = ref(1); const getDateData = (type: any) => { checked.value = type; - getVehicleList(); -} -const getVehicleList = async () => { + pageNo.value = 1; + moreScroll.value = true; + refScrollbar.value.wrapRef.scrollTop = 0; // 滚动条置顶 + getVehicleList("search"); +}; +const getVehicleList = async (tip: any) => { const res: any = await getEntryAndExitListApi({ projectSn: store.sn, - type: checked.value + timeType: checked.value, + pageNo: pageNo.value, + pageSize: pageSize.value }); if (res.result) { - vehicleData.value = res.result.records - if(vehicleData.value && vehicleData.value.length > 0){ - vehicleData.value.map((item:any) => { - item.imageUrl = BASEURL + '/' + item.imageUrl - item.panoramaUrl = BASEURL + '/' + item.panoramaUrl - }) + if (tip == "more") { + vehicleData.value = vehicleData.value.concat(res.result.records); + } else { + vehicleData.value = res.result.records; + } + if (res.result.pages == pageNo.value) { + moreScroll.value = false; + } else { + pageNo.value = pageNo.value + 1; } } }; onMounted(async () => { - await getVehicleList(); + // console.log("滚动容器", refScrollbar.value); + refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => { + const scrollTop = e.target.scrollTop; + const scrollHeight = e.target.scrollHeight; + const clientHeight = e.target.clientHeight; + // console.log("滚动容器", scrollTop, scrollHeight, clientHeight); + // 向上加载更多 + if (scrollTop >= scrollHeight - clientHeight) { + // console.log("加载更多"); + if (moreScroll.value) { + getVehicleList("more"); + } + } + }); + await getVehicleList("search"); }); @@ -105,41 +136,41 @@ onMounted(async () => { height: 100%; position: relative; .select-right { - width: 20%; - display: flex; - position: absolute; - z-index: 10; - color: #fff; - font-size: 10px; - text-align: center; - line-height: 20px; - left: 21%; - top: 2.7%; - .selected { - height: 5%; - background: url("@/assets/images/dustNoise/rightImg2.png") no-repeat; - background-size: 100% 100%; - cursor: pointer; - } - .day { - padding: 0 6%; - margin-right: 5%; - z-index: 99; - } - .week { - padding: 0 6%; - margin-right: 5%; - z-index: 99; - } - .month { - padding: 0 6%; - z-index: 99; - } - .active { - background: url("@/assets/images/dustNoise/rightImg.png") no-repeat; - background-size: 100% 100%; - } + width: 20%; + display: flex; + position: absolute; + z-index: 10; + color: #fff; + font-size: 10px; + text-align: center; + line-height: 20px; + left: 21%; + top: 2.7%; + .selected { + height: 5%; + background: url("@/assets/images/dustNoise/rightImg2.png") no-repeat; + background-size: 100% 100%; + cursor: pointer; } + .day { + padding: 0 6%; + margin-right: 5%; + z-index: 99; + } + .week { + padding: 0 6%; + margin-right: 5%; + z-index: 99; + } + .month { + padding: 0 6%; + z-index: 99; + } + .active { + background: url("@/assets/images/dustNoise/rightImg.png") no-repeat; + background-size: 100% 100%; + } + } .title { height: 10%; line-height: 35px; @@ -178,24 +209,17 @@ onMounted(async () => { } } .listBox { - height: 300px; - overflow-y: scroll; + height: 80%; .listStyle { display: flex; justify-content: space-around; color: #fff; - height: 10%; line-height: 25px; font-size: calc(100vw * 12 / 1920); .list-img { .el-img { - width: 35%; - img { - display: flex; - align-items: center; - width: 100%; - height: 100%; - } + width: 50px; + height: 25px; } } div { @@ -210,19 +234,19 @@ onMounted(async () => { } } .notoDta { - top: 45%; - width: 20%; - left: 39%; - position: absolute; - img { - width: 40%; - margin: 5% 30%; - } - p { - color: #fff; - font-size: calc(100vw * 14 / 1920); - margin: -6% 37%; - text-align: center; - } + top: 45%; + width: 20%; + left: 39%; + position: absolute; + img { + width: 40%; + margin: 5% 30%; } + p { + color: #fff; + font-size: calc(100vw * 14 / 1920); + margin: -6% 37%; + text-align: center; + } +} From 82c42f3d761d46871cb0ba6abcc6bde36c41a080 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 18 Mar 2024 19:29:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.production b/.env.production index 5ffbb72..6169443 100644 --- a/.env.production +++ b/.env.production @@ -5,13 +5,14 @@ NODE_ENV = "production" # 注：切换部署环境时需更改src\routers\modules\staticRouter里的路径 改src\config\config.ts里的项目标识 # VITE_API_URL = "http://139.9.66.234:6688" # VITE_API_URL = "http://jxj.zhgdyun.com:6688" +VITE_API_URL = 'http://jxj.zhgdyun.com:100' # 沈阳合盈线上 # VITE_API_URL = "http://101.43.164.214:45022" # 嘉兴王江泾公用码头 # VITE_API_URL = "http://183.249.224.118:9003" # 百色 新项目通用地址 -VITE_API_URL = 'http://101.43.164.214:11111' +# VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(演示平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' From 7c5532cea514019fff3fc1894f788e332f378bbf Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 18 Mar 2024 19:35:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 6169443..09f702d 100644 --- a/.env.production +++ b/.env.production @@ -5,14 +5,14 @@ NODE_ENV = "production" # 注：切换部署环境时需更改src\routers\modules\staticRouter里的路径 改src\config\config.ts里的项目标识 # VITE_API_URL = "http://139.9.66.234:6688" # VITE_API_URL = "http://jxj.zhgdyun.com:6688" -VITE_API_URL = 'http://jxj.zhgdyun.com:100' +# VITE_API_URL = 'http://jxj.zhgdyun.com:100' # 沈阳合盈线上 # VITE_API_URL = "http://101.43.164.214:45022" # 嘉兴王江泾公用码头 # VITE_API_URL = "http://183.249.224.118:9003" # 百色 新项目通用地址 -# VITE_API_URL = 'http://101.43.164.214:11111' +VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(演示平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' From 8cea1162bd5a4773150cf6e36924d5db9a08c300 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Fri, 22 Mar 2024 13:51:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sevenLargeScreen/indexL.vue | 7 +++++-- src/views/sevenLargeScreen/videoManagement/index.vue | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 76d2125..ce7b343 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -1,5 +1,5 @@