diff --git a/package-lock.json b/package-lock.json index 8ce5e06..e59a171 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8373,9 +8373,9 @@ "dev": true }, "vue-lazyload": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.3.3.tgz", - "integrity": "sha512-uHnq0FTEeNmqnbBC2aRKlmtd9LofMZ6Q3mWvgfLa+i9vhxU8fDK+nGs9c1iVT85axSua/AUnMttIq3xPaU9G3A==" + "version": "1.2.6", + "resolved": "https://registry.npmmirror.com/vue-lazyload/-/vue-lazyload-1.2.6.tgz", + "integrity": "sha512-6a61+pzwcfowhLRQiPdmRuJ40n/4fL/sEynu8KQZoCf5RVA0NH0X68vplLY0+lUM8mKNScYomaepV+hdjgnZhg==" }, "vue-loader": { "version": "17.2.2", diff --git a/package.json b/package.json index 9c796ed..5c7d86a 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "vue": "^2.6.14", "vue-awesome-swiper": "^5.0.1", "vue-clipboard2": "^0.3.3", - "vue-lazyload": "^1.3.3", + "vue-lazyload": "^1.2.6", "vue-router": "^3.5.1", "vue-touch": "^2.0.0-beta.4", "vuex": "^3.6.2" diff --git a/public/index.html b/public/index.html index ce019bf..00bd3ff 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,7 @@ + 视频监控可视化平台 diff --git a/src/App.vue b/src/App.vue index 6090de8..300b784 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,6 +9,35 @@ import { mapActions } from "vuex"; export default { name: "App", + mounted() { + let goUrl = this.isMobile(); + if (goUrl === 1) { + this.$confirm( + "您正在使用手机访问本站，可能无法获得最佳浏览体验， 即将跳转到手机端...", + "提示", + { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + customClass: "phonemesBox", + } + ) + .then(() => { + // this.$message({ + // type: "success", + // message: "删除成功!", + // }); + //移动端地址 + location = "http://61.169.135.146:40080/phone/#/login"; + }) + .catch(() => { + // this.$message({ + // type: "info", + // message: "已取消删除", + // }); + }); + } + }, methods: { ...mapActions("cache", ["addCache", "removeCache"]), // 收集缓存（通过监听） @@ -46,6 +75,15 @@ export default { this.cmpNames[name] = file; } }, + isMobile() { + let flag = navigator.userAgent.match( + /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i + ); + // localStorage.setItem('isiphone',flag) + localStorage.setItem("ismobile", flag ? 1 : 0); + let goUrl = flag ? 1 : 0; + return goUrl; + }, }, watch: { "$route.path": { @@ -58,4 +96,9 @@ export default { }; - + diff --git a/src/assets/img/nopicbg.png b/src/assets/img/nopicbg.png new file mode 100644 index 0000000..0ab36c7 Binary files /dev/null and b/src/assets/img/nopicbg.png differ diff --git a/src/main.js b/src/main.js index a5ebb16..fec1c3d 100644 --- a/src/main.js +++ b/src/main.js @@ -28,6 +28,11 @@ Vue.use(ElementUI, { //引入插件 import VueLazyload from "vue-lazyload"; //注册插件 +// 全局配置vue-lazyload +// Vue.use(VueLazyload, { + +// listenEvents: ["scroll"], // 监听的事件类型 +// }); Vue.use(VueLazyload, { error: require("./assets/img/nodatapic2.jpg"), listenEvents: [ diff --git a/src/views/realTimeMonitor/components/carouselChart copy.vue b/src/views/realTimeMonitor/components/carouselChart copy.vue new file mode 100644 index 0000000..8f2b78d --- /dev/null +++ b/src/views/realTimeMonitor/components/carouselChart copy.vue @@ -0,0 +1,1005 @@ + + + + diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue index d48fac5..7941e61 100644 --- a/src/views/realTimeMonitor/components/carouselChart.vue +++ b/src/views/realTimeMonitor/components/carouselChart.vue @@ -16,6 +16,7 @@ {{ protocolInfo }} +
-
+
+
- +

@@ -134,7 +132,7 @@

