From ddb0df2153bc75e54c3f7c1049be663d4d2dba96 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 15 八月 2020 19:10:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai
---
src/pages/cameraAccess/components/CameraInfo.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index 35546d2..da5c685 100644
--- a/src/pages/cameraAccess/components/CameraInfo.vue
+++ b/src/pages/cameraAccess/components/CameraInfo.vue
@@ -9,7 +9,7 @@
</el-col>
<el-col :span="9" :offset="1">
<el-form-item label="鍧愭爣" style="width:100%;">
- <label slot="label"> 鍧愭爣</label>
+ <label slot="label">鍧愭爣</label>
<el-col :span="11">
<el-input
v-model="form.latitude"
@@ -59,7 +59,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="9" :offset="1" style="padding-left: 11px;">
+ <el-col :span="9" :offset="1" >
<el-form-item label="浜嬩欢澹伴煶">
<div class="flex-wrap" style="margin-left:-10px">
<el-switch v-model="form.voiceEnable" active-color="#409eff" :width="50"></el-switch>
@@ -125,7 +125,7 @@
<el-button size="small" type="primary" @click="cameraConnet" :disabled="conDisabled">杩炴帴娴嬭瘯</el-button>
</el-col>
</el-row>
- <el-row style="padding-top: 15px">
+ <el-row style="padding: 15px 0">
<el-col :span="12">
<camera-player
:cameraName="videoItem.name"
@@ -135,7 +135,7 @@
:isRunning="false"
v-if="videoItem !== '' && videoItem !== undefined && videoItem !== null && visibilityState"
></camera-player>
- <video v-else poster="../../../assets/baseimg_cameara.png" preload="none"></video>
+ <video v-else poster="/images/cameraAccess/video-poster.png" preload="none"></video>
</el-col>
<!-- 绯荤粺杩愯淇℃伅 -->
@@ -606,9 +606,9 @@
<style lang="scss">
.camera-info {
width: 100%;
- height: 100%;
- margin-left: 20px;
- overflow: auto;
+
+ margin: 20px 0 20px 20px;
+
.ai-select {
text-align: left;
}
--
Gitblit v1.8.0