From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/pool/index.vue | 227 ++++++++++++++++++++++----------------------------------
1 files changed, 91 insertions(+), 136 deletions(-)
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index 7af8961..f0e2f53 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -5,8 +5,8 @@
<div class="search">
<span>鏉ユ簮鏌ヨ:</span>
<div class="option">
- <el-select v-model="mystatus" placeholder="杩濊" @change="setMystatus">
- <el-option v-for="item in typeList" :key="item.label" :label="item.name"
+ <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>
@@ -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">
@@ -29,7 +29,7 @@
<MyIll v-if="newAddType === 1" :refresh="getUserList" :mytype=newAddType
@changeDialog=changeDialog />
<!-- 杩濊鐧昏 -->
- <myVio v-else :mytype=newAddType @changeDialog=changeDialog :refresh="getUserList" />
+ <myVio v-else :refresh="getUserList" :mytype=newAddType @changeDialog=changeDialog />
</el-dialog>
</div>
</div>
@@ -47,7 +47,7 @@
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
+ :header-cell-style="{'font-weight':'650','line-height':'45px'}"
:data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
@@ -59,29 +59,33 @@
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
- <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
+ <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婁紶' : '瑙嗛宸℃煡'}}</span>
</template>
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'category' :'category'" :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'20'">
+ <el-table-column :prop="mystatus === 1 ? 'category' :'category'"
+ :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'15'">
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10">
+ <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' ">
+ <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'"
+ :min-width="mystatus===1?'10' :'20' ">
<template slot-scope="scope">
- <div v-if="mystatus ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+ scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div>
+ <div v-if="mystatus ===2"><span>{{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 :prop="mystatus === 1 ? 'street' :'buildingArea'" :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'"
+ :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="12">
</el-table-column>
<el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1">
<template slot-scope="scope">
<span>{{filterTime(scope.row.alarmTime)}}</span>
</template>
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'" :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'"
+ :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="12">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
@@ -101,23 +105,23 @@
</el-table-column>
</el-table>
<!-- 璇︽儏椤靛睍绀� -->
- <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
+ <el-dialog :visible.sync="dialogView" width="60%" 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>
<!-- 璋冨害 -->
- <el-dialog :visible.sync="dialogDispatch" width="80%" title="璋冨害淇℃伅" v-if="dialogDispatch"
+ <el-dialog :visible.sync="dialogDispatch" width="60%" title="璋冨害淇℃伅" v-if="dialogDispatch"
:before-close="handleClose">
<MyDispatch :id="baseId" :mytype="mystatus" @changeDialog="changeDialog" :refresh="getUserList">
</MyDispatch>
</el-dialog>
<!-- tools -->
<div class="tools">
- <div class="funs">
+ <!-- <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>
@@ -129,11 +133,10 @@
</el-option>
</el-select>
</div>
- </div>
+ </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>
@@ -149,25 +152,16 @@
import MyVio from './createUser/vio'
import MyDispatch from '@/components/dispatch'
import helper from '@/utils/mydate'
+import { RESOURCE_OPTIONS } from "@/utils/helper";
+import basecase from "@/api/operate/basecase";
+
export default {
components: {
createUser, MyIll, MyVio, MyDetail, MyDispatch, MyIllDetail
},
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,
@@ -240,10 +234,11 @@
checked: false,
},
],
+ eventSourceOptions: RESOURCE_OPTIONS,
mystatus: 1,
statusArr: [],
- baseId: 0
-
+ baseId: 0,
+ resource: null
}
},
created() {
@@ -265,13 +260,6 @@
this.baseId = data.id;
this.dialogDispatch = true;
},
- // 椤堕儴涓嬫媺妗�
- setMystatus(value) {
- console.log(value);
- this.statusArr[1] = value;
- this.changeTypeChecked(value - 1);
- this.getUserList();
- },
// 閫夋嫨杩濊杩濆缓
setDialog({ flag, type }) {
this.dialogCreate = flag;
@@ -280,7 +268,6 @@
},
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
- console.log(idArr instanceof Array);
const { statusArr } = this;
this.$confirm('鎮ㄧ‘瀹氳鎵归噺鍒犻櫎妗堜欢鍚�?')
.then(_ => {
@@ -302,11 +289,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;
@@ -326,11 +312,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() {
@@ -344,56 +326,42 @@
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
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 = [];
+ const params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: this.resource,
+ type: this.statusArr[1] ?? null
+ }
+ basecase.baseCasePoolList(params)
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
})
+ .catch(err => this.$message.error(err))
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
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('纭鍏抽棴锛�')
@@ -409,12 +377,9 @@
// 鏇存敼涓�绾ф爣绛剧殑閫変腑
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;
this.typeList[1].checked = false;
this.statusArr[0] = this.tagList[idx].value;
@@ -424,11 +389,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;
@@ -439,26 +400,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: '娓╅Θ鎻愮ず',
@@ -466,10 +423,6 @@
type: 'success',
position: 'bottom-right'
})
- // this.$message({
- // type:'success',
- // message:'鎿嶄綔鎴愬姛',
- // })
this.getUserList();
} else {
this.$message({
@@ -481,13 +434,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: '娓╅Θ鎻愮ず',
@@ -495,10 +446,6 @@
type: 'success',
position: 'bottom-right'
})
- // this.$message({
- // type:'success',
- // message:'鎿嶄綔鎴愬姛',
- // })
this.getUserList();
} else {
this.$message({
@@ -509,7 +456,7 @@
})
},
// 澶勭悊鏃堕棿
- filterTime(time){
+ filterTime(time) {
return helper(time);
}
}
@@ -522,8 +469,7 @@
color: #4b9bb7;
header {
- background-color: #09152f;
- border: 1pox solid #fff;
+ // background-color: #09152f;
.headerContent {
padding: 0 40px;
@@ -583,11 +529,10 @@
}
}
}
+
main {
- background-color: #09152f;
+ // background-color: #09152f;
margin-top: 20px;
- padding-bottom: 50px;
- border: 1pox solid #fff;
.mainTitle {
line-height: 60px;
@@ -609,16 +554,17 @@
}
.is-active {
- background-color: #070f22;
- color: #fff;
+ // background-color: #070f22;
+ color: #333;
+ font-size: 500;
}
}
.type-nav {
display: flex;
line-height: 40px;
- margin-left: 30px;
- margin-top: 2px;
+ // margin-left: 30px;
+ // margin-top: 2px;
.type-item {
width: 80px;
@@ -630,9 +576,10 @@
}
.is-active {
- background-color: #070f22;
+ // background-color: #070f22;
border-radius: 4px;
- color: #fff;
+ color: #333;
+ font-size: 500;
}
}
@@ -644,9 +591,11 @@
.funs {
display: flex;
- .funs-sp{
+
+ .funs-sp {
border: 1px solid #17324c;
}
+
.funsItem {
line-height: 28px;
display: flex;
@@ -664,13 +613,13 @@
width: 120px;
}
- &:hover {
- border: 1px solid #4b9bb7;
- }
+ // &:hover {
+ // border: 1px solid #4b9bb7;
+ // }
- &:hover .el-checkbox {
- color: #4b9bb7;
- }
+ // &:hover .el-checkbox {
+ // color: #4b9bb7;
+ // }
}
}
@@ -683,31 +632,37 @@
.el-pagination {
- &::v-deep li,
- &::v-deep .btn-prev,
- &::v-deep .btn-next {
- background-color: #071f39;
- color: #4b9bb7;
- }
+ // &::v-deep li,
+ // &::v-deep .btn-prev,
+ // &::v-deep .btn-next {
+ // // background-color: #071f39;
+ // color: #4b9bb7;
+ // }
- &::v-deep .active {
- background-color: #409eff;
- color: #fff;
- }
+ // &::v-deep .active {
+ // background-color: #409eff;
+ // color: #fff;
+ // }
}
}
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
- margin-top: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
+ // margin-top: 10px;
&::v-deep .cell {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
+ // display: none;
+ .el-checkbox{
+ display:none
}
+ }
+
+
.operation {
display: flex;
--
Gitblit v1.8.0