From 5e41794e6f472fb3ca2be4a0bffdf88aa817f862 Mon Sep 17 00:00:00 2001 From: qiushui Date: Mon, 10 Jan 2022 17:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E5=83=8F=E6=92=AD=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 160 ++++++++++++----------- src/views/cameraManage/model.vue | 94 +++----------- src/views/checkManage/Subsection.vue | 39 ++++-- src/views/checkManage/index.vue | 174 ++++++++++++-------------- src/views/historyMonitoring/index.vue | 35 +++--- src/views/historyMonitoring/model.vue | 38 ++++-- src/views/repertoryManage/index.vue | 9 +- vue.config.js | 16 +++ 8 files changed, 273 insertions(+), 292 deletions(-) diff --git a/package-lock.json b/package-lock.json index c28a690..7915494 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1859,6 +1859,16 @@ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", @@ -1885,6 +1895,34 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -1915,6 +1953,25 @@ "path-exists": "^4.0.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -1985,6 +2042,16 @@ "minipass": "^3.1.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz", @@ -2001,6 +2068,18 @@ "terser": "^4.6.12", "webpack-sources": "^1.4.3" } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -13783,87 +13862,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-ref": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz", diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue index 72c3a99..6ef92ef 100644 --- a/src/views/cameraManage/model.vue +++ b/src/views/cameraManage/model.vue @@ -36,18 +36,7 @@ height="80%" :id="`camera${id}`" autoplay muted > - +
- {{text}} + {{text}}({{record.code}})
@@ -162,47 +151,13 @@ 覆盖
- - 写入 - - - - -
- 已写入 - - 覆盖 - -
- - 写入 - - - - -
- 已写入 - - 覆盖 - -
- - 写入 - - - - -
- 已写入 - - 覆盖 - -
- + 写入 + +
@@ -303,7 +258,7 @@ export default { }; }, mounted() { - console.log('mounted执行了') + this.setVideoServer() if (this.$route.query.modelType == 'test') { this.isShow = true @@ -369,18 +324,19 @@ export default { this.$emit('close', false, {}) if(this.type=='test') { this.$router.go(-1); - var vlc = document.getElementById('video-test'); - vlc.playlist.items.clear() + this.player.destroy() }else if(this.type=='config') { this.$router.go(-1); - var vlc = document.getElementById('video-config'); - vlc.playlist.items.clear() + this.player.destroy() } }, autoPlay(id){ let video = document.getElementById('camera'+id); - let player = new WebRtcPlayer(video,'camera'+id); - player.load('camera'+id); + console.log(video) + if(this.player == null){ + this.player = new WebRtcPlayer(video,'camera'+id); + } + this.player.load('camera'+id); }, setVideoServer(){ this.$api.httpApi.getVideoServer({ @@ -407,29 +363,9 @@ export default { }); }, - writeIn(type,data){ - console.log(this.id) - console.log(data.id) - console.log(type) - this.$api.httpApi.writeInCameraIoptz({ - data: { - cameraId: this.id, - cameraIOId: data.id, - name: data.name, - code: data.code, - type: type - } - }).then(res => { - console.log(res) - this.getConfigIoList() - }).catch(err => { - - }); - }, + coverage(type,data){ - console.log(this.id) - console.log(data.id) - console.log(type) + this.$api.httpApi.writeInCameraIoptz({ data: { cameraId: this.id, diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index 8449ec5..d335aa5 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -28,7 +28,7 @@ + @click="tocheckPage(row,column)"> {{row}}-{{column}}
@@ -96,6 +96,30 @@ export default { return {} } }, + streetId: { + type: Number, + default: () => { + return {} + } + }, + streetName: { + type: String, + default: () => { + return {} + } + }, + type: { + type: String, + default: () => { + return {} + } + }, + inOut: { + type: String, + default: () => { + return {} + } + }, }, computed: { @@ -114,9 +138,10 @@ export default { column: this.getRandomColumn(this.select.column), } }, - watchShelveIdInfo() { + watchShelveIdInfo(){ return this.shelveId; - }, + } + }, watch: { @@ -139,7 +164,7 @@ export default { this.getStatus(); }, created() { - this.getStatus(); + //this.getStatus(); //this.changeTab('1-1') }, destroyed() { @@ -240,11 +265,11 @@ export default { }); }, - toCheck(row,column,shelveId){ + tocheckPage(row,column){ this.$router.push({ name: 'checkOperation', - query: {row: row, column: column, shelveId: shelveId} - }) + query: {row: row, column: column, shelveId: this.shelveId, id: this.streetId, name:this.streetName, type: this.type, type2: this.inOut} + }) } } } diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index 4c13bf4..5b844ad 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -48,7 +48,7 @@
- +
@@ -151,18 +151,15 @@ export default { dataIndex: "timeLength", }, { - title: "球机1", + title: "视频录像", // dataIndex: "videoPath1", scopedSlots: {customRender: 'videoPath1'} - }, - { - title: "球机2", - // dataIndex: "videoPath2", - scopedSlots: {customRender: 'videoPath2'} - }, + } + ], visible: false, - vid: '' + vid1: '', + vid2: '' } }, mounted() { @@ -226,14 +223,16 @@ export default { this.queryParam.startTimestamp = "" this.queryParam.endTimestamp = "" }, - showModel(path) { + showModel(record) { this.visible = true - this.vid = videoUrl + path; + this.vid1 = videoUrl + record.videoPath1; + console.log(this.vid1) + this.vid2 = videoUrl + record.videoPath2; }, closeModel(visible, data) { this.visible = visible - this.vid = data + this.vid1 = data }, reset() { this.queryParam.startTimestamp = "" diff --git a/src/views/historyMonitoring/model.vue b/src/views/historyMonitoring/model.vue index 0521fbf..1e7cf93 100644 --- a/src/views/historyMonitoring/model.vue +++ b/src/views/historyMonitoring/model.vue @@ -16,13 +16,23 @@
+ @@ -64,17 +74,26 @@