From d6bf6c38fe15510aac8e56569ca0450fb8656c89 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 30 七月 2020 18:55:09 +0800
Subject: [PATCH] 调整摄像机接入页面
---
src/pages/cameraAccess/components/SeparateRules.vue | 65 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/src/components/camera/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
similarity index 95%
rename from src/components/camera/SeparateRules.vue
rename to src/pages/cameraAccess/components/SeparateRules.vue
index 1099aaf..b4e507c 100644
--- a/src/components/camera/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -120,7 +120,7 @@
/>
</div>
</div>
-
+
<!-- <swiper :options="swiperOption" class="swiper-box-container">
<swiper-slide v-for="(item, index) in 10" :key="index">
@@ -140,7 +140,7 @@
<div class="icon-btn" slot="button-next">
<i class="iconfont iconyou1"></i>
</div>
- </div> -->
+ </div>-->
<!-- <swiper :options="swiperOption" class="swiper-box-container">
<span class="task-tip" v-show="Camera.rules.length == 0 ">鏆傛棤鍦烘櫙,璇峰紑濮嬪垱寤�</span>
<swiper-slide v-for="(item, index) in Camera.rules" :key="index">
@@ -160,10 +160,9 @@
<div class="icon-btn" slot="button-next">
<i class="iconfont iconyou1"></i>
</div>
- </div> -->
+ </div>-->
<!-- 绯荤粺淇℃伅 -->
-
</div>
<div class="bottom" style="top:254px;">
@@ -217,7 +216,6 @@
>
<p style="text-align:left;padding: 10px;box-sizing: border-box">
<b style="font-size: 14px">鏃堕棿娈�</b>
-
</p>
<time-slider ref="timeSlider" :type="'sep'" />
</div>
@@ -257,7 +255,8 @@
import polygonCanvas from "@/components/canvas";
import Sysinfo from "./SystemInfo";
import SceneRule from "./SceneRule";
-import SlideScene from "../scene/SlideScene";
+import SlideScene from "./scene/SlideScene";
+
export default {
components: {
TimeSlider,
@@ -308,36 +307,36 @@
canvasHeight: 324
};
},
- mounted(){
+ mounted() {
this.mockAsync()
},
methods: {
- mockAsync(){
- setTimeout(()=>{
+ 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)
+ { 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() {
this.$refs.canvas.showModal();
@@ -559,7 +558,7 @@
position: initial;
min-width: 472px;
width: 80%;
-
+
// height: 124px;
}
.swiper-slide {
@@ -854,7 +853,7 @@
}
}
.el-loading-spinner {
- background: url("../../assets/gif/loading.gif") no-repeat;
+ background: url("../../../assets/gif/loading.gif") no-repeat;
top: 50%;
margin-top: -21px;
width: calc(100% - 260px) !important;
--
Gitblit v1.8.0