From e2097c64f20cb34a8d1598467d62286ce09c1550 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期六, 09 十月 2021 16:12:45 +0800
Subject: [PATCH] 网络设置ui调整
---
src/pages/cameraAccess/components/SeparateRules.vue | 53 ++++++++++++++++++-----------------------------------
1 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index 6171c5a..6d0872b 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -30,7 +30,7 @@
<div v-if="Camera.analytics" class="flex-box" v-show="cameraType === 'camera'">
<span
class="label"
- >鍒嗚鲸鐜�: {{Camera.resolutionOption.find(o=>o.value === Camera.selectResolution).label}}</span>
+ >鍒嗚鲸鐜�: {{(Camera.camearInfo.resolution_width == 0 || Camera.camearInfo.resolution_height == 0) ? '鏈満鍒嗚鲸鐜�': `${Camera.camearInfo.resolution_width} * ${Camera.camearInfo.resolution_height}` }}</span>
</div>
<div v-if="Camera.analytics" class="flex-box">
@@ -217,7 +217,6 @@
</template>
<script>
-//import { timeSilderData } from "@/mockData/timeSilder";
import { savePolygon } from "@/api/polygon";
import {
@@ -226,7 +225,6 @@
import {
saveCameraScene,
- getCameraSceneRule,
} from '@/api/scene'
import { changeRunType } from "@/api/pollConfig";
@@ -235,12 +233,9 @@
import TimeSlider from "./TimeSlider";
import polygonCanvas from "@/components/canvas";
-//import Sysinfo from "./SystemInfo";
import Sysinfo from "@/components/subComponents/SystemInfo";
import SceneRule from "./SceneRule";
import SlideScene from "./scene/SlideScene";
-import { duration } from 'moment';
-
export default {
components: {
@@ -280,24 +275,21 @@
prevEl: ".swiper-local-prev"
}
},
- swiperOption: {
- slidesPerView: 5,
- spaceBetween: 8,
- pagination: {
- el: ".swiper-pagination",
- clickable: true
- },
- navigation: {
- nextEl: ".swiper-next-border",
- prevEl: ".swiper-pre-border"
- }
- },
+ // swiperOption: {
+ // slidesPerView: 5,
+ // spaceBetween: 8,
+ // pagination: {
+ // el: ".swiper-pagination",
+ // clickable: true
+ // },
+ // navigation: {
+ // nextEl: ".swiper-next-border",
+ // prevEl: ".swiper-pre-border"
+ // }
+ // },
tableRuleList: [],
cameraId: "",
- activeTaskIndex: 0,
- activeTaskId: "",
- booleanValue: false,
showSysInfo: false,
showCanvas: true,
canvasWidth: 576,
@@ -323,7 +315,6 @@
this.stackFilesSize = 5;
this.stackId = n;
if (this.stackId) {
- // console.log('getStackFiles')
this.swipercanvasData = [];
this.getStackFiles()
}
@@ -334,11 +325,7 @@
},
methods: {
prevClick() {
- // console.log(this.swiperIndex)
- // console.log(this.$refs.swiper.swiper.activeIndex)
if (this.swiperIndex == 0) {
- // console.log('鏈鍒嗛〉鐨勭涓�鏉�')
- //璇锋眰涓婁竴椤�
if (this.stackFilesPage > 1) {
this.stackFilesPage--;
this.getStackFiles(true);
@@ -353,8 +340,6 @@
},
nextClick() {
if (this.swiperIndex == this.swipercanvasData.length - 1) {
- // console.log('鏈�鍚庝竴寮�,鍔犺浇鏇村')
- //璇锋眰涓嬩竴椤�
this.stackFilesPage++;
this.getStackFiles(true);
}
@@ -388,7 +373,6 @@
}
}
} else {
- // console.log(this.swipercanvasData)
this.$message({
type: 'error',
message: '鏁版嵁璇锋眰澶辫触,璇风◢鍚庨噸璇�!'
@@ -396,7 +380,6 @@
}
this.getStackFileLoading = false;
}).catch(e => {
- // console.log(e);
this.getStackFileLoading = false;
});
},
@@ -494,7 +477,6 @@
},
changeLoading(params) {
this.loading = params
- // console.log(this.loading,'changeLoading',params)
},
//鏄惁杩涜瑙嗛鍒嗘瀽澶勭悊
pollEnable(row) {
@@ -512,6 +494,7 @@
val = -1
}
if (this.Camera.cameraId && this.Camera.cameraId !== undefined) {
+ debugger
changeRunType({ camera_ids: [this.Camera.cameraId], run_type: val }).then(
rsp => {
if (rsp && rsp.success) {
@@ -525,16 +508,16 @@
message: "閰嶇疆澶辫触"
});
}
- // this.selectCamera(this.TreeDataPool.selectedNode)
+ this.TreeDataPool.fetchTreeData();
}
);
}
- this.TreeDataPool.fetchTreeData();
this.PollData.statisticTaskInfo();
},
//瀹炴椂銆佽疆璇㈠垏鎹�
changePoll(row) {
//鍒ゆ柇鏄柊澧炶繕鏄洿鏂�
+ debugger
if (this.Camera.cameraId && this.Camera.cameraId !== undefined) {
if (this.PollData.RealTimeSum < this.PollData.channelTotal) {
if (row.value) {
@@ -542,6 +525,7 @@
} else {
this.Camera.dealWay = false
}
+ debugger
changeRunType({ camera_ids: [this.Camera.cameraId], run_type: this.Camera.dealWay ? 1 : 0 }).then(
rsp => {
if (rsp && rsp.success) {
@@ -560,6 +544,7 @@
} else {
if (this.Camera.dealWay) {
this.Camera.dealWay = false
+ debugger
changeRunType({ camera_ids: [this.Camera.cameraId], run_type: this.Camera.dealWay ? 1 : 0 }).then(
rsp => {
if (rsp && rsp.success) {
@@ -602,7 +587,6 @@
sourceId: this.TreeDataPool.ctrlCameraId,
targetIds: [this.Camera.cameraId]
}).then((res) => {
- // console.log(res,'澶嶅埗绠楁硶')
if (res && res.success) {
this.$notify({
type: "success",
@@ -616,7 +600,6 @@
})
}
}).catch(err => {
- // console.log(err,'澶嶅埗绠楁硶鎶ラ敊锛�')
this.$notify({
type: "error",
message: "绮樿创绠楁硶澶辫触锛�"
--
Gitblit v1.8.0