From c99cad106ef5be9f818e45d385dfdcec29ce19e5 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 03 十二月 2020 16:52:24 +0800
Subject: [PATCH] 修复绘制多边形撤销错误的bug
---
src/pages/library/components/personList.vue | 72 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index 4c72a70..697ca59 100644
--- a/src/pages/library/components/personList.vue
+++ b/src/pages/library/components/personList.vue
@@ -1,31 +1,13 @@
<template>
<div class="table-parent">
- <el-row class style="margin:20px">
- <!-- <el-col :span="4" class="tl">
- <b class="f14">{{this.baseObject.tableName}}</b>
- </el-col>
- <el-col :span="2">
- <b class="f14">{{this.baseObject.bwType === '1'?'榛戝悕鍗�':'鐧藉悕鍗�'}}</b>
- </el-col>
- <el-col :span="8">
- <b class="f14">鏈夋晥鏃堕棿锛歿{this.baseObject.startTime}}--{{this.baseObject.endTime?this.baseObject.endTime:'姘镐箙鏈夋晥'}}</b>
- </el-col>-->
- <div class="tl">
- <span
- class="f14"
- style="color:#000000;"
- >{{this.baseObject.tableName?this.baseObject.tableName + '/ ':''}}</span>
- <span
- class="f14"
- style="color:#000000;"
- >{{this.baseObject.bwType === '1'?'榛戝悕鍗�/ ':'鐧藉悕鍗�/ '}}</span>
- <span
- class="f14"
- style="color:#000000;"
- >鏈夋晥鏃堕棿锛歿{this.baseObject.startTime}}--{{this.baseObject.endTime?this.baseObject.endTime:'姘镐箙鏈夋晥'}}</span>
+ <el-row style="margin-top:20px">
+ <div class="base-tip">
+ <span>{{this.baseObject.tableName?this.baseObject.tableName + '/ ':''}}</span>
+ <span>{{this.baseObject.bwType === '1'?'榛戝悕鍗�/ ':'鐧藉悕鍗�/ '}}</span>
+ <span>鏈夋晥鏃堕棿锛歿{this.baseObject.startTime}}--{{this.baseObject.endTime?this.baseObject.endTime:'姘镐箙鏈夋晥'}}</span>
</div>
</el-row>
- <el-row class style="margin:40px 0 40px 20px">
+ <el-row class style="margin:40px 0 40px 0px">
<el-col :span="6">
<el-input
placeholder="濮撳悕/鎬у埆/韬唤璇佸彿/鎵嬫満鍙�"
@@ -42,13 +24,13 @@
<el-button size="small" type="primary" @click="handleSearch">鎼滅储</el-button>
</el-col>
<el-col :offset="11" :span="3">
- <fTemplate authority="videoTable:edit">
+ <fTemplate authority="library:set">
<el-button
size="small"
class="ml10"
type="danger"
@click="deleteBatch"
- v-if="isShow('videoTable:edit')"
+ v-if="isShow('library:set')"
>鎵归噺鍒犻櫎</el-button>
</fTemplate>
</el-col>
@@ -59,7 +41,7 @@
limitSize
uploadBtntext="涓婁紶鐓х墖"
uploadBtnIcon
- v-if="isShow('videoTable:edit')"
+ v-if="isShow('library:set')"
uploadBtnSize="small"
:isDrag="true"
@addFilesBaBackFN="changeDialog"
@@ -135,7 +117,7 @@
<el-switch
v-model="scope.row.enable"
:active-value="1"
- :disabled="!isShow('videoTable:edit')"
+ :disabled="!isShow('library:set')"
:inactive-value="0"
@change="enable(scope.row)"
></el-switch>
@@ -143,7 +125,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="200" align="center">
<template slot-scope="scope">
- <fTemplate authority="videoTable:edit">
+ <fTemplate authority="library:set">
<el-tooltip content="缂栬緫" placement="top" popper-class="atooltip">
<span
class="iconfont iconbianji iconStyle1"
@@ -158,7 +140,7 @@
<el-tooltip content="鏌ョ湅璇︽儏" placement="top" popper-class="atooltip">
<span class="iconfont iconsousuoren iconStyle1" @click="showDetail(scope.row)"></span>
</el-tooltip>
- <fTemplate authority="videoTable:edit">
+ <fTemplate authority="library:set">
<el-tooltip content="澶嶅埗" placement="top" popper-class="atooltip">
<span
class="iconfont iconfuzhi iconStyle1"
@@ -167,7 +149,7 @@
></span>
</el-tooltip>
</fTemplate>
- <fTemplate authority="videoTable:edit">
+ <fTemplate authority="library:set">
<el-tooltip content="绉诲姩" placement="top" popper-class="atooltip">
<span
class="iconfont iconyidongzhi iconStyle1"
@@ -177,7 +159,7 @@
></span>
</el-tooltip>
</fTemplate>
- <fTemplate authority="videoTable:edit">
+ <fTemplate authority="library:set">
<el-tooltip content="鍒犻櫎" placement="top" popper-class="atooltip">
<span
class="iconfont iconshanchu iconStyle1"
@@ -193,10 +175,13 @@
</div>
<div class="pt5" style="height:40px;position:relative">
<el-pagination
+ @size-change="handleSizeChange"
@current-change="refrash"
:current-page="BaseManageData.page"
:page-size="BaseManageData.size"
+ :page-sizes="[10,20,50,100]"
style="position:absolute;right:10px;bottom:5px"
+ layout="total,sizes,prev,pager,next,jumper"
:total="BaseManageData.total"
></el-pagination>
</div>
@@ -322,7 +307,11 @@
</el-row>
<el-row>
<el-col :span="20">
- <el-form-item label="鎬у埆" prop="sex" style="width:100%;margin-bottom: 10px;" class="tl">
+ <el-form-item
+ label="鎬у埆"
+ prop="sex"
+ style="width:100%;margin-bottom: 8px; text-align: left"
+ >
<el-radio-group v-model="form.sex" class="mt10">
<el-radio label="鐢�"></el-radio>
<el-radio label="濂�"></el-radio>
@@ -543,7 +532,7 @@
export default {
data() {
return {
- timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23,59,59))],
+ timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23, 59, 59))],
memberInfo: {
personName: '',
sex: '',
@@ -705,7 +694,7 @@
console.log("hello");
},
getUploadResult(result) {
- console.log(result, "涓婁紶鐨勮繑鍥�");
+ // console.log(result, "涓婁紶鐨勮繑鍥�");
this.uploadResult = result.data;
this.dialogVisible = true;
this.getPersonList();
@@ -737,6 +726,11 @@
refrash(current, pageSize) {
this.current = current;
this.BaseManageData.page = current;
+ this.getPersonList();
+ },
+ handleSizeChange(val){
+ //this.pageSize = val;
+ this.BaseManageData.size = val;
this.getPersonList();
},
handleClick(row) {
@@ -1153,8 +1147,15 @@
}
.table-parent {
// position: relative;
+ margin-left: 5px;
height: 90%;
overflow: visible !important;
+
+ .base-tip {
+ text-align: left;
+ font-size: 14px;
+ color: #000000;
+ }
}
.text-left {
@@ -1289,6 +1290,7 @@
}
.avatar-uploader {
+ margin: auto;
max-width: 150px;
min-width: 150px;
min-height: 152px;
--
Gitblit v1.8.0