From b23a2a35a14b010a3b97a1b61a02ec179dfab924 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 04 九月 2020 17:25:14 +0800
Subject: [PATCH] feat: sort camera tree
---
src/pages/cameraAccess/components/CameraInfo.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index 0ea6d6b..83ef28a 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"
@@ -37,7 +37,7 @@
</el-col>
<el-col :span="9" :offset="1">
<el-form-item label="璁惧鍦板潃" style="width:100%" prop="addr">
- <el-input v-model="form.addr" placeholder="璇疯緭鍏ュ湴鍧�鎻忚堪" :disabled="!form.rtsp" size="small"></el-input>
+ <el-input v-model="form.addr" placeholder="璇疯緭鍏ュ湴鍧�鎻忚堪" :disabled="isDisabled" size="small"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -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>
<!-- 绯荤粺杩愯淇℃伅 -->
@@ -225,7 +225,7 @@
cameraType: 0,
resolution: "",
voiceId: "",
- voiceEnable: true
+ voiceEnable: false
},
// 璁板綍娣诲姞鐘舵��
isAdd: false,
@@ -313,7 +313,6 @@
}
},
selectCamera(node) {
- debugger
this.isAdd = false;
this.videoItem = null;
this.$refs.addForm.resetFields();
@@ -501,7 +500,7 @@
password: "",
resolution: "",
voiceId: "",
- voiceEnable: true
+ voiceEnable: false
};
},
// 娣诲姞璁惧
@@ -607,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