From 644e6bac8cd089c691d83fe092502261ba416283 Mon Sep 17 00:00:00 2001 From: ZZJ <10913410+zzj2100@user.noreply.gitee.com> Date: 星期二, 21 六月 2022 16:07:16 +0800 Subject: [PATCH] 添加联动场景 --- src/views/search/components/imgDown.vue | 2 +- vue.config.js | 4 ++-- src/views/search/components/wasmPlayer/index.vue | 2 +- src/views/hashrate/CameraManage/CameraRules/index.vue | 11 +++++++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/views/hashrate/CameraManage/CameraRules/index.vue b/src/views/hashrate/CameraManage/CameraRules/index.vue index 402d63d..0d9f0ee 100644 --- a/src/views/hashrate/CameraManage/CameraRules/index.vue +++ b/src/views/hashrate/CameraManage/CameraRules/index.vue @@ -901,13 +901,20 @@ }; if (this.addData.type === "linkage") { this.addData.cameras = []; - this.linkageRule[index].camera_polygons.forEach((item) => { + this.Carmeras.forEach((camera) => { + this.addData.cameras.push({ + polygonData: camera.polygonData, + cameraName: camera.cameraName, + cameraId: camera.cameraId, + }); + }); + /* this.linkageRule[index].camera_polygons.forEach((item) => { this.addData.cameras.push({ polygonData: item.polygon, cameraName: item.camera_name, cameraId: item.camera_id, }); - }); + }); */ } this.showSdkBox = false; this.showSdkSettingBox = true; diff --git a/src/views/search/components/imgDown.vue b/src/views/search/components/imgDown.vue index 6382bb8..dd8a9c7 100644 --- a/src/views/search/components/imgDown.vue +++ b/src/views/search/components/imgDown.vue @@ -7,7 +7,7 @@ preview /> <img :src="'http://' + url" v-if="!isPreview" /> - <el-button class="btn" @click="downloadIamge('http://' + url)"> + <el-button class="btn" @click="downloadIamge('/httpImage/' + url)"> <i class="iconfont iconxiazai"></i> </el-button> </div> diff --git a/src/views/search/components/wasmPlayer/index.vue b/src/views/search/components/wasmPlayer/index.vue index 367497d..f56739b 100644 --- a/src/views/search/components/wasmPlayer/index.vue +++ b/src/views/search/components/wasmPlayer/index.vue @@ -456,7 +456,7 @@ url = this.videoUrl; } else { - url = "http://" + this.videoUrls[this.playerIndex]; + url = "/httpImage/" + this.videoUrls[this.playerIndex]; } this.videoLoading = true; diff --git a/vue.config.js b/vue.config.js index 75d9f3a..8cc7dec 100644 --- a/vue.config.js +++ b/vue.config.js @@ -26,13 +26,13 @@ // target: "http://222.128.87.51:7003", // target: "http://192.168.20.10:7009", // target: "http://192.168.20.189:7009", - target: "http://192.168.20.117:7080", + target: "http://192.168.20.235:7070", changeOrigin: true, //寮�鍚唬鐞� }, "/ws": { - target: "http://192.168.20.189:7009", + target: "http://192.168.20.235:7070", // ws: true, changeOrigin: true, }, -- Gitblit v1.8.0