- +

+

+
+ {{ radioPx }} ({{ fileSize }}) + 国网I1 + 陕西 + 安徽 + 江苏 + 湖南 + 浙江 + 河南全景 + 河南郑州 + 河南统一视频v2020 + 宁夏 + 南网 + {{ protocolInfo }} + +
+ +
+
+ +
+
+ + + + + + + +
+
+ +
+
+ +
+ 下载图片 +
+ +
+
+ + +
+
+
+
+
+ + + + +

+ + {{ $moment(item.photoTime).format("HH:mm:ss") }} + + + ( + + {{ $moment(item.recvTime).format("HH:mm:ss") }} + + ) + --{{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelName + }} + (已告警) +

+
+
+ + +

+ + + {{ $moment(item.photoTime).format("HH:mm:ss") }} + + + ( + + {{ $moment(item.recvTime).format("HH:mm:ss") }} + + ) + --{{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelName + }} +

+
+
+ + +
+
+
+
+ +
+
+ +
+
+
+ + + +
+ + + + diff --git a/src/views/realTimeMonitor/components/morePicPreveiw.vue b/src/views/realTimeMonitor/components/morePicPreveiw.vue index c3c3592..b3269b7 100644 --- a/src/views/realTimeMonitor/components/morePicPreveiw.vue +++ b/src/views/realTimeMonitor/components/morePicPreveiw.vue @@ -20,6 +20,7 @@
0) { diff --git a/src/views/realTimeMonitor/index copy.vue b/src/views/realTimeMonitor/index copy.vue new file mode 100644 index 0000000..e8efe9d --- /dev/null +++ b/src/views/realTimeMonitor/index copy.vue @@ -0,0 +1,298 @@ + + + diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index e8efe9d..005061d 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -21,7 +21,7 @@
-
+
@@ -30,10 +30,10 @@
@@ -66,15 +66,16 @@ export default { page: 1, // 当前页数 towertitle: "", //杆塔名称 lineLoading: false, //杆塔loading - swiperLoading: false, + swiperLoading: true, terminalPhoto: [], //获取装置当前图片数据 photoNum: 5, dateValue: "", //当前时间 - protocolInfo: "", + protocolInfo: 0, nopicPath: require("@/assets/img/nopic.jpg"), typeRadio: -1, //类型选择 allTreeFlag: true, roleName: "", + carouselKey: 0, // 初始key }; }, watch: { @@ -149,7 +150,7 @@ export default { console.log("杆塔"); this.LineFlag = false; this.towerFlag = true; - this.terminalPhoto = []; + //this.terminalPhoto = []; this.protocolInfo = this.treeSelectData.protocol; console.log("asddddddddddddddddddddd", this.treeSelectData); this.towertitle = this.treeSelectData.name; @@ -163,7 +164,7 @@ export default { console.log(channelId, date, termId); this.swiperLoading = true; console.log("zhanshi asdadadadadadsddadadadadad", this.terminalPhoto); - this.terminalPhoto = []; + //this.terminalPhoto = []; getTerminalPhotoListJoggle({ channelid: channelId, time: date, @@ -176,12 +177,13 @@ export default { { path: this.nopicPath, termId: termId, - mediatype: 0, + mediaType: 0, }, ]; } else { this.terminalPhoto = res.data.list; } + this.carouselKey++; // 更新key以强制重新渲染 // let newDataList = []; // let current = 0; // if (this.terminalPhoto && this.terminalPhoto.length > 0) { @@ -284,6 +286,9 @@ export default { } } } + .el-loading-mask { + background-color: rgba(0, 0, 0, 0.3); + } } .parameterArea { width: 220px; diff --git a/src/views/system/deviceUpgrade/index.vue b/src/views/system/deviceUpgrade/index.vue index 9dae55d..4e6d16d 100644 --- a/src/views/system/deviceUpgrade/index.vue +++ b/src/views/system/deviceUpgrade/index.vue @@ -343,6 +343,7 @@ export default { message: res.msg, type: "error", }); + this.progressLoading = false; this.reportData.title = ""; this.$refs.upload.clearFiles(); }