From 49a8a78f9ee54592a501ea4c94eb738ce5e284fd Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 19 十月 2021 10:13:37 +0800
Subject: [PATCH] 网络设置v0
---
src/pages/cameraAccess/components/SeparateRules.vue | 384 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 279 insertions(+), 105 deletions(-)
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index 1faa16f..6d0872b 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -15,12 +15,8 @@
</span>
</div>
- <div
- v-if="Camera.analytics"
- class="flex-box"
- v-show="cameraType === 'camera'"
- >
- <span class="label" >澶勭悊鏂瑰紡</span>
+ <div v-if="Camera.analytics" class="flex-box" v-show="cameraType === 'camera'">
+ <span class="label">澶勭悊鏂瑰紡</span>
<toggle-button
:value="Camera.dealWay"
:width="60"
@@ -31,38 +27,19 @@
/>
</div>
- <div
- v-if="Camera.analytics"
- class="flex-box"
- v-show="cameraType === 'camera'"
- >
- <span class="label" >鍒嗚鲸鐜�</span>
- <el-select
- v-model="Camera.selectResolution"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 134px;
- margin-left:10px;"
- >
- <el-option
- v-for="item in Camera.resolutionOption"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
+ <div v-if="Camera.analytics" class="flex-box" v-show="cameraType === 'camera'">
+ <span
+ class="label"
+ >鍒嗚鲸鐜�: {{(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">
- <span class="label" >鏅鸿兘璁＄畻鑺傜偣: {{ Camera.runServerName}}</span>
+ <span class="label">SmartAI鑺傜偣: {{ Camera.runServerName}}</span>
</div>
- <div
- v-if="Camera.analytics"
- class="flex-box"
- >
+ <div v-if="Camera.analytics" class="flex-box">
<span class="label">绠楁硶蹇�熼�氶亾</span>
- <div class="channel flex-box" >
+ <div class="channel flex-box">
<el-tooltip
effect="dark"
content="澶嶅埗姝ゆ憚鍍忔満绠楁硶瑙勫垯"
@@ -95,7 +72,7 @@
<div class="devide"></div>
- <div class="top" >
+ <div class="top">
<p class="task-css">
<b style="font-size: 14px; line-height: 18px;">鍦烘櫙</b>
</p>
@@ -106,13 +83,13 @@
:showRealPoll="cameraType === 'camera'"
:ShowLocalVedio="cameraType === 'dataStack'"
v-if="showSysInfo"
- style="margin-left: 10px;margin-top:-10px"
+ style="margin-top:-10px"
/>
</div>
</div>
</div>
- <div class="bottom" >
+ <div class="bottom">
<div class="devide"></div>
<div class="bottom-right">
<div class="draw-and-time-box">
@@ -133,25 +110,86 @@
>{{ Camera.camearInfo.alias ? Camera.camearInfo.alias: Camera.camearInfo.name }}</b>
</div>
<div class="img-box">
- <polygon-canvas
- class="cavas"
- ref="canvas"
- v-if="showCanvas"
- v-loading="loading"
- element-loading-text="鍒锋柊涓紝璇风◢绛�..."
- element-loading-background="rgba(0, 0, 0, 0.8)"
- :isShowDrawArrow="false"
- :disabled="false"
- :snapshot_url="Camera.baseImg"
- :canvasDataShow="Camera.canvasData"
- :currentCameraId="Camera.cameraId"
- :loading="Camera.loading"
- :canvasWidth="canvasWidth"
- :canvasHeight="canvasHeight"
- @fromCanvas="getCanvasData"
- @changeLoading="changeLoading"
- @refresh="refresh"
- ></polygon-canvas>
+ <template v-if="TreeDataPool.treeActiveName == 'camera'">
+ <polygon-canvas
+ class="cavas"
+ ref="canvas"
+ v-if="showCanvas"
+ v-loading="loading"
+ element-loading-text="鍒锋柊涓紝璇风◢绛�..."
+ element-loading-background="rgba(0, 0, 0, 0.8)"
+ :isShowDrawArrow="false"
+ :disabled="false"
+ :snapshot_url="Camera.baseImg"
+ :canvasDataShow="Camera.canvasData"
+ :currentCameraId="Camera.cameraId"
+ :loading="Camera.loading"
+ :canvasWidth="canvasWidth"
+ :canvasHeight="canvasHeight"
+ @fromCanvas="getCanvasData"
+ @changeLoading="changeLoading"
+ @refresh="refresh"
+ ></polygon-canvas>
+ </template>
+ <template v-else>
+ <div style="width:100%" v-loading="getStackFileLoading">
+ <swiper
+ ref="swiper"
+ :auto-update="true"
+ :options="canvasSwiperOption"
+ @slideChange="swiperSlideChange"
+ class="swiper-box-container2"
+ style="width:100%"
+ >
+ <swiper-slide v-for="(data, index) in swipercanvasData" :key="index">
+ <div>
+ <b
+ class="video-title"
+ style="font-size:14px;margin-top:-10px"
+ >{{ data.name }}</b>
+ <polygon-canvas
+ class="cavas"
+ ref="canvas"
+ v-if="showCanvas"
+ v-loading="loading"
+ element-loading-text="鍒锋柊涓紝璇风◢绛�..."
+ element-loading-background="rgba(0, 0, 0, 0.8)"
+ :isShowDrawArrow="false"
+ :isShowRefresh="false"
+ :sourceType="data.type"
+ :disabled="false"
+ :snapshot_url="data.baseImg"
+ :canvasDataShow="Camera.canvasData"
+ :currentCameraId="data.stackId"
+ :loading="data.loading"
+ :canvasWidth="canvasWidth"
+ :canvasHeight="canvasHeight"
+ @fromCanvas="getCanvasData"
+ @changeLoading="changeLoading"
+ ></polygon-canvas>
+ </div>
+ </swiper-slide>
+ </swiper>
+ <div
+ class="swiper-local-prev"
+ v-show="swipercanvasData.length>1"
+ @click="prevClick"
+ >
+ <div class="icon-btn" slot="button-prev">
+ <i class="iconfont iconzuo"></i>
+ </div>
+ </div>
+ <div
+ class="swiper-local-next"
+ v-show="swipercanvasData.length>1"
+ @click="nextClick"
+ >
+ <div class="icon-btn" slot="button-next">
+ <i class="iconfont iconyou1"></i>
+ </div>
+ </div>
+ </div>
+ </template>
</div>
</div>
<div style="float:left;width:calc(10% - 90px);height:100%;"></div>
@@ -179,7 +217,6 @@
</template>
<script>
-//import { timeSilderData } from "@/mockData/timeSilder";
import { savePolygon } from "@/api/polygon";
import {
@@ -188,16 +225,14 @@
import {
saveCameraScene,
- getCameraSceneRule,
} from '@/api/scene'
import { changeRunType } from "@/api/pollConfig";
-
+import { findAllFileByStackId } from "@/api/localVedio";
import VideoRuleData from "@/Pool/VideoRuleData";
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";
@@ -228,36 +263,129 @@
loading: false,
Camera: new VideoRuleData(),
runType: -1,
- swiperOption: {
- slidesPerView: 5,
- spaceBetween: 8,
+ getStackFileLoading: false,
+ canvasSwiperOption: {
+ grabCursor: true,
pagination: {
el: ".swiper-pagination",
- clickable: true
+ type: "fraction"
},
navigation: {
- nextEl: ".swiper-next-border",
- prevEl: ".swiper-pre-border"
+ nextEl: ".swiper-local-next",
+ prevEl: ".swiper-local-prev"
}
},
+ // 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,
- canvasHeight: 324
+ canvasHeight: 324,
+ stackId: '',
+ swiperIndex: 0,
+ swipercanvasData: [],
+ stackFilesPage: 1,
+ stackFilesSize: 5,
};
},
mounted() {
this.mockAsync();
this.PollData.statistics();
- },
+ },
+ watch: {
+ 'Camera.cameraId': {
+ handler(n, o) {
+ if (n) {
+ if (this.TreeDataPool.treeActiveName == "dataStack") {
+ this.stackFilesPage = 1;
+ this.stackFilesSize = 5;
+ this.stackId = n;
+ if (this.stackId) {
+ this.swipercanvasData = [];
+ this.getStackFiles()
+ }
+ }
+ }
+ }
+ }
+ },
methods: {
+ prevClick() {
+ if (this.swiperIndex == 0) {
+ if (this.stackFilesPage > 1) {
+ this.stackFilesPage--;
+ this.getStackFiles(true);
+ } else {
+ this.$message({
+ type: 'info',
+ message: '褰撳墠宸叉槸绗竴椤�'
+ });
+ }
+
+ }
+ },
+ nextClick() {
+ if (this.swiperIndex == this.swipercanvasData.length - 1) {
+ this.stackFilesPage++;
+ this.getStackFiles(true);
+ }
+ },
+ getStackFiles(onClick = false) {
+ this.getStackFileLoading = true;
+ let _this = this;
+ findAllFileByStackId({ name: '', stackId: this.stackId, page: this.stackFilesPage, size: this.stackFilesSize, type: 0 }).then(res => {
+ if (res && res.success) {
+ if (res.data.dataList.length > 0) {
+ this.swipercanvasData = [];
+ this.swipercanvasData = res.data.dataList.map(item => {
+ return {
+ name: item.name,
+ stackId: item.stack_id,
+ baseImg: item.type == 2 ? `/files/${item.path.substr(item.path.lastIndexOf('/') + 1)}` : item.snapshot_url,
+ type: item.type,
+ id: item.id,
+ loading: false
+ }
+ });
+ this.swiperIndex = 0;
+ this.$refs.swiper.swiper.activeIndex = 0;
+
+ } else {
+ if (onClick) {
+ this.$message({
+ type: 'warning',
+ message: '宸叉棤鏇村鏁版嵁!'
+ });
+ }
+ }
+ } else {
+ this.$message({
+ type: 'error',
+ message: '鏁版嵁璇锋眰澶辫触,璇风◢鍚庨噸璇�!'
+ });
+ }
+ this.getStackFileLoading = false;
+ }).catch(e => {
+ this.getStackFileLoading = false;
+ });
+ },
+ swiperSlideChange() {
+ this.swiperIndex = this.$refs.swiper.swiper.activeIndex;
+ },
mockAsync() {
setTimeout(() => {
this.mockSceneData = [
@@ -285,14 +413,20 @@
}, 3000)
},
drawBaseImg() {
- this.$refs.canvas.showModal();
+ if (Array.isArray(this.$refs.canvas)) {
+ if (this.$refs.canvas.length > 0) {
+ this.$refs.canvas[0].showModal();
+ }
+ } else {
+ this.$refs.canvas.showModal();
+ }
},
getCanvasData(data) {
let polyon = { ...data };
polyon.camera_id = this.Camera.cameraId;
savePolygon(polyon).then(rsp => {
this.Camera.getPolygon();
- this.Camera.getCameraTask();
+ //this.Camera.getCameraTask();
});
},
refresh(url) {
@@ -306,6 +440,7 @@
this.loading = false;
this.Camera.cameraId = id;
await this.Camera.update();
+
}
this.$refs.timeSlider.activeTab = this.VideoManageData.TimeRules[0].id;
@@ -318,6 +453,7 @@
})
},
+
saveSceneRule(groupRule) {
const payload = { ...groupRule }
payload.cameraIds = [this.Camera.cameraId];
@@ -330,9 +466,9 @@
message: "绛栫暐淇濆瓨鎴愬姛锛�"
});
//鍒锋柊宸︿晶鏍�
- debugger
+
_this.$root.$children[0].$children[0].querySearchAsync('camera')
-
+
}
});
},
@@ -341,7 +477,6 @@
},
changeLoading(params) {
this.loading = params
- // console.log(this.loading,'changeLoading',params)
},
//鏄惁杩涜瑙嗛鍒嗘瀽澶勭悊
pollEnable(row) {
@@ -359,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) {
@@ -372,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) {
@@ -389,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) {
@@ -407,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) {
@@ -449,7 +587,6 @@
sourceId: this.TreeDataPool.ctrlCameraId,
targetIds: [this.Camera.cameraId]
}).then((res) => {
- // console.log(res,'澶嶅埗绠楁硶')
if (res && res.success) {
this.$notify({
type: "success",
@@ -463,7 +600,6 @@
})
}
}).catch(err => {
- // console.log(err,'澶嶅埗绠楁硶鎶ラ敊锛�')
this.$notify({
type: "error",
message: "绮樿创绠楁硶澶辫触锛�"
@@ -474,6 +610,47 @@
};
</script>
<style lang="scss">
+.el-message--info .el-message__content {
+ color: #999 !important;
+}
+.swiper-container {
+ margin-left: auto;
+ margin-right: auto;
+ position: relative;
+ overflow: hidden;
+ list-style: none;
+ padding: 0;
+ z-index: 1;
+}
+.swiper-local-prev,
+.swiper-local-next {
+ width: 40px;
+ height: 40px;
+ position: absolute;
+ background: #8888;
+ top: 40%;
+ z-index: 99;
+ border-radius: 4em;
+ outline: none;
+ .icon-btn {
+ color: rgb(255, 255, 255);
+ text-align: center;
+ line-height: 38px;
+ cursor: pointer;
+ }
+}
+.swiper-local-prev {
+ left: 10px;
+}
+.swiper-local-prev:hover {
+ background: #666;
+}
+.swiper-local-next {
+ left: 90%;
+}
+.swiper-local-next:hover {
+ background: #666;
+}
.s-separate-rules {
width: 100%;
padding: 13px 0 20px;
@@ -482,42 +659,42 @@
// height: 38px;
// position: absolute;
// left: -38px;
- height:40px;
+ height: 40px;
.check-area {
width: 100%;
height: 100%;
padding: 0 20px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
- .ai-select{
+ .ai-select {
text-align: left;
line-height: 30px;
height: 30px;
- .flex-box{
- .label{
- &+label,&+div{
+ .flex-box {
+ .label {
+ & + label,
+ & + div {
margin-left: 10px;
line-height: 1;
}
-
}
}
}
- .ai-select>div{
+ .ai-select > div {
display: inline-block;
vertical-align: middle;
margin-right: 30px;
-
- .channel{
+
+ .channel {
display: inline-block;
vertical-align: middle;
}
}
}
}
- .devide{
+ .devide {
height: 10px;
- background: #E9EBF2;
+ background: #e9ebf2;
}
.top {
width: 100%;
@@ -526,16 +703,14 @@
.swiper-box {
height: 100%;
float: left;
- width: 48%;
+ width: 46%;
margin-top: -10px;
position: relative;
}
.swiper-container {
position: initial;
min-width: 472px;
- width: 80%;
-
- // height: 124px;
+ width: 86%;
}
.swiper-slide {
position: relative;
@@ -574,10 +749,6 @@
backdrop-filter: blur(1px) brightness(100%);
display: none;
}
-
- // @media screen and(max-width: 1280px) {
- // max-width: 110px;
- // }
@media screen and(max-width: 1440px) {
max-width: 110px;
}
@@ -617,10 +788,20 @@
.swiper-next-border:hover {
background: #666;
}
+
.top-right {
float: right;
- width: 52%;
+ width: 54%;
height: 144px;
+ .card-box {
+ width: 54% !important;
+ }
+ .eCharts-box {
+ width: 45%;
+ canvas {
+ width: 98% !important;
+ }
+ }
}
.task-css {
text-align: left;
@@ -789,13 +970,6 @@
color: #3d68e1;
margin-left: 10px;
font-size: 14px;
- }
- .task-tip {
- font-family: PingFangSC-Regular;
- font-size: 12px;
- color: #cccccc;
- margin-top: 10%;
- margin-left: 38%;
}
.marker {
--
Gitblit v1.8.0