From 734f88378528ccfa6683ad1e9cd706a7b293fb3c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 13 八月 2020 16:15:53 +0800
Subject: [PATCH] fix: rounding the compare sorce to keep only two decimals
---
src/pages/cameraAccess/components/SeparateRules.vue | 298 ++++++++++++++++++++++++++---------------------------------
1 files changed, 131 insertions(+), 167 deletions(-)
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index c6aa3f2..a92430e 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -2,173 +2,118 @@
<div class="s-separate-rules">
<div class="ai">
<div class="check-area">
- <el-row class="mt5">
- <el-col :span="24">
- <div class="ai-select">
- <div style="float:left;" v-show="cameraType === 'camera'">
- <span>
- <span class="label">瑙嗛鍒嗘瀽澶勭悊</span>
- <el-switch
- style="margin-left: 10px;"
- v-model="Camera.analytics"
- @change="pollEnable"
- :disabled="!Camera.cameraId"
- ></el-switch>
- </span>
- </div>
+ <div class="ai-select">
+ <div v-show="cameraType === 'camera'">
+ <span>
+ <span class="label">瑙嗛鍒嗘瀽澶勭悊</span>
+ <el-switch
+ style="margin-left: 10px;"
+ v-model="Camera.analytics"
+ @change="pollEnable"
+ :disabled="!Camera.cameraId"
+ ></el-switch>
+ </span>
+ </div>
- <div
- v-if="Camera.analytics"
- style="float:left;margin-left: 5%;"
- class="flex-box"
- v-show="cameraType === 'camera'"
+ <div
+ v-if="Camera.analytics"
+ class="flex-box"
+ v-show="cameraType === 'camera'"
+ >
+ <span class="label" >澶勭悊鏂瑰紡</span>
+ <toggle-button
+ :value="Camera.dealWay"
+ :width="60"
+ :labels="{checked: '瀹炴椂', unchecked: '杞'}"
+ :color="{checked: '#3D68E1', unchecked: '#FF7733', disabled: '#CCCCCC'}"
+ :sync="true"
+ @change="changePoll"
+ />
+ </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>
+
+ <div v-if="Camera.analytics" class="flex-box">
+ <span class="label" >鏅鸿兘璁＄畻鑺傜偣: {{ Camera.runServerName}}</span>
+ </div>
+
+ <div
+ v-if="Camera.analytics"
+ class="flex-box"
+ >
+ <span class="label">绠楁硶蹇�熼�氶亾</span>
+ <div class="channel flex-box" >
+ <el-tooltip
+ effect="dark"
+ content="澶嶅埗姝ゆ憚鍍忔満绠楁硶瑙勫垯"
+ placement="bottom"
+ popper-class="atooltip"
>
- <span class="label" style="margin-right:10px;line-height: 22px;">澶勭悊鏂瑰紡</span>
- <toggle-button
- :value="Camera.dealWay"
- :width="60"
- :labels="{checked: '瀹炴椂', unchecked: '杞'}"
- :color="{checked: '#3D68E1', unchecked: '#FF7733', disabled: '#CCCCCC'}"
- :sync="true"
- @change="changePoll"
- />
- </div>
-
- <div
- v-if="Camera.analytics"
- style="float:left;margin-left:5%;"
- class="flex-box"
- v-show="cameraType === 'camera'"
+ <span
+ style="color:#3D68E1;cursor: pointer;font-size:23px;"
+ @click="ctrlC"
+ class="iconfont iconfuzhiguize"
+ ></span>
+ </el-tooltip>
+ <el-tooltip
+ effect="dark"
+ :content="!TreeDataPool.ctrlCameraId?'绮樿创绠楁硶瑙勫垯':`绮樿创绠楁硶瑙勫垯锛屾潵婧愶細${TreeDataPool.ctrlCameraName}`"
+ placement="bottom"
+ popper-class="atooltip"
>
- <span class="label" style="line-height:25px">鍒嗚鲸鐜�</span>
- <el-select
- v-model="Camera.selectResolution"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 134px;height: 30px;
- margin-left:10px;position: relative;bottom: 3px;"
- >
- <el-option
- v-for="item in Camera.resolutionOption"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- </div>
-
- <div v-if="Camera.analytics" style="float:left;margin-left:5%;" class="flex-box">
- <span class="label" style="line-height:22px">鏅鸿兘璁＄畻鑺傜偣: {{ Camera.runServerName}}</span>
- </div>
-
- <div
- v-if="Camera.analytics"
- style="float:left;margin-left: 5%;line-height: 22px;"
- class="flex-box"
- >
- <span style="float:left;">绠楁硶蹇�熼�氶亾</span>
- <div class="flex-box" style="float: left;
- margin-left: 5px;">
- <el-tooltip
- effect="dark"
- content="澶嶅埗姝ゆ憚鍍忔満绠楁硶瑙勫垯"
- placement="bottom"
- popper-class="atooltip"
- >
- <span
- style="color:#3D68E1;cursor: pointer;font-size:23px;"
- @click="ctrlC"
- class="iconfont iconfuzhiguize"
- ></span>
- </el-tooltip>
- <el-tooltip
- effect="dark"
- :content="!TreeDataPool.ctrlCameraId?'绮樿创绠楁硶瑙勫垯':`绮樿创绠楁硶瑙勫垯锛屾潵婧愶細${TreeDataPool.ctrlCameraName}`"
- placement="bottom"
- popper-class="atooltip"
- >
- <span
- :style="!TreeDataPool.ctrlCameraId?'cursor: not-allowed;font-size:23px;':'color:#3D68E1;font-size:23px;cursor: pointer;'"
- @click="ctrlV"
- class="iconfont iconniantie ml5"
- ></span>
- </el-tooltip>
- </div>
- </div>
+ <span
+ :style="!TreeDataPool.ctrlCameraId?'cursor: not-allowed;font-size:23px;':'color:#3D68E1;font-size:23px;cursor: pointer;'"
+ @click="ctrlV"
+ class="iconfont iconniantie ml5"
+ ></span>
+ </el-tooltip>
</div>
- </el-col>
- </el-row>
+ </div>
+ </div>
</div>
</div>
- <div
- style="width: calc(100% + 76px);position: absolute;left: -38px;top:38px;height: 10px;background-color: #E9EBF2;"
- ></div>
+ <div class="devide"></div>
- <div class="top" style="top:60px;">
+ <div class="top" >
<p class="task-css">
<b style="font-size: 14px; line-height: 18px;">鍦烘櫙</b>
</p>
- <div>
+ <div class="clearfix">
<slide-scene :sceneData="Camera.rules"></slide-scene>
<div class="top-right">
<sysinfo
:showRealPoll="cameraType === 'camera'"
:ShowLocalVedio="cameraType === 'dataStack'"
v-if="showSysInfo"
- style="margin-left: 25px;margin-top:-10px"
+ style="margin-left: 10px;margin-top:-10px"
/>
</div>
</div>
-
- <!-- <swiper :options="swiperOption" class="swiper-box-container">
-
- <swiper-slide v-for="(item, index) in 10" :key="index">
- <div class="item-card">
- <p style="color: #0066EB;padding-top: 20px;">
- <b>{{ item }}</b>
- </p>
- </div>
- </swiper-slide>
- </swiper>
- <div class="swiper-pre-border" >
- <div class="icon-btn" slot="button-prev">
- <i class="iconfont iconzuo"></i>
- </div>
- </div>
- <div class="swiper-next-border" >
- <div class="icon-btn" slot="button-next">
- <i class="iconfont iconyou1"></i>
- </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">
- <div class="item-card">
- <p style="color: #0066EB;padding-top: 20px;">
- <b>{{ item.scene_name }}</b>
- </p>
- </div>
- </swiper-slide>
- </swiper>
- <div class="swiper-pre-border" v-show="Camera.rules.length > 4 ">
- <div class="icon-btn" slot="button-prev">
- <i class="iconfont iconzuo"></i>
- </div>
- </div>
- <div class="swiper-next-border" v-show="Camera.rules.length > 4 ">
- <div class="icon-btn" slot="button-next">
- <i class="iconfont iconyou1"></i>
- </div>
- </div>-->
-
- <!-- 绯荤粺淇℃伅 -->
</div>
- <div class="bottom" style="top:254px;">
- <div
- style="width: calc(100% + 100px);height: 10px;background-color: #E9EBF2;position:relative;left:-40px"
- ></div>
+ <div class="bottom" >
+ <div class="devide"></div>
<div class="bottom-right">
<div class="draw-and-time-box">
<div class="draw-box">
@@ -252,8 +197,8 @@
import TimeSlider from "./TimeSlider";
import polygonCanvas from "@/components/canvas";
-import Sysinfo from "./SystemInfo";
-
+//import Sysinfo from "./SystemInfo";
+import Sysinfo from "@/components/subComponents/SystemInfo";
import SceneRule from "./SceneRule";
import SlideScene from "./scene/SlideScene";
@@ -525,28 +470,53 @@
<style lang="scss">
.s-separate-rules {
width: 100%;
- height: 100%;
- position: relative;
+ padding: 13px 0 20px;
.ai {
- width: calc(100% + 76px);
- height: 38px;
- position: absolute;
- left: -38px;
+ //width: calc(100% + 76px);
+ // height: 38px;
+ // position: absolute;
+ // left: -38px;
+ height:40px;
.check-area {
width: 100%;
height: 100%;
- float: left;
- overflow: auto;
- padding: 0 38px;
+ padding: 0 20px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
+ .ai-select{
+ text-align: left;
+ line-height: 30px;
+ height: 30px;
+ .flex-box{
+ .label{
+ &+label,&+div{
+ margin-left: 10px;
+ line-height: 1;
+ }
+
+ }
+ }
+ }
+ .ai-select>div{
+ display: inline-block;
+ vertical-align: middle;
+ margin-right: 30px;
+
+ .channel{
+ display: inline-block;
+ vertical-align: middle;
+ }
+ }
}
+ }
+ .devide{
+ height: 10px;
+ background: #E9EBF2;
}
.top {
width: 100%;
- height: 174px;
- position: relative;
- top: 60px;
+ padding: 10px 20px;
+ box-sizing: border-box;
.swiper-box {
height: 100%;
float: left;
@@ -653,9 +623,7 @@
}
.bottom {
width: 100%;
- height: calc(100% - 234px);
- position: absolute;
- top: 234px;
+ margin-bottom: 15px;
.bottom-side {
height: 100%;
width: 250px;
@@ -681,11 +649,7 @@
}
}
.bottom-right {
- width: calc(100% + 30px);
- height: 100%;
- float: left;
- overflow: auto;
- padding: 10px 0px;
+ padding: 10px 20px;
box-sizing: border-box;
.draw-and-time-box {
height: 400px;
--
Gitblit v1.8.0