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 | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/pages/cameraAccess/components/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
index 2fe8c47..a5f879e 100644
--- a/src/pages/cameraAccess/components/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -69,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>
@@ -86,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;"
@@ -235,6 +235,7 @@
time_rule_id: "",
};
this.$refs.sceneEditor.cleanRule();
+ this.$refs.sceneEditor.getSdkConnection();
},
handleCreate() {
@@ -346,6 +347,7 @@
this.onSaveScene(this.sceneForm);
},
handleDelScene(groupRule) {
+ let _this = this;
this.$confirm("鎻愮ず锛氬垹闄ゅ悗锛岃鏉¤鍒欏皢澶辨晥锛屾槸鍚﹀垹闄わ紵", {
center: true,
cancelButtonClass: "comfirm-class-cancle",
@@ -359,7 +361,7 @@
type: "success",
message: "鍒犻櫎鎴愬姛"
});
-
+ _this.$root.$children[0].$children[0].querySearchAsync('camera')
} else {
this.$notify({
type: "error",
@@ -439,6 +441,9 @@
}
.cell {
padding-left: 0 !important;
+ i{
+ outline: none!important;
+ }
}
}
}
--
Gitblit v1.8.0