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/management/myIndex/index.vue | 393 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 232 insertions(+), 161 deletions(-)
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index ff2f68a..b0f4b18 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -3,71 +3,101 @@
<header>
<div class="problem">
<div class="problem-title">闂绫诲瀷</div>
- <el-radio-group v-model="myproblem">
+ <el-radio-group v-model="myproblem" @change="changeMyProblem">
<el-radio :label="1">杩濊</el-radio>
<el-radio :label="2">杩濆缓</el-radio>
</el-radio-group>
</div>
<div class="status">
<div class="status-title">瀹℃牳鐘舵��</div>
- <el-radio-group v-model="mystatus">
- <el-radio :label="1">寰呭鏍�</el-radio>
- <el-radio :label="2">宸插鏍�</el-radio>
- <el-radio :label="3">宸茬粨妗�</el-radio>
+ <el-radio-group v-model="instatus" @change="changeInStatus">
+ <el-radio :label="7">寰呭鏍�</el-radio>
+ <el-radio :label="8">宸插鏍�</el-radio>
+ <el-radio :label="9">宸茬粨妗�</el-radio>
</el-radio-group>
</div>
</header>
- <!-- <el-button @click="dialogCreate = true">鎵撳紑</el-button>
- <div class="dialog">
- <el-dialog title="瀹℃牳璇︽儏椤甸潰" v-if="dialogCreate" :visible.sync="dialogCreate" width="80%" :before-close="handleClose">
- <MyDetail />
- </el-dialog>
- </div> -->
<main>
<div class="mainContent">
<!-- 鏁版嵁灞曠ず -->
<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">
</el-table-column>
- <el-table-column prop="name" label="瑙掕壊鍚嶇О" min-width="10">
- </el-table-column>
- <el-table-column prop="sort" label="瑙掕壊绫诲瀷" min-width="10">
- </el-table-column>
- <el-table-column prop="adminCount" label="榛樿瑙掕壊" min-width="10">
- </el-table-column>
- <el-table-column prop="description" label="澶囨敞" min-width="10">
- </el-table-column>
- <el-table-column prop="status" label="鍚敤" min-width="5">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
- <el-switch class="switchStyle" v-model="scope.row.status" active-text="寮�" inactive-text="鍏�"
- active-color="#3fef9a" inactive-color="#000212" @change="handleChangeStatus(scope.row)">
- </el-switch>
+ <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
+ </el-table-column>
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
+ <template slot-scope="scope">
+ <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column :prop="myproblem === 1 ? 'category' :'category'" :label="myproblem===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="myproblem===1?'10':'20'">
+ </el-table-column>
+ <el-table-column :prop="myproblem === 1 ? 'type' :'site'" :label="myproblem===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10">
+ </el-table-column>
+ <el-table-column :prop="myproblem === 1 ? 'actionCause' :'communityId'" :label="myproblem===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
+ </el-table-column>
+ <el-table-column :prop="myproblem === 1 ? 'site' :''" :label="myproblem===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" :min-width="myproblem===1?'10' :'20' ">
+ <template slot-scope="scope">
+ <div v-if="myproblem ===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="myproblem === 1 ? 'street' :'buildingArea'" :label="myproblem===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
+ </el-table-column>
+ <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="myproblem===1">
+ <template slot-scope="scope">
+ <span>{{filterTime(scope.row.alarmTime)}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column :prop="myproblem === 1 ? 'continueTime' :'materials'" :label="myproblem===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="15">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
- <div class="operation">
- <span>鏌ョ湅</span>
- <span class="line">|</span>
- <span>缁撴</span>
+ <div class="btn">
+ <!-- v-if="instatus===7 ? true : false" -->
+ <span @click="handleExamine(scope.row)" v-if="instatus===7">瀹℃牳</span>
+ <span @click="handleClosure(scope.row)" v-if="instatus===8">缁撴</span>
+ <span class="line" v-if="instatus !==9">|</span>
+ <span @click="JumpView(scope.row)">鏌ョ湅</span>
</div>
</template>
</el-table-column>
</el-table>
+ <!-- 瀹℃牳椤甸潰 -->
+ <el-dialog :visible.sync="dialogExamine" width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogExamine"
+ :before-close="handleClose">
+ <MyExamine :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyExamine>
+ <MyIllExamine :info="info" v-else @closeDialog="closeDialog"></MyIllExamine>
+ </el-dialog>
+ <!-- 缁撴椤甸潰 -->
+ <el-dialog :visible.sync="dialogClosure" width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogClosure"
+ :before-close="handleClose">
+ <MyClosure :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyClosure>
+ <MyIllClosure :info="info" v-else @closeDialog="closeDialog"></MyIllClosure>
+ </el-dialog>
+ <!-- 璇︽儏椤甸潰 -->
+ <el-dialog :visible.sync="dialogView" width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
+ :before-close="handleNoClose">
+ <MyDetail :info=info v-if="myproblem === 1" :mycode = 'code'></MyDetail>
+ <MyIllDetail :info=info v-else :mycode="code"></MyIllDetail>
+ </el-dialog>
<!-- tools -->
- <div class="tools">
+ <!-- <div class="tools">
<div class="funs">
- <div class="funsItem">
+ <div class="funsItem funs-sp">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
- <div class="funsItem">
+ <div class="funsItem funs-sp">
<el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
</div>
<div class="funsItem">
- <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange">
+ <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange" disabled>
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" :disabled="item.disabled">
</el-option>
@@ -80,22 +110,30 @@
@prev-click="handlePrev" @next-click="handleNext">
</el-pagination>
</div>
- </div>
+ </div> -->
</div>
</main>
</div>
</template>
<script>
-import helper from "@/utils/mydate.js"
-import MyDetail from "@/components/detail"
+import MyExamine from './components/examine'
+import MyClosure from './components/closure'
+import MyIllExamine from './components/illExamine'
+import MyIllClosure from './components/illclosure'
+import MyDetail from '@/components/detail'
+import MyIllDetail from '@/components/illdetail'
+import helper from '@/utils/mydate'
export default {
- components:{
- MyDetail,
+ components: {
+ MyExamine,MyClosure,MyDetail,MyIllDetail,MyIllExamine,MyIllClosure
},
data() {
return {
tableData: [],
- dialogCreate: false,
+ dialogExamine:false,
+ dialogClosure:false,
+ dialogView:false,
+ info: {},
totalNum: null,
pageSize: 10,
currentPage: 1,
@@ -123,20 +161,47 @@
}
],
tempList: [],
- myproblem: 0,
- mystatus: 0,
+ typeList: [
+ {
+ name: '杩濊',
+ value: 1,
+ checked: true
+ },
+ {
+ name: '杩濆缓',
+ value: 2,
+ checked: false,
+ },
+ ],
+ caseId: '',
+ myproblem: 1,
+ instatus: 7,
+ code:''
}
},
created() {
this.getUserList();
},
methods: {
+ // 鎵归噺鍒犻櫎
+ mulDelete(idArr) {
+ this.$axios({
+ method: 'delete',
+ url: 'sccg/violations/batch_delete?ids=' + idArr,
+ }).then(res => {
+ this.getUserList();
+ this.$message({
+ message: res.message,
+ type: res.code === 200 ? 'success' : 'warning'
+ })
+ })
+ },
+ // 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
- this.handleDelete(this.tempList);
+ this.mulDelete(this.tempList);
}
} else {
this.myIdx = this.preMyIdx;
@@ -146,159 +211,149 @@
})
}
},
+ // 鐩戝惉琛ㄦ牸
tableChange(list) {
this.tempList = [];
list.forEach(item => {
- this.tempList.push(item.id);
+ this.tempList.push(item.code);
})
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
- changeTime({ createTime }) {
- return helper(createTime);
- },
+ // 鍏ㄩ��
selectAll() {
this.$refs.multipleTable.toggleAllSelection();
},
+ // 鍙嶉��
disSame(list) {
list.forEach(row => {
this.$refs.multipleTable.toggleRowSelection(row)
})
},
- handleDelete(id) {
- const that = this;
- // let arr = [];
- // arr.push(id);
+ // 鍒犻櫎鍗曟潯鏁版嵁
+ handleDelete({ number }) {
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
- that.$axios({
- method: 'post',
- url: 'sccg/role/delete?ids=' + id,
+ this.$axios({
+ method: 'delete',
+ url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- this.myIdx = 0;
- this.preMyIdx = 0;
- console.log(res);
this.$message({
- type: 'success',
+ type: res.code === 200 ? 'success' : 'warning',
message: res.message
})
this.getUserList();
})
})
- .catch(_ => { });
- },
- // 淇敼瑙掕壊
- handleChangeRole(obj) {
- this.dialogUpdate = true
- this.user = obj;
- // console.log(obj)
- },
- // 淇敼鐢ㄦ埛鐘舵��
- handleChangeStatus(obj) {
- let { id, status } = obj;
- status == true ? status = 1 : status = 0;
- console.log(id, status);
- this.$axios.post(`/sccg/role/updateStatus/` + id + '?status=' + status).then(res => {
- console.log(res);
- })
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
- const that = this;
- this.dialogCreate = false;
- // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- this.$axios.get('sccg/role/listAll').then(res => {
- this.totalNum = res.data.length;
- this.search();
+ const { currentPage, pageSize, instatus, myproblem } = this;
+ this.$axios({
+ method: 'get',
+ url: `sccg/base_case/query?state=${instatus}¤t=${currentPage}&size=${pageSize}&type=${myproblem}`
+ }).then(res => {
+ this.totalNum = res.data.total;
+ this.tableData = res.data.records;
})
- },
- search() {
- const that = this;
- const { currentPage, pageSize, context } = this;
- this.dialogCreate = false;
- // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- if (context == '') {
- this.$axios.get('sccg/role/list?keyword=' + '&pageNum=' + currentPage + '&pageSize=' + pageSize).then(res => {
- if (res.code === 200) {
- console.log(res);
- res.data.list.forEach(item => {
- // item.createTime = helper(item.createTime);
- item.status == 1 ? item.status = true : item.status = false;
- })
- that.tableData = res.data.list;
- this.totalNum = res.data.list.length;
- }
- })
- } else {
- this.$axios({
- method: 'get',
- url: 'sccg/role/list?keyword=' + context + '&pageNum=' + currentPage + '&pageSize=' + pageSize,
- }).then(res => {
- if (res.code === 200) {
- res.data.list.forEach(item => {
- item.status == 1 ? item.status = true : item.status = false;
- })
- that.tableData = res.data.list
- this.totalNum = res.data.list.length;
- }
- })
- }
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
- },
- // 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
- handleFind(rowData) {
- this.dialogUpdate = true;
- this.updateFlag = false;
- this.userInfo = rowData;
- },
- // 淇敼鐢ㄦ埛閮ㄩ棬淇℃伅
- handleUpdate(rowData) {
- this.dialogUpdate = true;
- this.updateFlag = true;
- this.userInfo = rowData
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.search();
+ this.getUserList();
},
// 涓婁竴椤电偣鍑讳簨浠�
handlePrev(page) {
this.currentPage = page;
- this.search();
+ this.getUserList();
},
// 涓嬩竴椤电偣鍑讳簨浠�
handleNext(page) {
this.currentPage = page;
- this.search();
- },
- changeDialog(val) {
- this.dialogUpdate = val.dialogUpdate;
- this.$message({
- type: 'success',
- message: '鏇存敼鎴愬姛',
- })
+ this.getUserList();
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
.then(_ => {
- this.dialogCreate = false;
+ this.dialogExamine = false;
done();
})
.catch(_ => { });
+ },
+ handleNoClose(done) {
+ done();
+ },
+ async JumpView(data) {
+ this.code = data.code
+ await this.getEventInfo(data.code);
+ },
+ // 鑾峰彇妗堜欢淇℃伅
+ getEventInfo(code) {
+ this.$axios({
+ method: 'get',
+ url: `sccg/base_case/baseCaseDetail/${code}`
+ })
+ .then(res => {
+ this.info = res.data;
+ this.dialogView = true;
+ })
+ },
+ // 鑾峰彇妗堜欢淇℃伅
+ getEventInfo3(code) {
+ this.$axios({
+ method: 'get',
+ url: `sccg/base_case/baseCaseDetail/${code}`
+ })
+ .then(res => {
+ this.info = res.data;
+ this.dialogExamine = true;
+ })
+ },
+ // 鑾峰彇妗堜欢淇℃伅
+ getEventInfo2(code) {
+ this.$axios({
+ method: 'get',
+ url: `sccg/base_case/baseCaseDetail/${code}`
+ })
+ .then(res => {
+ this.info = res.data;
+ this.dialogClosure = true;
+ })
+ },
+ // 鍘诲鏍�
+ handleExamine({code}) {
+ this.getEventInfo3(code);
+ },
+ // 鍘荤粨妗�
+ handleClosure({code}){
+ this.getEventInfo2(code);
+ },
+ // 鍏抽棴dialog
+ closeDialog({flag}){
+ this.dialogExamine = flag;
+ this.dialogClosure = flag;
+ this.getUserList();
+ },
+ // 闂绫诲瀷
+ changeMyProblem(val){
+ this.getUserList();
+ },
+ // 瀹℃牳鐘舵��
+ changeInStatus(val){
+ this.getUserList();
+ },
+ filterTime(time){
+ return helper(time);
}
}
}
@@ -310,7 +365,7 @@
color: #4b9bb7;
header {
- background-color: #09152f;
+ // background-color: #09152f;
padding: 10px 20px;
.problem,
@@ -326,16 +381,18 @@
}
}
+ &::v-deep .el-input__inner {
+ // background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+
main {
- background-color: #09152f;
+ // background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
-
- .mainTitle {
- line-height: 60px;
+ .btn span:hover{
+ cursor: pointer;
}
-
.tools {
display: flex;
justify-content: space-between;
@@ -344,12 +401,13 @@
.funs {
display: flex;
-
+ .funs-sp{
+ border: 1px solid #17324c;
+ }
.funsItem {
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
@@ -365,7 +423,7 @@
&::v-deep .el-input__inner {
border: none;
- background-color: #09152f;
+ // background-color: #09152f;
}
&:hover {
@@ -403,12 +461,21 @@
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
- &::v-deep .el-table__empty-block {
- background-color: #09152f;
+ &::v-deep .cell {
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ .el-checkbox {
+ display: none;
+ }
}
+
+ // &::v-deep .el-table__empty-block {
+ // background-color: #09152f;
+ // }
&::v-deep .el-table__empty-block {
color: #4b9bb7;
@@ -427,9 +494,9 @@
}
}
- .el-table::v-deep .warning-row {
- background: #06122c;
- }
+ // .el-table::v-deep .warning-row {
+ // background: #06122c;
+ // }
.el-table::v-deep .success-row {
background: #071f39;
@@ -465,11 +532,15 @@
}
}
- &::v-deep .el-dialog__header,
- &::v-deep .el-dialog__body {
- background-color: #06122c;
+ .line {
+ padding: 0 5px;
}
+ &::v-deep .el-dialog__header,
+ // &::v-deep .el-dialog__body {
+ // background-color: #06122c;
+ // }
+
&::v-deep .el-dialog__header {
display: flex;
align-items: center;
--
Gitblit v1.8.0