From 2cb264ec2b7c7dd9798d1821927104fad35bd063 Mon Sep 17 00:00:00 2001 From: ZZJ <10913410+zzj2100@user.noreply.gitee.com> Date: 星期二, 28 六月 2022 14:47:43 +0800 Subject: [PATCH] 系统设置自适应 --- src/pages/cameraAccess/components/SeparateRules.vue | 56 ++++++++++---------------------------------------------- 1 files changed, 10 insertions(+), 46 deletions(-) diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue index ed6295b..bb1e9e3 100644 --- a/src/pages/cameraAccess/components/SeparateRules.vue +++ b/src/pages/cameraAccess/components/SeparateRules.vue @@ -2,7 +2,7 @@ <div class="s-separate-rules"> <div class="ai"> <div class="check-area"> - <div class="ai-select"> + <div class="ai-select" v-if="TreeDataPool.selectedNode.type !== 'MENU'"> <div v-show="cameraType === 'camera'"> <span> <span class="label">瑙嗛鍒嗘瀽澶勭悊</span> @@ -160,6 +160,7 @@ :loading="Camera.loading" :canvasWidth="canvasWidth" :canvasHeight="canvasHeight" + :isGB28181="Camera.gb28181" @fromCanvas="getCanvasData" @changeLoading="changeLoading" @refresh="refresh" @@ -316,7 +317,7 @@ }, }, tableRuleList: [], - camStatus:'', + camStatus: "", cameraId: "", showSysInfo: false, showCanvas: true, @@ -330,7 +331,6 @@ }; }, mounted() { - this.mockAsync(); this.PollData.statistics(); }, watch: { @@ -357,19 +357,19 @@ switch (res.data.status) { case 0: this.camStatus = "鏈厤瑙勫垯"; - return + return; case 1: this.camStatus = "绛夊緟杞澶勭悊"; - return + return; case 2: this.camStatus = "姝e湪鎵ц鍒嗘瀽澶勭悊"; - return + return; case -1: this.camStatus = "鍏朵粬鎯呭喌瀵艰嚧鏈鐞�"; - return + return; case -2: this.camStatus = "鏁呴殰瀵艰嚧鏈鐞�"; - return + return; } } }); @@ -447,40 +447,6 @@ swiperSlideChange() { this.swiperIndex = this.$refs.swiper.swiper.activeIndex; }, - mockAsync() { - setTimeout(() => { - this.mockSceneData = [ - { - scenename: "name1", - id: 1, - icon: ["iconrenlianjiance", "icongetijingzhi"], - }, - { scenename: "name2", id: 2, icon: ["iconchouyan-copy"] }, - { - scenename: "name3", - id: 3, - icon: [ - "iconrenshukouzhao", - "iconchouyan-copy", - "iconrenlianjiance", - "icongetijingzhi", - ], - }, - { - scenename: "name4", - id: 4, - icon: ["iconchouyan-copy", "iconrenlianjiance", "icongetijingzhi"], - }, - { scenename: "name5", id: 5, icon: ["icongetijingzhi"] }, - { - scenename: "name6", - id: 6, - icon: ["iconrenshukouzhao", "icongetijingzhi"], - }, - { scenename: "name7", id: 7, icon: ["iconrenlianjiance"] }, - ]; - }, 3000); - }, drawBaseImg() { if (Array.isArray(this.$refs.canvas)) { if (this.$refs.canvas.length > 0) { @@ -505,12 +471,10 @@ async initCameraData(id, type) { this.Camera = new VideoRuleData(); - console.log("121212"); - console.log(type); - if (id && id !== "") { this.loading = false; this.Camera.cameraId = id; + this.Camera.gb28181 = type === 1; if (type === 1) { await this.Camera.update(true); } else { @@ -571,7 +535,7 @@ camera_ids: [this.Camera.cameraId], run_type: val, }).then((rsp) => { - this.getStatus() + this.getStatus(); if (rsp && rsp.success) { this.$notify({ type: "success", -- Gitblit v1.8.0