From 87d8afbe95428a64e9767888f3624410e0ffd27c Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Fri, 11 Oct 2024 17:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/carouselChart.vue | 46 ++++++++++------------ src/views/components/carouselChartmore.vue | 46 ++++++++++------------ src/views/pictureRotation/index.vue | 7 +++- src/views/realTimeMonitor/index.vue | 14 +++---- 4 files changed, 53 insertions(+), 60 deletions(-) diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 5190165..b5deeb0 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -6,13 +6,7 @@ v-if="currentPicPath.indexOf('nopic') !== -1 && currentPicPath" > -
+
@@ -23,7 +17,7 @@ @click="handleBigPicbox(currentPicPath)" > - -
+
-
+
- + --> + @@ -228,6 +223,7 @@ export default { }, data() { return { + piclist: [], items: [ "Item 1", "Item 2", @@ -245,7 +241,7 @@ export default { mediaType: 0, //判断图片类型是视频还是图片 activeSmall: 0, //索引选中小图, currentPage: 0, - srcList: [], + radioPx: "", fileSize: "", roleUser: "", @@ -420,17 +416,12 @@ export default { //获取第一张大图 changeBigPic(data, i) { if (data) { + this.currentPicPath = data.path; console.log("aaaaaaaaaaaaaaaaaaaaa", data.mediaType); this.mediaType = data.mediaType !== null ? data.mediaType : 0; - this.picDataAlarm = data; - this.srcList = []; this.localPoints = []; this.activeSmall = i; - - this.currentPicPath = data.path; - this.srcList.push(data.path); - if (data.width != undefined) { this.radioPx = data.width + "x" + data.height; } else { @@ -482,8 +473,8 @@ export default { } }, loadImage() { - console.log("loading"); - this.picLoading = false; + // console.log("loading"); + // this.picLoading = false; this.drawlineBig(this.picDataAlarm); }, setDefaultImage(e) { @@ -1059,5 +1050,8 @@ export default { } } } + .hideimg { + display: none; + } } diff --git a/src/views/components/carouselChartmore.vue b/src/views/components/carouselChartmore.vue index 5190165..b5deeb0 100644 --- a/src/views/components/carouselChartmore.vue +++ b/src/views/components/carouselChartmore.vue @@ -6,13 +6,7 @@ v-if="currentPicPath.indexOf('nopic') !== -1 && currentPicPath" > -
+
@@ -23,7 +17,7 @@ @click="handleBigPicbox(currentPicPath)" > - -
+
-
+
- + --> + @@ -228,6 +223,7 @@ export default { }, data() { return { + piclist: [], items: [ "Item 1", "Item 2", @@ -245,7 +241,7 @@ export default { mediaType: 0, //判断图片类型是视频还是图片 activeSmall: 0, //索引选中小图, currentPage: 0, - srcList: [], + radioPx: "", fileSize: "", roleUser: "", @@ -420,17 +416,12 @@ export default { //获取第一张大图 changeBigPic(data, i) { if (data) { + this.currentPicPath = data.path; console.log("aaaaaaaaaaaaaaaaaaaaa", data.mediaType); this.mediaType = data.mediaType !== null ? data.mediaType : 0; - this.picDataAlarm = data; - this.srcList = []; this.localPoints = []; this.activeSmall = i; - - this.currentPicPath = data.path; - this.srcList.push(data.path); - if (data.width != undefined) { this.radioPx = data.width + "x" + data.height; } else { @@ -482,8 +473,8 @@ export default { } }, loadImage() { - console.log("loading"); - this.picLoading = false; + // console.log("loading"); + // this.picLoading = false; this.drawlineBig(this.picDataAlarm); }, setDefaultImage(e) { @@ -1059,5 +1050,8 @@ export default { } } } + .hideimg { + display: none; + } } diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue index cafa072..5e14ff1 100644 --- a/src/views/pictureRotation/index.vue +++ b/src/views/pictureRotation/index.vue @@ -212,6 +212,7 @@ :key="carouselKey" :terminalPhoto="terminalPhoto" :photoNum="photoNum" + v-loading="historyPicLoading" >
@@ -328,7 +329,7 @@ export default { //获取图片 getTerminalPhotoList(channelId, date, termId) { console.log(channelId, date, termId); - + this.historyPicLoading = true; console.log("zhanshi asdadadadadadsddadadadadad", this.terminalPhoto); //this.terminalPhoto = []; getTerminalPhotoListJoggle({ @@ -354,6 +355,7 @@ export default { this.$nextTick(() => { this.$refs.carouselpic.changeBigPic(this.terminalPhoto[0], 0); }); + this.historyPicLoading = false; }) .catch((err) => { console.log(err); //代码错误、请求失败捕获 @@ -789,6 +791,9 @@ export default { width: 100%; height: calc(100% - 10px); } + .el-loading-mask { + background-color: rgba(0, 0, 0, 0.3); + } } } [v-cloak] { diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index ab0f168..fe2f4c4 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -1039,24 +1039,24 @@ export default { this.$message({ duration: 1500, showClose: true, - message: "下发指令超时，请重试！", - type: "warning", + message: "拍照指令已下发", + type: "success", }); } else if (res.data.cmaStatus == 1 || res.data.picStatus == true) { - this.statusNum = 0; this.btnpicloading = false; this.btnvideoloading = false; + this.statusNum = 0; clearInterval(this.statusTimer); this.statusTimer = null; this.$message({ duration: 1500, showClose: true, - message: "下发指令成功！", + message: "拍照指令下发成功！", type: "success", }); - // clearInterval(this.timer); - // this.timer = null; + clearInterval(this.timer); + this.timer = null; // this.timer = window.setInterval(() => { // this.newPicApi(); // this.i++; @@ -1097,7 +1097,7 @@ export default { type: "warning", duration: 60000, }); - // this.newPicApi(); + //this.newPicApi(); } }, //获取最新图片