From 1b1c8b0f2ccefae2c6a347044b202a24b036567f Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 02 九月 2020 16:01:11 +0800
Subject: [PATCH] 区域管理id去重校验,表格固定高度
---
vue.config.js | 4 ++--
src/pages/desktop/index/components/DFrame.vue | 2 +-
src/components/LeftNav.vue | 2 +-
src/pages/areaManage/index/App.vue | 17 ++++++++++++++---
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index 0c72515..cf99eea 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -148,7 +148,7 @@
<div class="local-vedio-area">
<!-- 鎼滅储 -->
<div class="search-input">
- <span style="display: inline-block;padding: 0px 3px;"></span>
+ <!-- <span style="display: inline-block;padding: 0px 3px;"></span> -->
<el-select
v-model="DataStackPool.searchType"
placeholder="璇烽�夋嫨"
diff --git a/src/pages/areaManage/index/App.vue b/src/pages/areaManage/index/App.vue
index 566ac72..ff52c59 100644
--- a/src/pages/areaManage/index/App.vue
+++ b/src/pages/areaManage/index/App.vue
@@ -1,9 +1,9 @@
<template>
- <div>
+ <div class="areas">
<div class="top-operation">
<el-button type="primary" size="small" @click="createArea">鏂板鍖哄煙</el-button>
</div>
- <el-table :data="groups" border>
+ <el-table :data="groups" border height="calc(100% - 100px)">
<el-table-column type="index" width="50" label="搴忓彿" align="center"></el-table-column>
<el-table-column prop="name" label="鍖哄煙鍚嶇О" align="center" sortable></el-table-column>
<el-table-column prop="id" label="鍖哄煙ID" align="center" sortable></el-table-column>
@@ -192,7 +192,14 @@
return;
}
-
+ let sameOne = this.groups.findIndex(item => item.id == this.areaForm.id);
+ if(sameOne>=0){
+ this.$notify({
+ type: 'error',
+ message: '鍖哄煙ID涓嶈兘閲嶅'
+ });
+ return;
+ }
let tempArr = [];
let tempIdArr = [];
this.areaForm.camPolygons = [];
@@ -249,6 +256,10 @@
.red {
color: rgb(255, 94, 0);
}
+.areas{
+ width: 100%;
+ height: calc(100% - 60px);
+}
.top-operation {
padding: 30px 30px 20px;
display: flex;
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index b4f33a0..a2b3021 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -163,7 +163,7 @@
return false;
//}
//鎵惧埌褰撳墠鐨刬frame
- let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
+ //let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
//淇濆瓨褰撳墠搴旂敤蹇収
// html2canvas(curIframe.contentWindow.document.body, {
// dpi: window.devicePixelRatio * 4,
diff --git a/vue.config.js b/vue.config.js
index 5bb12ea..8450c82 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -50,8 +50,8 @@
},
"/api-v": {
//target: 'http://192.168.20.145:8000',
- //target: 'http://192.168.5.22:30102',
- target: 'http://192.168.20.10:8000',
+ target: 'http://192.168.5.22:30102',
+ //target: 'http://192.168.20.10:8000',
changeOrigin: true
},
"/api-f": {
--
Gitblit v1.8.0