From 56f7ab1f14f2de2ceff75db982b8acca1d80ca46 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 03 十一月 2020 15:59:18 +0800
Subject: [PATCH] 新增vuedraggable package,算力管理摄像机ip排序方法重定义,比对库/数据栈列表size调试
---
src/pages/cameraAccess/components/SceneRule.vue | 105 +++++++++-------------------------------------------
1 files changed, 18 insertions(+), 87 deletions(-)
diff --git a/src/pages/cameraAccess/components/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
index 13fcb07..a5f879e 100644
--- a/src/pages/cameraAccess/components/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -6,7 +6,7 @@
type="primary"
size="mini"
@click="handleCreate"
- style="margin-left:87%"
+ style="margin-left:90%"
v-show="!editScene"
>+ 娣诲姞鍦烘櫙</el-button>
</div>
@@ -48,74 +48,7 @@
</el-form-item>
</div>
</div>
- <!-- <el-row>
- <el-col :span="8">-->
- <!-- <el-form-item label="鍦烘櫙妯℃澘">
- <el-select
- v-model="sceneForm.template_id"
- placeholder="璇烽�夋嫨"
- @change="selectTemplate"
- size="mini"
- style="width:200px"
- >
- <el-option
- v-for="item in sceneTemplates"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- ></el-option>
- </el-select>
- </el-form-item>-->
- <!-- </el-col>
- <el-col :span="8">
- <el-form-item label="鏃堕棿娈�">
- <el-select
- v-model="sceneForm.time_rule_id"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width:200px"
- >
- <el-option
- v-for="item in VideoManageData.TimeRules"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>-->
- <!-- <el-row>
- <el-col :span="8">
- <el-form-item label="鍦烘櫙鍚嶇О">
- <el-input v-model="sceneForm.scene_name" size="mini" style="width:200px"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鍦烘櫙鎻忚堪">
- <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-col :span="8">
- <el-form-item label="浜嬩欢绛夌骇">
- <el-select
- v-model="sceneForm.alarm_level"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width:200px"
- >
- <el-option label="涓�绾�" :value="1"></el-option>
- <el-option label="浜岀骇" :value="2"></el-option>
- <el-option label="涓夌骇" :value="3"></el-option>
- <el-option label="鍥涚骇" :value="4"></el-option>
- <el-option label="浜旂骇" :value="5"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>-->
-
+
<scene-editor
ref="sceneEditor"
:isLinkRule="linkRule"
@@ -136,15 +69,15 @@
<el-table
:data="tableRuleList"
border
- style="width: 100%"
+ style="width:100%"
:cell-style="cellStyle"
:header-cell-style="{background:'#f8f8f8',color:'#222222'}"
>
- <el-table-column label="搴忓彿" type="index" align="center" width="50"></el-table-column>
+ <el-table-column label="搴忓彿" type="index" align="center" ></el-table-column>
<el-table-column
label="鍦烘櫙鍚嶇О"
prop="scene_name"
- width="120"
+
align="center"
show-overflow-tooltip
></el-table-column>
@@ -153,28 +86,28 @@
<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" ></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">
<el-switch v-model="scope.row.defence_state" @change="updateDefence(scope.row)"></el-switch>
</template>
</el-table-column>-->
- <el-table-column label="浜嬩欢绛夌骇" align="center" width="120">
+ <el-table-column label="浜嬩欢绛夌骇" align="center" >
<template slot-scope="scope">
<span>{{scope.row.alarm_level | alarmLevel }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" fixed="right" align="center" width="100">
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" >
<template slot-scope="scope">
- <el-tooltip content="缂栬緫" placement="top" popper-class="atooltip">
+ <el-tooltip content="缂栬緫" :hide-after="700" placement="top" popper-class="atooltip">
<i
class="iconfont iconbianji1 btn-icon"
style="font-size: 28px;"
@click="handleEdit(scope.row)"
></i>
</el-tooltip>
- <el-tooltip content="鍒犻櫎" placement="top" popper-class="atooltipgroup_">
+ <el-tooltip content="鍒犻櫎" :hide-after="700" placement="top" popper-class="atooltipgroup_">
<i
class="iconfont iconshanchu4 btn-icon"
style="font-size: 28px; color:red;"
@@ -191,7 +124,6 @@
<script>
import {
- getAllTemplate,
saveCameraScene,
getCameraSceneRule,
deleteCameraScene
@@ -249,7 +181,7 @@
},
mounted() {
// window.addEventListener('resize', this.windowSizeChange)
- this.updateTemplates();
+
},
data() {
return {
@@ -303,6 +235,7 @@
time_rule_id: "",
};
this.$refs.sceneEditor.cleanRule();
+ this.$refs.sceneEditor.getSdkConnection();
},
handleCreate() {
@@ -362,13 +295,7 @@
this.$refs.sceneEditor.editHandle(this.templateRules);
},
- updateTemplates() {
- getAllTemplate().then(rsp => {
- if (rsp && rsp.success) {
- this.sceneTemplates = rsp.data;
- }
- })
- },
+
selectTemplate() {
let selectedTpl = {};
this.sceneTemplates.forEach((t) => {
@@ -420,6 +347,7 @@
this.onSaveScene(this.sceneForm);
},
handleDelScene(groupRule) {
+ let _this = this;
this.$confirm("鎻愮ず锛氬垹闄ゅ悗锛岃鏉¤鍒欏皢澶辨晥锛屾槸鍚﹀垹闄わ紵", {
center: true,
cancelButtonClass: "comfirm-class-cancle",
@@ -433,7 +361,7 @@
type: "success",
message: "鍒犻櫎鎴愬姛"
});
-
+ _this.$root.$children[0].$children[0].querySearchAsync('camera')
} else {
this.$notify({
type: "error",
@@ -513,6 +441,9 @@
}
.cell {
padding-left: 0 !important;
+ i{
+ outline: none!important;
+ }
}
}
}
--
Gitblit v1.8.0