From 0615f6c8dddf1cff5368e85ce4bfa92c4deebe02 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 18:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/disposal/casepool/pool/index.vue | 91 ++++++---------------------------------------
1 files changed, 13 insertions(+), 78 deletions(-)
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index cd0bff0..eeffed6 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -5,7 +5,7 @@
<div class="search">
<span>鏉ユ簮鏌ヨ:</span>
<div class="option">
- <el-select v-model="mystatus" placeholder="杩濊" @change="setMystatus">
+ <el-select v-model="mystatus" placeholder="杩濊" @change="setMyStatus">
<el-option v-for="item in typeList" :key="item.label" :label="item.name"
:value="item.value">
</el-option>
@@ -16,7 +16,7 @@
</div>
</div>
<div class="addUser">
- <el-button class="addBtn" type="primary" @click="dialogCreate = true">娣诲姞</el-button>
+ <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">
@@ -68,9 +68,6 @@
<el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'"
min-width="10">
</el-table-column>
- <!-- <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'"
- :label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
- </el-table-column> -->
<el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'"
:min-width="mystatus===1?'10' :'20' ">
<template slot-scope="scope">
@@ -110,7 +107,7 @@
<!-- 璇︽儏椤靛睍绀� -->
<el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
:before-close="handleClose">
- <MyDetail :info=info v-if="mystatus==1 ? true:false"></MyDetail>
+ <MyDetail :info=info v-if="mystatus === 1"></MyDetail>
<MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 璋冨害 -->
@@ -124,7 +121,7 @@
<div class="funs">
<div class="funsItem funs-sp">
<el-checkbox v-model="all" @change="selectAll()"
- :disabled="tableData.length !== 0 ? false : true">鍏ㄩ��</el-checkbox>
+ :disabled="tableData.length === 0">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem funs-sp">
<el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
@@ -139,8 +136,7 @@
</div>
<div class="pagination">
<el-pagination background :current-page="currentPage" layout="prev, pager, next"
- :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage"
- @prev-click="handlePrev" @next-click="handleNext">
+ :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -162,19 +158,7 @@
},
data() {
return {
- tableData: [
- // {
- // code:1,
- // eventSource:1,
- // category:1,
- // type:1,
- // actionCause:'妗堢敱1111',
- // site:'浣犲ソ',
- // streetId:1,
- // alarmTime:'2022-21-20',
- // continueTime:'8灏忔椂',
- // }
- ],
+ tableData: [],
dialogCreate: false,
dialogView: false,
dialogNewAdd: false,
@@ -273,11 +257,9 @@
this.dialogDispatch = true;
},
// 椤堕儴涓嬫媺妗�
- setMystatus(value) {
- console.log(value);
+ setMyStatus(value) {
this.statusArr[1] = value;
this.changeTypeChecked(value - 1);
- this.getUserList();
},
// 閫夋嫨杩濊杩濆缓
setDialog({ flag, type }) {
@@ -287,7 +269,6 @@
},
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
- console.log(idArr instanceof Array);
const { statusArr } = this;
this.$confirm('鎮ㄧ‘瀹氳鎵归噺鍒犻櫎妗堜欢鍚�?')
.then(_ => {
@@ -309,11 +290,10 @@
}
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -333,11 +313,7 @@
list.forEach(item => {
this.tempList.push(item.id);
})
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 鍏ㄩ��
selectAll() {
@@ -352,55 +328,39 @@
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
const { currentPage, pageSize, statusArr } = this;
- console.log(statusArr);
this.$axios({
method: 'get',
url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
}).then(res => {
this.totalNum = res.data.total;
this.tableData = res.data.records;
- console.log(res);
})
.catch(err => {
- console.log(err)
this.tableData = [];
})
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
handleFind(rowData) {
- // this.dialogView = true;
- // this.userInfo = rowData;
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
this.getUserList();
},
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
- this.currentPage = page;
- this.getUserList();
- },
+
changeDialog({ flag }) {
this.dialogNewAdd = flag;
this.dialogCreate = flag;
this.dialogView = flag;
this.dialogDispatch = flag;
- // this.getUserList();
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -416,11 +376,7 @@
// 鏇存敼涓�绾ф爣绛剧殑閫変腑
changeNavChecked(idx) {
this.tagList.forEach((item, index) => {
- if (index === idx) {
- item.checked = true;
- } else {
- item.checked = false;
- }
+ item.checked = index === idx;
})
this.mystatus = 1
this.typeList[0].checked = true;
@@ -432,11 +388,7 @@
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
this.typeList.forEach((item, index) => {
- if (index === idx) {
- item.checked = true;
- } else {
- item.checked = false;
- }
+ item.checked = index === idx;
})
this.mystatus = idx + 1;
this.statusArr[1] = this.typeList[idx].value;
@@ -447,26 +399,22 @@
},
// 鑾峰彇妗堜欢淇℃伅
getEventInfo(code) {
- console.log('鑾峰彇鍏蜂綋妗堜欢淇℃伅', code);
this.$axios({
method: 'get',
url: `sccg/base_case/baseCaseDetail/${code}`
})
.then(res => {
- console.log(res);
this.info = res.data;
this.dialogView = true;
})
},
// 鍦ㄥ涔�
handleLearn({ id }) {
- console.log(id);
this.$axios({
method: 'put',
url: 'sccg/base_case/case_status_update?caseId=' + id + '&state=' + 3
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$notify({
title: '娓╅Θ鎻愮ず',
@@ -474,10 +422,6 @@
type: 'success',
position: 'bottom-right'
})
- // this.$message({
- // type:'success',
- // message:'鎿嶄綔鎴愬姛',
- // })
this.getUserList();
} else {
this.$message({
@@ -489,13 +433,11 @@
},
// 鏆備笉澶勭悊
handleNotDeal({ id }) {
- console.log(id);
this.$axios({
method: 'put',
url: 'sccg/base_case/case_status_update?caseId=' + id + '&state=' + 4
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$notify({
title: '娓╅Θ鎻愮ず',
@@ -503,10 +445,6 @@
type: 'success',
position: 'bottom-right'
})
- // this.$message({
- // type:'success',
- // message:'鎿嶄綔鎴愬姛',
- // })
this.getUserList();
} else {
this.$message({
@@ -531,7 +469,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -595,8 +532,6 @@
main {
background-color: #09152f;
margin-top: 20px;
- padding-bottom: 50px;
- border: 1pox solid #fff;
.mainTitle {
line-height: 60px;
--
Gitblit v1.8.0