From fb1d57f4bce31fe4f8147a144f8ef4afbca0a4cd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 二月 2023 13:48:29 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/baseSetting/illegalBuild/index.vue | 21
src/views/operate/viewEvent/index.vue | 93 +++++
src/components/map/leafletMap.vue | 15
src/views/operate/disposal/casepool/escalation/index.vue | 86 +++-
src/views/operate/baseSetting/violation/index.vue | 8
src/components/dispatch/index.vue | 4
src/views/systemSetting/platform/cockpitManage/index.vue | 2
src/views/operate/myWait/index.vue | 6
src/views/operate/fivepack/threepack/components/content.vue | 155 +++++++
src/views/operate/disposal/casepool/dispatch/index.vue | 89 +++-
src/views/operate/images/updateUser/index.vue | 9
src/views/operate/disposal/casepool/pool/index.vue | 214 ++++++-----
src/views/operate/disposal/casepool/pool/createUser/ill/index.vue | 8
src/views/operate/disposal/casepool/learn/index.vue | 98 +++--
src/views/operate/images/index.vue | 4
src/views/operate/disposal/casepool/notDeal/index.vue | 98 +++--
src/components/seachHeader/index.vue | 159 ++++++++
17 files changed, 792 insertions(+), 277 deletions(-)
diff --git a/src/components/dispatch/index.vue b/src/components/dispatch/index.vue
index bd209e2..844362f 100644
--- a/src/components/dispatch/index.vue
+++ b/src/components/dispatch/index.vue
@@ -107,7 +107,7 @@
</div>
</el-form>
<div class="map">
- <MyMap></MyMap>
+ <MyMap style="width: 600px; height: 400px"></MyMap>
</div>
<div class="footer">
<el-button type="primary" @click="handleDispatch">纭畾</el-button>
@@ -408,4 +408,4 @@
padding: 10px 20px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/map/leafletMap.vue b/src/components/map/leafletMap.vue
index eb74a74..d53bd34 100644
--- a/src/components/map/leafletMap.vue
+++ b/src/components/map/leafletMap.vue
@@ -42,6 +42,7 @@
};
},
mounted() {
+ console.log('/* 鍒涘缓鍦板浘瀹炰緥 */')
setTimeout(() => {
this.createrMap();
}, 100);
@@ -49,14 +50,28 @@
methods: {
/* 鍒涘缓鍦板浘瀹炰緥 */
createrMap() {
+
this.option.center = [eval(this.map_point.y), eval(this.map_point.x)];
this.option.zoom = this.map_zoom;
this.map = this.$map.createrMap("map-container", this.option);
// this.$map.createrLayers(this.map, this.mapUrls) //鍒囩墖鍦板浘
// this.$map.createrChinatm(this.map, this.mapUrl); // 鍥惧眰
+
this.map.pm.setLang("zh");
// this.map.pm.addControls(this.options);
+ // this.map.on("pm:drawstart", (e) => {
+ // // // workingLayer.on('pm:create', e => {
+ // // console.log("缁樺埗寮�濮�");
+ // // console.log(e);
+ // // // });
+ // });
+ // this.map.on("pm:drawend", (e) => {
+ // // // workingLayer.on('pm:create', e => {
+ // // console.log("缁樺埗缁撴潫");
+ // // // });
+ // });
this.locationMap();
+
},
locationMap() {
if (this.mark && this.map) {
diff --git a/src/components/seachHeader/index.vue b/src/components/seachHeader/index.vue
new file mode 100644
index 0000000..1a610b4
--- /dev/null
+++ b/src/components/seachHeader/index.vue
@@ -0,0 +1,159 @@
+<template>
+<div class="header">
+ <el-form :inline="true" :model="seachData" class="demo-form-inline">
+ <el-form-item label="浜嬩欢缂栧彿">
+ <el-input v-model="seachData.code" placeholder="浜嬩欢缂栧彿"></el-input>
+ </el-form-item>
+ <el-form-item label="鏉ユ簮鏌ヨ">
+ <el-select v-model="seachData.resource" placeholder="璇烽�夋嫨鏉ユ簮">
+ <el-option
+ v-for="item in eventSourceOptions"
+ :key="item.label"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="澶х被鍚嶇О">
+ <el-input v-model="seachData.categoryBig" placeholder="澶х被鍚嶇О"></el-input>
+ </el-form-item>
+ <el-form-item label="灏忕被鍚嶇О">
+ <el-input v-model="seachData.categorySmall" placeholder="灏忕被鍚嶇О"></el-input>
+ </el-form-item>
+ <el-form-item label="鎶ヨ鐐逛綅">
+ <el-input v-model="seachData.site" placeholder="鎶ヨ鐐逛綅"></el-input>
+ </el-form-item>
+ <el-form-item label="鎵�灞炲尯鍩�">
+ <el-cascader
+ v-model="seachData.street"
+ :options="communityOptions"
+ :props="options"
+ @change="handleChange"></el-cascader>
+ </el-form-item>
+ <el-form-item label="鎶ヨ鏃堕棿">
+ <el-date-picker
+ v-model="seachData.alarmTime"
+ type="daterange"
+ align="right"
+ unlink-panels
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :picker-options="pickerOptions">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
+ <el-button
+ v-if="addData"
+ class="addBtn button-addition"
+ type="primary"
+ @click="dialogCreate()"
+ >娣诲姞</el-button
+ >
+ </el-form-item>
+ </el-form>
+<!-- <div>-->
+<!-- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>-->
+<!-- <el-button-->
+<!-- class="addBtn button-addition"-->
+<!-- type="primary"-->
+<!-- @click="dialogCreate()"-->
+<!-- >娣诲姞</el-button-->
+<!-- >-->
+<!-- </div>-->
+</div>
+</template>
+
+<script>
+import {RESOURCE_OPTIONS} from "@/utils/helper";
+import department from "@/api/system/department";
+
+export default {
+ data(){
+ return{
+ options:{
+ label:'regionName',
+ value:'id',
+ },
+ communityOptions:[],
+ eventSourceOptions: RESOURCE_OPTIONS,
+ seachData:{
+
+ },
+ addData:false,
+ alarmTime:'',
+ pickerOptions: {
+ shortcuts: [{
+ text: '鏈�杩戜竴鍛�',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜竴涓湀',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜笁涓湀',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit('pick', [start, end]);
+ }
+ }]},
+ }
+ },
+ created() {
+ },
+ mounted() {
+ this.getPool()
+ this.getCommunityOptions()
+ },
+ methods:{
+ handleChange(value) {
+ console.log(value);
+ },
+ // 鑾峰彇绀惧尯鍜岃閬�
+ getCommunityOptions() {
+ department.getDepartmentList()
+ .then(res => {
+ this.communityOptions = res;
+ })
+ .catch(err => this.$message.error(err))
+ },
+ getPool(){
+ console.log(this.$route.name);
+ let name = this.$route.name
+ this.addData = name == 'pool';
+ },
+ onSubmit(){
+
+ },
+ getUserList(){
+ console.log(this.seachData)
+ // this.seachData.alarmTimeOne =this.seachData.alarmTime[0];
+ // this.seachData.alarmTimeTwo = this.seachData.alarmTime[1];
+ this.seachData.street=this.seachData.street?this.seachData.street[this.seachData.street.length-1]:null;
+ this.$emit('getUserList', {seachData:this.seachData});
+ },
+ dialogCreate(){
+ this.$emit('dialogCreatepro')
+ },
+ },
+}
+</script>
+
+<style lang="scss" scoped>
+ .header{
+ line-height: normal;
+ }
+</style>
diff --git a/src/views/operate/baseSetting/illegalBuild/index.vue b/src/views/operate/baseSetting/illegalBuild/index.vue
index fa2d916..d5c7037 100644
--- a/src/views/operate/baseSetting/illegalBuild/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="userList">
- <div class="headerTitle">杩愯惀绠＄悊銆嬪熀纭�璁剧疆銆嬭繚寤轰簨椤硅缃�</div>
+<!-- <div class="headerTitle">杩愯惀绠＄悊銆嬪熀纭�璁剧疆銆嬭繚寤轰簨椤硅缃�</div>-->
<header>
<div class="headerContent">
<div class="search">
@@ -12,11 +12,11 @@
</div>
<div class="addUser">
<el-button class="addBtn" type="primary" @click="dialogCreate = true"
- >鏂板杩濆缓</el-button
+ >鏂板杩濆缓绫诲瀷</el-button
>
<el-dialog
:visible.sync="dialogCreate"
- title="鏂板杩濆缓"
+ title="鏂板杩濆缓绫诲瀷"
width="45%"
v-if="dialogCreate"
:before-close="handleClose"
@@ -77,7 +77,7 @@
<!-- tools -->
<div class="tools">
<div class="funs">
- <!-- <div class="funsItem">
+ <div class="funsItem">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem">
@@ -89,7 +89,7 @@
:value="item.value" :disabled="item.disabled">
</el-option>
</el-select>
- </div> -->
+ </div>
</div>
<div class="pagination">
<el-pagination
@@ -300,7 +300,7 @@
}
header {
- background-color: #fff;
+ //background-color: #fff;
.headerContent {
padding: 0;
@@ -346,7 +346,7 @@
}
main {
- background-color: #fff;
+ //background-color: #fff;
margin-top: 20px;
padding-bottom: 50px;
@@ -367,7 +367,7 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
+ border: 1px solid #ccc;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
@@ -380,7 +380,10 @@
.el-select {
width: 120px;
}
-
+ &::v-deep .el-input__inner {
+ border: none;
+ // background-color: #09152f;
+ }
&:hover {
border: 1px solid #4b9bb7;
}
diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue
index c4456e7..f5b758f 100644
--- a/src/views/operate/baseSetting/violation/index.vue
+++ b/src/views/operate/baseSetting/violation/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="userList">
- <div class="headerTitle">杩愯惀绠＄悊銆嬪熀纭�璁剧疆銆嬭繚瑙勪簨椤硅缃�</div>
+<!-- <div class="headerTitle">杩愯惀绠＄悊銆嬪熀纭�璁剧疆銆嬭繚瑙勪簨椤硅缃�</div>-->
<header>
<div class="headerContent">
<div class="search">
@@ -82,7 +82,7 @@
<!-- tools -->
<div class="tools">
<div class="funs">
- <!-- <div class="funsItem">
+ <div class="funsItem">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem">
@@ -94,7 +94,7 @@
:value="item.value" :disabled="item.disabled">
</el-option>
</el-select>
- </div> -->
+ </div>
</div>
<div class="pagination">
<el-pagination
@@ -380,7 +380,7 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
+ border: 1px solid #ccc;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 539b6f7..bf22c48 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -1,25 +1,26 @@
<template>
<div class="userList">
<header>
- <div class="headerContent">
- <div class="search">
- <span>绛涢�夋潯浠�:</span>
- <div class="option">
- <el-select v-model="resource" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in resourceOptions"
- :key="item.label"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </div>
- <div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
- </div>
- </div>
- </div>
+ <MyHeader @getUserList ="getUserList"></MyHeader>
+<!-- <div class="headerContent">-->
+<!-- <div class="search">-->
+<!-- <span>绛涢�夋潯浠�:</span>-->
+<!-- <div class="option">-->
+<!-- <el-select v-model="resource" placeholder="璇烽�夋嫨">-->
+<!-- <el-option-->
+<!-- v-for="item in resourceOptions"-->
+<!-- :key="item.label"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- >-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </div>-->
+<!-- <div class="findBtn">-->
+<!-- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</header>
<main>
<div class="mainContent">
@@ -224,6 +225,7 @@
import helper from "@/utils/mydate";
import basecase from "@/api/operate/basecase";
import { RESOURCE_OPTIONS } from "@/utils/helper";
+import MyHeader from "@/components/seachHeader";
export default {
components: {
@@ -231,6 +233,7 @@
uploadIll,
MyDetail,
MyIllDetail,
+ MyHeader
},
data() {
return {
@@ -369,21 +372,41 @@
.catch((_) => {});
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const params = {
- current: this.currentPage,
- state: this.statusArr[0] ?? null,
- size: this.pageSize,
- resource: this.resource,
- type: this.statusArr[1] ?? null,
- };
+ getUserList(seachData) {
+ // console.log(seachData.seachData.resource)
+ let params
+ if (seachData){
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: seachData.seachData.resource ==undefined ?null:seachData.seachData.resource,
+ region:seachData.seachData.region ==undefined?null:seachData.seachData.region,
+ type: this.statusArr[1] ?? null,
+ code:seachData.seachData.code ==undefined?null:seachData.seachData.code,
+ categoryBig:seachData.seachData.categoryBig ==undefined?null:seachData.seachData.categoryBig,
+ categorySmall:seachData.seachData.categorySmall ==undefined?null:seachData.seachData.categorySmall,
+ site:seachData.seachData.site ==undefined?null:seachData.seachData.site,
+ street:seachData.seachData.street ==undefined?null:seachData.seachData.street,
+ alarmTime:seachData.seachData.alarmTime ==undefined?null:seachData.seachData.alarmTime,
+ };
+ }else {
+
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ type: this.statusArr[1] ?? null,
+ };
+ }
+
basecase
- .baseCasePoolList(params)
- .then(({ records, total }) => {
- this.tableData = records;
- this.totalNum = total;
- })
- .catch((err) => this.$message.error(err));
+ .baseCasePoolList(params)
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch((err) => this.$message.error(err));
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
diff --git a/src/views/operate/disposal/casepool/escalation/index.vue b/src/views/operate/disposal/casepool/escalation/index.vue
index 33d9299..1b0ad26 100644
--- a/src/views/operate/disposal/casepool/escalation/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/index.vue
@@ -1,29 +1,30 @@
<template>
<div class="userList">
<header>
- <div class="headerContent">
- <div class="search">
- <span>鏉ユ簮鏌ヨ:</span>
- <div class="option">
- <el-select
- v-model="mystatus"
- placeholder="杩濊"
- >
- <el-option
- v-for="item in resourceOptions"
- :key="item.label"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </div>
- <div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
- </div>
- </div>
+ <MyHeader @getUserList ="getUserList"></MyHeader>
+<!-- <div class="headerContent">-->
+<!-- <div class="search">-->
+<!-- <span>鏉ユ簮鏌ヨ:</span>-->
+<!-- <div class="option">-->
+<!-- <el-select-->
+<!-- v-model="mystatus"-->
+<!-- placeholder="杩濊"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in resourceOptions"-->
+<!-- :key="item.label"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- >-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </div>-->
+<!-- <div class="findBtn">-->
+<!-- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>-->
+<!-- </div>-->
+<!-- </div>-->
- </div>
+<!-- </div>-->
</header>
<main>
<div class="mainContent">
@@ -132,10 +133,12 @@
import { RESOURCE_OPTIONS, EVENT_SOURCE } from "@/utils/helper";
import MyDetail from "@/components/detail";
import basecase from "@/api/operate/basecase";
+import MyHeader from "@/components/seachHeader/index"
export default {
components: {
MyDetail,
+ MyHeader
},
data() {
return {
@@ -301,20 +304,41 @@
});
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const params = {
- current: this.currentPage,
- state: this.statusArr[0] ?? null,
- size: this.pageSize,
- resource: this.resource,
- type: this.statusArr[1] ?? null
+ getUserList(seachData) {
+ // console.log(seachData.seachData.resource)
+ let params
+ if (seachData){
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: seachData.seachData.resource ==undefined ?null:seachData.seachData.resource,
+ region:seachData.seachData.region ==undefined?null:seachData.seachData.region,
+ type: this.statusArr[1] ?? null,
+ code:seachData.seachData.code ==undefined?null:seachData.seachData.code,
+ categoryBig:seachData.seachData.categoryBig ==undefined?null:seachData.seachData.categoryBig,
+ categorySmall:seachData.seachData.categorySmall ==undefined?null:seachData.seachData.categorySmall,
+ site:seachData.seachData.site ==undefined?null:seachData.seachData.site,
+ street:seachData.seachData.street ==undefined?null:seachData.seachData.street,
+ alarmTime:seachData.seachData.alarmTime ==undefined?null:seachData.seachData.alarmTime,
+ };
+ }else {
+
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ type: this.statusArr[1] ?? null,
+ };
}
- basecase.baseCasePoolList(params)
+
+ basecase
+ .baseCasePoolList(params)
.then(({ records, total }) => {
this.tableData = records;
this.totalNum = total;
})
- .catch(err => this.$message.error(err))
+ .catch((err) => this.$message.error(err));
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
diff --git a/src/views/operate/disposal/casepool/learn/index.vue b/src/views/operate/disposal/casepool/learn/index.vue
index 436fab7..1c0ae10 100644
--- a/src/views/operate/disposal/casepool/learn/index.vue
+++ b/src/views/operate/disposal/casepool/learn/index.vue
@@ -1,29 +1,30 @@
<template>
<div class="userList">
<header>
- <div class="headerContent">
- <div class="search">
- <span>绛涢�夋潯浠�:</span>
- <div class="option">
- <el-select
- v-model="resource"
- placeholder="杩濊"
- @change="setMystatus"
- >
- <el-option
- v-for="item in resourceList"
- :key="item.label"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </div>
- <div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
- </div>
- </div>
- </div>
+ <MyHeader @getUserList ="getUserList"></MyHeader>
+<!-- <div class="headerContent">-->
+<!-- <div class="search">-->
+<!-- <span>绛涢�夋潯浠�:</span>-->
+<!-- <div class="option">-->
+<!-- <el-select-->
+<!-- v-model="resource"-->
+<!-- placeholder="杩濊"-->
+<!-- @change="setMystatus"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in resourceList"-->
+<!-- :key="item.label"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- >-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </div>-->
+<!-- <div class="findBtn">-->
+<!-- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</header>
<main>
<div class="mainContent">
@@ -214,13 +215,14 @@
import helper from "@/utils/mydate";
import { RESOURCE_OPTIONS } from "@/utils/helper";
import basecase from "@/api/operate/basecase";
-
+import MyHeader from "@/components/seachHeader";
export default {
components: {
uploadVio,
uploadIll,
MyDetail,
MyIllDetail,
+ MyHeader
},
data() {
return {
@@ -355,21 +357,41 @@
.catch((_) => {});
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const params = {
- current: this.currentPage,
- state: this.statusArr[0] ?? null,
- size: this.pageSize,
- resource: this.resource,
- type: this.statusArr[1] ?? null,
- };
+ getUserList(seachData) {
+ // console.log(seachData.seachData.resource)
+ let params
+ if (seachData){
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: seachData.seachData.resource ==undefined ?null:seachData.seachData.resource,
+ region:seachData.seachData.region ==undefined?null:seachData.seachData.region,
+ type: this.statusArr[1] ?? null,
+ code:seachData.seachData.code ==undefined?null:seachData.seachData.code,
+ categoryBig:seachData.seachData.categoryBig ==undefined?null:seachData.seachData.categoryBig,
+ categorySmall:seachData.seachData.categorySmall ==undefined?null:seachData.seachData.categorySmall,
+ site:seachData.seachData.site ==undefined?null:seachData.seachData.site,
+ street:seachData.seachData.street ==undefined?null:seachData.seachData.street,
+ alarmTime:seachData.seachData.alarmTime ==undefined?null:seachData.seachData.alarmTime,
+ };
+ }else {
+
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ type: this.statusArr[1] ?? null,
+ };
+ }
+
basecase
- .baseCasePoolList(params)
- .then(({ records, total }) => {
- this.tableData = records;
- this.totalNum = total;
- })
- .catch((err) => this.$message.error(err));
+ .baseCasePoolList(params)
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch((err) => this.$message.error(err));
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
diff --git a/src/views/operate/disposal/casepool/notDeal/index.vue b/src/views/operate/disposal/casepool/notDeal/index.vue
index 6da9127..28f4a64 100644
--- a/src/views/operate/disposal/casepool/notDeal/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/index.vue
@@ -1,29 +1,30 @@
<template>
<div class="userList">
<header>
- <div class="headerContent">
- <div class="search">
- <span>绛涢�夋潯浠�:</span>
- <div class="option">
- <el-select
- v-model="mystatus"
- placeholder="杩濊"
- @change="setMystatus"
- >
- <el-option
- v-for="item in resourceOptions"
- :key="item.label"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </div>
- <div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
- </div>
- </div>
- </div>
+ <MyHeader @getUserList ="getUserList"></MyHeader>
+<!-- <div class="headerContent">-->
+<!-- <div class="search">-->
+<!-- <span>绛涢�夋潯浠�:</span>-->
+<!-- <div class="option">-->
+<!-- <el-select-->
+<!-- v-model="mystatus"-->
+<!-- placeholder="杩濊"-->
+<!-- @change="setMystatus"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in resourceOptions"-->
+<!-- :key="item.label"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- >-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </div>-->
+<!-- <div class="findBtn">-->
+<!-- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</header>
<main>
<div class="mainContent">
@@ -212,13 +213,14 @@
import MyIllDetail from "@/components/illdetail";
import basecase from "@/api/operate/basecase";
import { RESOURCE_OPTIONS } from "@/utils/helper";
-
+import MyHeader from "@/components/seachHeader";
export default {
components: {
uploadVio,
uploadIll,
MyDetail,
MyIllDetail,
+ MyHeader
},
data() {
return {
@@ -354,21 +356,41 @@
.catch((_) => {});
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const params = {
- current: this.currentPage,
- state: this.statusArr[0] ?? null,
- size: this.pageSize,
- resource: this.resource,
- type: this.statusArr[1] ?? null,
- };
+ getUserList(seachData) {
+ // console.log(seachData.seachData.resource)
+ let params
+ if (seachData){
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: seachData.seachData.resource ==undefined ?null:seachData.seachData.resource,
+ region:seachData.seachData.region ==undefined?null:seachData.seachData.region,
+ type: this.statusArr[1] ?? null,
+ code:seachData.seachData.code ==undefined?null:seachData.seachData.code,
+ categoryBig:seachData.seachData.categoryBig ==undefined?null:seachData.seachData.categoryBig,
+ categorySmall:seachData.seachData.categorySmall ==undefined?null:seachData.seachData.categorySmall,
+ site:seachData.seachData.site ==undefined?null:seachData.seachData.site,
+ street:seachData.seachData.street ==undefined?null:seachData.seachData.street,
+ alarmTime:seachData.seachData.alarmTime ==undefined?null:seachData.seachData.alarmTime,
+ };
+ }else {
+
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ type: this.statusArr[1] ?? null,
+ };
+ }
+
basecase
- .baseCasePoolList(params)
- .then(({ records, total }) => {
- this.tableData = records;
- this.totalNum = total;
- })
- .catch((err) => this.$message.error(err));
+ .baseCasePoolList(params)
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch((err) => this.$message.error(err));
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
diff --git a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
index e847637..c01be2c 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
@@ -109,7 +109,7 @@
</el-form-item>
<el-form-item class="optionItems" label-width='0px' prop="buildingWidth">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingWidth"></el-input>
- </el-form-item>
+ </el-form-item>
<el-form-item class="optionItems" label-width='0px' prop="buildingHigh">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingHigh"></el-input>
</el-form-item>
@@ -360,7 +360,7 @@
created() {
const { getBigKind, getCommityList,getStreetList } = this;
getStreetList(0);
-
+
// this.ill.category = this.mytype + 1;
getBigKind();
getCommityList();
@@ -537,7 +537,7 @@
}
.input-form {
-
+
.upload-demo {
position: relative;
margin-right: 20px;
@@ -577,4 +577,4 @@
flex: 2;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index a069592..15d727b 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -1,66 +1,35 @@
<template>
<div class="userList">
<header>
- <div class="headerContent">
- <div class="search">
- <span>鏉ユ簮鏌ヨ:</span>
- <div class="option">
- <el-select clearable v-model="resource" placeholder="璇烽�夋嫨鏉ユ簮">
- <el-option
- v-for="item in eventSourceOptions"
- :key="item.label"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </div>
- <div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
- </div>
- </div>
- <div class="addUser">
- <el-button
- class="addBtn button-addition"
- type="primary"
- @click="dialogCreate = true"
- >娣诲姞</el-button
- >
- <!-- 閫夋嫨鐧昏绫诲瀷 -->
- <el-dialog
- :before-close="handleClose"
- :visible.sync="dialogCreate"
- title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷"
- width="45%"
- v-if="dialogCreate"
- >
- <createUser @getPageProp="setDialog" />
- </el-dialog>
- <!-- 浜嬩欢鐧昏 -->
- <el-dialog
- :before-close="handleClose"
- :visible.sync="dialogNewAdd"
- :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏'"
- width="80%"
- v-if="dialogNewAdd"
- >
- <!-- 杩濆缓鐧昏 -->
- <MyIll
- v-if="newAddType === 1"
- :refresh="getUserList"
- :mytype="newAddType"
- @changeDialog="changeDialog"
- />
- <!-- 杩濊鐧昏 -->
- <myVio
- v-else
- :refresh="getUserList"
- :mytype="newAddType"
- @changeDialog="changeDialog"
- />
- </el-dialog>
- </div>
- </div>
+ <MyHeader @dialogCreatepro="dialogCreatepro" @getUserList ="getUserList"></MyHeader>
+<!-- <div class="headerContent">-->
+<!-- <div class="search">-->
+<!-- <span>鏉ユ簮鏌ヨ:</span>-->
+<!-- <div class="option">-->
+<!-- <el-select clearable v-model="resource" placeholder="璇烽�夋嫨鏉ユ簮">-->
+<!-- <el-option-->
+<!-- v-for="item in eventSourceOptions"-->
+<!-- :key="item.label"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- >-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </div>-->
+<!-- <div class="findBtn">-->
+<!-- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="addUser">-->
+<!-- <el-button-->
+<!-- class="addBtn button-addition"-->
+<!-- type="primary"-->
+<!-- @click="dialogCreate = true"-->
+<!-- >娣诲姞</el-button-->
+<!-- >-->
+
+<!-- </div>-->
+<!-- </div>-->
</header>
<main>
<div class="mainContent">
@@ -131,21 +100,22 @@
:prop="mystatus === 1 ? 'site' : ''"
:label="mystatus === 1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'"
:min-width="mystatus === 1 ? '10' : '20'"
+ show-overflow-tooltip
>
<template slot-scope="scope">
- <div v-if="mystatus === 2">
+ <div v-if="mystatus === 2">
<span>{{
- scope.row.buildingLength +
- "绫�" +
- "銆�" +
- scope.row.buildingWidth +
- "绫�" +
- "銆�" +
- scope.row.buildingHigh +
- "绫�"
- }}</span>
- </div>
- <div v-else>{{ scope.row.site }}</div>
+ scope.row.buildingLength +
+ "绫�" +
+ "銆�" +
+ scope.row.buildingWidth +
+ "绫�" +
+ "銆�" +
+ scope.row.buildingHigh +
+ "绫�"
+ }}</span>
+ </div>
+ <div v-else>{{ scope.row.site }}</div>
</template>
</el-table-column>
<el-table-column
@@ -246,6 +216,39 @@
</div>
</div>
</main>
+ <!-- 閫夋嫨鐧昏绫诲瀷 -->
+ <el-dialog
+ :before-close="handleClose"
+ :visible.sync="dialogCreate"
+ title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷"
+ width="45%"
+ v-if="dialogCreate"
+ >
+ <createUser @getPageProp="setDialog" />
+ </el-dialog>
+ <!-- 浜嬩欢鐧昏 -->
+ <el-dialog
+ :before-close="handleClose"
+ :visible.sync="dialogNewAdd"
+ :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏'"
+ width="80%"
+ v-if="dialogNewAdd"
+ >
+ <!-- 杩濆缓鐧昏 -->
+ <MyIll
+ v-if="newAddType === 1"
+ :refresh="getUserList"
+ :mytype="newAddType"
+ @changeDialog="changeDialog"
+ />
+ <!-- 杩濊鐧昏 -->
+ <myVio
+ v-else
+ :refresh="getUserList"
+ :mytype="newAddType"
+ @changeDialog="changeDialog"
+ />
+ </el-dialog>
</div>
</template>
<script>
@@ -258,7 +261,7 @@
import helper from "@/utils/mydate";
import { RESOURCE_OPTIONS } from "@/utils/helper";
import basecase from "@/api/operate/basecase";
-
+import MyHeader from "@/components/seachHeader/index"
export default {
components: {
createUser,
@@ -267,6 +270,7 @@
MyDetail,
MyDispatch,
MyIllDetail,
+ MyHeader
},
data() {
return {
@@ -361,9 +365,15 @@
this.statusArr[1] = item.value;
}
});
- this.getUserList();
+ this.getUserList(undefined);
+ },
+ mounted() {
},
methods: {
+ dialogCreatepro(){
+ console.log('-------------------')
+ this.dialogCreate = true
+ },
// 璋冨害
handleDispatch(data) {
this.baseId = data.id;
@@ -438,14 +448,34 @@
});
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const params = {
- current: this.currentPage,
- state: this.statusArr[0] ?? null,
- size: this.pageSize,
- resource: this.resource,
- type: this.statusArr[1] ?? null,
- };
+ getUserList(seachData) {
+ // console.log(seachData.seachData.resource)
+ let params
+ if (seachData){
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: seachData.seachData.resource ==undefined ?null:seachData.seachData.resource,
+ region:seachData.seachData.region ==undefined?null:seachData.seachData.region,
+ type: this.statusArr[1] ?? null,
+ code:seachData.seachData.code ==undefined?null:seachData.seachData.code,
+ categoryBig:seachData.seachData.categoryBig ==undefined?null:seachData.seachData.categoryBig,
+ categorySmall:seachData.seachData.categorySmall ==undefined?null:seachData.seachData.categorySmall,
+ site:seachData.seachData.site ==undefined?null:seachData.seachData.site,
+ street:seachData.seachData.street ==undefined?null:seachData.seachData.street,
+ alarmTime:seachData.seachData.alarmTime ==undefined?null:seachData.seachData.alarmTime,
+ };
+ }else {
+
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ type: this.statusArr[1] ?? null,
+ };
+ }
+
basecase
.baseCasePoolList(params)
.then(({ records, total }) => {
@@ -652,20 +682,18 @@
.nav {
display: flex;
line-height: 40px;
-
+ .is-active {
+ // background-color: #070f22;
+ //color: #333;
+ color: #f5222d;
+ font-weight: 700;
+ }
.nav-item {
width: 80px;
text-align: center;
-
&:hover {
cursor: pointer;
}
- }
-
- .is-active {
- // background-color: #070f22;
- color: #333;
- font-size: 500;
}
}
@@ -687,8 +715,8 @@
.is-active {
// background-color: #070f22;
border-radius: 4px;
- color: #333;
- font-size: 500;
+ color: #f5222d;
+ font-weight: 700;
}
}
@@ -771,7 +799,7 @@
.operation {
display: flex;
-
+ color: #2f54eb;
.line {
padding: 0 5px;
}
diff --git a/src/views/operate/fivepack/threepack/components/content.vue b/src/views/operate/fivepack/threepack/components/content.vue
index d399d6b..ce0cc4b 100644
--- a/src/views/operate/fivepack/threepack/components/content.vue
+++ b/src/views/operate/fivepack/threepack/components/content.vue
@@ -6,7 +6,8 @@
<div class="search-item">
<span>杈撳叆鏌ヨ:</span>
<el-input
- style="flex: 1"
+
+ style="flex: 1;margin-left: 15px"
:placeholder="
isStorePage() ? '搴楅摵锛堥棬搴楋級鍚嶇О' : '璇疯緭鍏ュ簵閾虹紪鍙�'
"
@@ -15,7 +16,7 @@
</div>
<div class="search-item">
<span>搴楅摵鐘舵��:</span>
- <el-select v-model="storeStatus" placeholder="閫夋嫨搴楅摵鐘舵��">
+ <el-select v-model="storeStatus" style="margin-left: 15px" placeholder="閫夋嫨搴楅摵鐘舵��">
<el-option
v-for="item in options"
:key="item.value"
@@ -253,18 +254,46 @@
</el-form>
</div>
</el-dialog>
- <!-- 鍒嗛〉 -->
- <div class="pagination">
- <el-pagination
- background
- :current-page="currentPage"
- layout="prev, pager, next"
- :total="totalNum"
- :page-size="pageSize"
- @current-change="changeCurrentPage"
- >
- </el-pagination>
+ <div class="tools">
+ <div class="funs">
+ <div class="funsItem">
+ <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
+ </div>
+ <div class="funsItem">
+ <el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
+ </div>
+ <div class="funsItem">
+ <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange">
+ <el-option v-for="item in options" :key="item.value" :label="item.label"
+ :value="item.value" :disabled="item.disabled">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <div class="pagination">
+ <el-pagination
+ background
+ :current-page="currentPage"
+ layout="prev, pager, next"
+ :total="totalNum"
+ :page-size="pageSize"
+ @current-change="changeCurrentPage"
+ >
+ </el-pagination>
+ </div>
</div>
+ <!-- 鍒嗛〉 -->
+<!-- <div class="pagination">-->
+<!-- <el-pagination-->
+<!-- background-->
+<!-- :current-page="currentPage"-->
+<!-- layout="prev, pager, next"-->
+<!-- :total="totalNum"-->
+<!-- :page-size="pageSize"-->
+<!-- @current-change="changeCurrentPage"-->
+<!-- >-->
+<!-- </el-pagination>-->
+<!-- </div>-->
</main>
</div>
</template>
@@ -358,6 +387,46 @@
},
methods: {
+ // 鎵归噺鍒犻櫎
+ mulDelete(idArr) {
+ this.$axios({
+ method: "delete",
+ url: "sccg/illegal_building/batch_delete?ids=" + idArr,
+ }).then((res) => {
+ this.getUserList();
+ this.$message({
+ message: res.message,
+ type: res.code === 200 ? "success" : "warning",
+ });
+ });
+ },
+ // 鎵ц涓嬫媺妗嗘搷浣�
+ selectChange(val) {
+ let ids = [];
+ this.tempList.forEach((item) => {
+ ids.push(item.number);
+ });
+ if (ids.length !== 0) {
+ if (val === 3) {
+ this.mulDelete(ids);
+ }
+ } else {
+ this.$message({
+ type: "warning",
+ message: "鎮ㄨ繕娌￠�変腑浠讳綍鏁版嵁",
+ });
+ }
+ },
+ // 鍏ㄩ��
+ selectAll() {
+ this.$refs.multipleTable.toggleAllSelection();
+ },
+ // 鍙嶉��
+ disSame(list) {
+ list.forEach((row) => {
+ this.$refs.multipleTable.toggleRowSelection(row);
+ });
+ },
// 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅)
handleSubmit(mystatus) {
this.role.body = this.$refs.edit.editor.txt.html();
@@ -623,7 +692,67 @@
.mainTitle {
line-height: 60px;
}
+ .tools {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 20px;
+ .funs {
+ display: flex;
+
+ .funsItem {
+ line-height: 28px;
+ display: flex;
+ align-items: center;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ font-size: 12px;
+ margin-left: 10px;
+
+ .el-checkbox {
+ width: 80px;
+ padding: 0 10px;
+ }
+
+ .el-select {
+ width: 120px;
+ }
+ &::v-deep .el-input__inner {
+ border: none;
+ // background-color: #09152f;
+ }
+ &:hover {
+ border: 1px solid #4b9bb7;
+ }
+
+ &:hover .el-checkbox {
+ color: #4b9bb7;
+ }
+ }
+ }
+
+ .pagination {
+ margin-top: 50px;
+ display: flex;
+ line-height: 50px;
+ justify-content: center;
+
+ .el-pagination {
+ &::v-deep li,
+ &::v-deep .btn-prev,
+ &::v-deep .btn-next {
+ // background-color: #071f39;
+ color: #4b9bb7;
+ }
+
+ &::v-deep .active {
+ background-color: #409eff;
+ color: #fff;
+ }
+ }
+ }
+ }
.el-link {
color: #4b9bb7;
}
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index 2b8d350..ed2bc7d 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -462,7 +462,9 @@
// background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
-
+ &::v-deep .el-dialog__body{
+ overflow: auto;
+ }
.btn span:hover {
cursor: pointer;
}
diff --git a/src/views/operate/images/updateUser/index.vue b/src/views/operate/images/updateUser/index.vue
index a72651b..ce8a559 100644
--- a/src/views/operate/images/updateUser/index.vue
+++ b/src/views/operate/images/updateUser/index.vue
@@ -24,7 +24,7 @@
v-model="getCategory(imagedata.category).label"
></el-input>
</el-form-item>
-
+
<el-form-item prop="regionName" label="绀惧尯鍚嶇О">
<el-input v-model="imagedata.regionName"></el-input>
</el-form-item>
@@ -41,7 +41,7 @@
/>
</el-select>
</el-form-item> -->
- <el-form-item prop="url" label="鍥剧墖:" min-width="8">
+ <el-form-item prop="url" label="鍥剧墖:" min-width="8">
<my-upload
:picture-list="imageList"
:is-show-upload="dialogType !== 'view'"
@@ -54,8 +54,7 @@
type="primary"
class="btn submit"
@click.native.prevent="onSubmit"
- >鎻愪氦</el-button
- >
+ >鎻愪氦</el-button>
</div>
</el-form>
</div>
@@ -346,4 +345,4 @@
.el-select {
width: 280px !important;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index ecfdb5e..70d1006 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="userList">
- <div class="headerTitle">杩愯惀绠＄悊銆嬫垜鐨勫緟鍔�</div>
+<!-- <div class="headerTitle">杩愯惀绠＄悊銆嬫垜鐨勫緟鍔�</div>-->
<header>
<div class="headerContent">
<div class="search">
@@ -360,7 +360,7 @@
}
header {
- background-color: white;
+ //background-color: white;
.headerContent {
padding: 0;
@@ -411,7 +411,7 @@
}
main {
- background-color: #fff;
+ //background-color: #fff;
margin-top: 20px;
padding-bottom: 50px;
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index 6b5628d..e7e39ce 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="userList">
<header>
- <div class="headerTitle">杩愯惀绠＄悊 >> 妗堝嵎鏌ヨ</div>
+<!-- <div class="headerTitle">杩愯惀绠＄悊 >> 妗堝嵎鏌ヨ</div>-->
<div class="headerContent">
<div class="contentItem">
<div style="width: 80px">鎸夌紪鍙�:</div>
@@ -37,7 +37,7 @@
</div>
</div>
<div class="btn">
- <el-button type="primary" @click="getList">鎼滅储</el-button>
+ <el-button type="primary" @click="getList">鏌ヨ</el-button>
</div>
</div>
<div class="headerContent">
@@ -75,7 +75,9 @@
:data="tableData"
style="width: 100%"
:row-class-name="tableRowClassName"
+ @selection-change="tableChange"
>
+ <el-table-column type="selection" min-width="5"> </el-table-column>
<el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
<el-link @click="handleView(scope.row)">{{ scope.row.code }}</el-link>
@@ -158,6 +160,34 @@
</el-dialog>
<!-- tools -->
<div class="tools">
+ <div class="funs">
+ <div class="funsItem">
+ <el-checkbox v-model="all" @change="selectAll()"
+ >鍏ㄩ��</el-checkbox
+ >
+ </div>
+ <div class="funsItem">
+ <el-checkbox v-model="unsame" @change="disSame(tableData)"
+ >鍙嶉��</el-checkbox
+ >
+ </div>
+ <div class="funsItem">
+ <el-select
+ v-model="myIdx"
+ placeholder="鎵归噺鎿嶄綔"
+ @change="selectChange"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ :disabled="item.disabled"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ </div>
<div class="pagination">
<el-pagination
background
@@ -197,6 +227,28 @@
},
data() {
return {
+ all: false,
+ unsame: false,
+ myIdx: 0,
+ options: [
+ {
+ value: 0,
+ label: "鎵归噺鎿嶄綔",
+ disabled: true,
+ },
+ {
+ value: 1,
+ label: "鎵归噺鍚敤",
+ },
+ {
+ value: 2,
+ label: "鎵归噺绂佺敤",
+ },
+ {
+ value: 3,
+ label: "鎵归噺鍒犻櫎",
+ },
+ ],
datepick: null,
tableData: [],
dialogExamine: false,
@@ -229,6 +281,40 @@
this.getCommunityOptions();
},
methods: {
+ // 鎵归噺鍒犻櫎
+ mulDelete(idArr) {},
+ // 鎵ц涓嬫媺妗嗘搷浣�
+ selectChange(val) {
+ let ids = [];
+ this.tempList.forEach((item) => {
+ ids.push(item.number);
+ });
+ if (ids.length !== 0) {
+ if (val === 3) {
+ this.mulDelete(ids);
+ }
+ } else {
+ this.$message({
+ type: "warning",
+ message: "鎮ㄨ繕娌￠�変腑浠讳綍鏁版嵁",
+ });
+ }
+ },
+ // 鐩戝惉琛ㄦ牸閫変腑鐘舵��
+ tableChange(list) {
+ this.tempList = list;
+ this.all = list.length === this.tableData.length;
+ },
+ // 鍏ㄩ��
+ selectAll() {
+ this.$refs.multipleTable.toggleAllSelection();
+ },
+ // 鍙嶉��
+ disSame(list) {
+ list.forEach((row) => {
+ this.$refs.multipleTable.toggleRowSelection(row);
+ });
+ },
// 鑾峰彇鍒楄〃
getList() {
const searchData = Object.assign({}, this.searchData);
@@ -345,7 +431,7 @@
}
main {
- background-color: #fff;
+ //background-color: #fff;
margin-top: 20px;
padding-bottom: 50px;
@@ -370,6 +456,7 @@
line-height: 28px;
display: flex;
align-items: center;
+ border: 1px solid #ccc;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
diff --git a/src/views/systemSetting/platform/cockpitManage/index.vue b/src/views/systemSetting/platform/cockpitManage/index.vue
index d5965dc..5054128 100644
--- a/src/views/systemSetting/platform/cockpitManage/index.vue
+++ b/src/views/systemSetting/platform/cockpitManage/index.vue
@@ -375,6 +375,8 @@
importTable(file) {
const formData = new FormData();
formData.append("file", file.file);
+ console.log(formData)
+ console.log(file)
importTeamInfo(formData)
.then(() => {
this.$message({ type: "success", message: "鎿嶄綔鎴愬姛" });
--
Gitblit v1.8.0