diff --git a/package-lock.json b/package-lock.json index d0d3fb5..d6c4682 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3767,12 +3767,12 @@ "dev": true }, "echarts": { - "version": "5.4.2", - "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.2.tgz", - "integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz", + "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==", "requires": { "tslib": "2.3.0", - "zrender": "5.4.3" + "zrender": "5.4.4" } }, "ee-first": { @@ -8797,9 +8797,9 @@ } }, "zrender": { - "version": "5.4.3", - "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.3.tgz", - "integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==", + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz", + "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==", "requires": { "tslib": "2.3.0" } diff --git a/package.json b/package.json index 9522ad6..5f9b5d0 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dependencies": { "axios": "^1.3.4", "core-js": "^3.8.3", - "echarts": "^5.4.2", + "echarts": "^5.4.3", "element-ui": "^2.15.13", "jquery": "^3.7.0", "moment": "^2.29.4", diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index edb5291..ddc72b1 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -421,7 +421,7 @@ export default { zzradio: -1, videoVisible: false, videoForm: { - stream: 0, + stream: "0", time: "20", }, commondChannel: 1, @@ -707,7 +707,7 @@ export default { this.clearfun(); this.terminalPhoto = []; console.log(id, date, termId); - this.swiperLoading = true; + getTerminalPhotoListJoggle({ channelid: id, time: date, @@ -715,7 +715,7 @@ export default { }) .then((res) => { console.log(res); - this.swiperLoading = false; + if (res.data.list.length == 0) { this.terminalPhoto = [ {