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/SceneRule.vue | 135 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 68 deletions(-)
diff --git a/src/components/camera/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
similarity index 84%
rename from src/components/camera/SceneRule.vue
rename to src/pages/cameraAccess/components/SceneRule.vue
index 5628197..13fcb07 100644
--- a/src/components/camera/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -2,16 +2,22 @@
<div class="scene-edit-container">
<div class="scene-title">
<b style="font-size: 14px; line-height: 18px;">鍦烘櫙</b>
- <el-button type="primary" size="mini" @click="handleCreate" style="margin-left:87%" v-show='!editScene'>+ 娣诲姞鍦烘櫙</el-button>
+ <el-button
+ type="primary"
+ size="mini"
+ @click="handleCreate"
+ style="margin-left:87%"
+ v-show="!editScene"
+ >+ 娣诲姞鍦烘櫙</el-button>
</div>
- <el-form ref="form" label-width="80px" v-show="editScene">
+ <el-form ref="form" label-width="80px" v-show="editScene">
<div class="flex-form">
<div class="left">
<el-form-item label="鍦烘櫙鍚嶇О">
<el-input v-model="sceneForm.scene_name" size="mini" maxlength="15"></el-input>
</el-form-item>
- <el-form-item label="浜嬩欢绛夌骇" >
+ <el-form-item label="浜嬩欢绛夌骇">
<el-select
v-model="sceneForm.alarm_level"
placeholder="璇烽�夋嫨"
@@ -26,12 +32,7 @@
</el-select>
</el-form-item>
<el-form-item label="鏃堕棿娈�">
- <el-select
- v-model="sceneForm.time_rule_id"
- placeholder="璇烽�夋嫨"
- size="mini"
-
- >
+ <el-select v-model="sceneForm.time_rule_id" placeholder="璇烽�夋嫨" size="mini">
<el-option
v-for="item in VideoManageData.TimeRules"
:key="item.id"
@@ -48,8 +49,8 @@
</div>
</div>
<!-- <el-row>
- <el-col :span="8"> -->
- <!-- <el-form-item label="鍦烘櫙妯℃澘">
+ <el-col :span="8">-->
+ <!-- <el-form-item label="鍦烘櫙妯℃澘">
<el-select
v-model="sceneForm.template_id"
placeholder="璇烽�夋嫨"
@@ -64,8 +65,8 @@
:value="item.id"
></el-option>
</el-select>
- </el-form-item> -->
- <!-- </el-col>
+ </el-form-item>-->
+ <!-- </el-col>
<el-col :span="8">
<el-form-item label="鏃堕棿娈�">
<el-select
@@ -83,7 +84,7 @@
</el-select>
</el-form-item>
</el-col>
- </el-row> -->
+ </el-row>-->
<!-- <el-row>
<el-col :span="8">
<el-form-item label="鍦烘櫙鍚嶇О">
@@ -95,7 +96,7 @@
<el-input v-model="sceneForm.desc" type="textarea" size="mini" style="width:200px;height:180px;"></el-input>
</el-form-item>
</el-col>
- </el-row> -->
+ </el-row>-->
<!-- <el-row>
<el-col :span="8">
<el-form-item label="浜嬩欢绛夌骇">
@@ -113,7 +114,7 @@
</el-select>
</el-form-item>
</el-col>
- </el-row> -->
+ </el-row>-->
<scene-editor
ref="sceneEditor"
@@ -147,14 +148,12 @@
align="center"
show-overflow-tooltip
></el-table-column>
- <el-table-column label="绛栫暐" prop="group_text" align="center" min-width="350px" >
+ <el-table-column label="绛栫暐" prop="group_text" align="center" min-width="350px">
<template slot-scope="scope">
<span v-html="scope.row.group_text"></span>
</template>
</el-table-column>
- <el-table-column label="鏃堕棿娈�" prop="time_name" align="center" width="100">
-
- </el-table-column>
+ <el-table-column label="鏃堕棿娈�" prop="time_name" align="center" width="100"></el-table-column>
<el-table-column label="鎻忚堪" prop="desc" align="center" min-width="150"></el-table-column>
<!-- <el-table-column label="鐘舵��" align="center" width="90">
<template slot-scope="scope">
@@ -198,7 +197,7 @@
deleteCameraScene
} from '@/api/scene'
import RuleEditor from "@/components/subComponents/RuleEditor";
-import SceneEditor from "@/components/scene/Editor";
+import SceneEditor from "./scene/Editor";
export default {
name: "SceneRuleEditor",
@@ -271,22 +270,22 @@
}
},
methods: {
- bubbleSort(arr){
- for(var i = arr.length-1;i > 0 ; i--){
- for(var j = 0; j < i; j++){
- if(arr[j]>arr[j+1]){
- let temp = arr[j];
- arr[j]= arr[j+1];
- arr[j+1] = temp
- }
+ bubbleSort(arr) {
+ for (var i = arr.length - 1; i > 0; i--) {
+ for (var j = 0; j < i; j++) {
+ if (arr[j] > arr[j + 1]) {
+ let temp = arr[j];
+ arr[j] = arr[j + 1];
+ arr[j + 1] = temp
}
+ }
}
return arr;
},
- getSceneName(sdk_name){
+ getSceneName(sdk_name) {
this.sceneNameStore.push(sdk_name)
- if(!this.sceneForm.scene_name.trim()){
+ if (!this.sceneForm.scene_name.trim()) {
this.sceneForm.scene_name = sdk_name
}
// }else if(this.sceneForm.scene_name == store[store.length-2]){
@@ -306,21 +305,21 @@
this.$refs.sceneEditor.cleanRule();
},
handleCreate() {
- debugger
- console.log(this.DataStackPool.selectedDir.id,this.TreeDataPool.treeActiveName=='dataStack')
+
+ console.log(this.DataStackPool.selectedDir.id, this.TreeDataPool.treeActiveName == 'dataStack')
if (this.linkRule && this.TreeDataPool.selectedNodes.length < 2) {
this.$notify({
type: "warning",
message: "璇烽�夋嫨鑷冲皯2涓憚鍍忔満!"
});
return false;
- }else if(!this.linkRule && this.TreeDataPool.treeActiveName != 'dataStack' && this.TreeDataPool.selectedNodes.length < 1){
+ } else if (!this.linkRule && this.TreeDataPool.treeActiveName != 'dataStack' && this.TreeDataPool.selectedNodes.length < 1) {
this.$notify({
type: "warning",
message: `璇烽�夋嫨1涓憚鍍忔満!`
});
return false;
- }else if(this.TreeDataPool.treeActiveName=='dataStack' && !this.DataStackPool.selectedDir.id){
+ } else if (this.TreeDataPool.treeActiveName == 'dataStack' && !this.DataStackPool.selectedDir.id) {
this.$notify({
type: "warning",
message: `璇峰厛閫夋嫨鏁版嵁鏍堟枃浠跺す!`
@@ -330,25 +329,25 @@
this.editScene = true;
this.cleanForm();
console.log(this.tableRuleList)
-
+
//鍒濆鍖栧満鏅悕绉�
var pattern = /^鍦烘櫙\s*\d+\s*$/;
var tempArr = [];
- this.tableRuleList.forEach(scene=>{
- debugger
- if(pattern.test(scene.scene_name)){
+ this.tableRuleList.forEach(scene => {
+
+ if (pattern.test(scene.scene_name)) {
tempArr.push(Number(scene.scene_name.substring(2).trim()));
}
});
- let latest = tempArr.length>0? this.bubbleSort(tempArr)[tempArr.length-1]+1 : 1;
-
- this.sceneForm.scene_name = '鍦烘櫙'+latest;
+ let latest = tempArr.length > 0 ? this.bubbleSort(tempArr)[tempArr.length - 1] + 1 : 1;
+
+ this.sceneForm.scene_name = '鍦烘櫙' + latest;
//鍒濆鍖栨椂闂存
this.sceneForm.time_rule_id = this.VideoManageData.TimeRules[0].id;
-
+
},
handleEdit(scene) {
- debugger
+
this.sceneForm = scene;
this.editScene = true;
let selectedTpl = {};
@@ -358,10 +357,10 @@
}
})
this.templateSdks = selectedTpl.sdks;
- debugger
+
this.templateRules = JSON.stringify(scene.rules);
this.$refs.sceneEditor.editHandle(this.templateRules);
-
+
},
updateTemplates() {
getAllTemplate().then(rsp => {
@@ -386,21 +385,21 @@
this.templateSdks = selectedTpl.sdks;
this.templateRules = selectedTpl.rules;
},
- validateForm(){
- debugger
- if(!this.sceneForm.scene_name.trim()){
+ validateForm() {
+
+ if (!this.sceneForm.scene_name.trim()) {
this.$notify({
type: 'warning',
message: '鍦烘櫙鍚嶄笉鑳戒负绌�'
});
return false
- }else if(!this.sceneForm.alarm_level){
+ } else if (!this.sceneForm.alarm_level) {
this.$notify({
type: 'warning',
message: '浜嬩欢绛夌骇涓嶈兘涓虹┖'
});
return false
- }else if(!this.sceneForm.time_rule_id){
+ } else if (!this.sceneForm.time_rule_id) {
this.$notify({
type: 'warning',
message: '鏃堕棿娈典笉鑳戒负绌�'
@@ -410,8 +409,8 @@
return true
},
saveSceneRule() {
- debugger
- if(!this.validateForm()){
+
+ if (!this.validateForm()) {
return
}
let editorResp = this.$refs.sceneEditor.submitRule();
@@ -445,8 +444,8 @@
})
.catch(() => { });
},
- cellStyle(obj){
- if(obj.column.label=='绛栫暐'){
+ cellStyle(obj) {
+ if (obj.column.label == '绛栫暐') {
return 'text-align:left;padding-left:8px;'
}
}
@@ -460,32 +459,33 @@
height: 30px;
text-align: left;
margin: 10px 0px;
-
}
- .flex-form{
+ .flex-form {
display: flex;
width: 80%;
padding-left: 25px;
- .left,.right{
+ .left,
+ .right {
width: 43.3%;
min-width: 550px;
- .el-form-item{
+ .el-form-item {
margin-bottom: 16px;
}
- .el-form-item__label{
+ .el-form-item__label {
text-align: left;
}
- .el-form-item__content{
+ .el-form-item__content {
text-align: left;
- .el-input,.el-select{
+ .el-input,
+ .el-select {
width: 400px !important;
}
}
- textarea{
+ textarea {
height: 143px;
}
}
- .right{
+ .right {
padding-top: 6px;
}
}
@@ -495,9 +495,8 @@
padding: 0px;
box-sizing: border-box;
}
- .el-form-item{
+ .el-form-item {
width: calc(100% - 30px);
-
}
.el-input__inner {
border: 0px !important;
@@ -512,8 +511,8 @@
span {
cursor: pointer;
}
- .cell{
- padding-left: 0!important;
+ .cell {
+ padding-left: 0 !important;
}
}
}
--
Gitblit v1.8.0