From 0c9e6566ac342748632e146fbe78872267c53bb8 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 25 十一月 2022 15:24:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/myWait/index.vue | 192 +++++++++++++++---------------------------------
1 files changed, 60 insertions(+), 132 deletions(-)
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index 163a582..5a99668 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -1,24 +1,17 @@
<template>
<div class="userList">
<div class="headerTitle">
- 杩愯惀绠＄悊銆嬪熀纭�璁剧疆銆嬭繚瑙勪簨椤硅缃�
+ 杩愯惀绠＄悊銆嬫垜鐨勫緟鍔�
</div>
<header>
<div class="headerContent">
<div class="search">
- <span>绛涢�夋潯浠�:</span>
- <el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="context"></el-input>
+ <span>浜嬩欢缂栧彿:</span>
+ <el-input placeholder="璇疯緭鍏ヤ簨浠剁紪鍙�" v-model="context"></el-input>
<div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
+ <el-button type="primary" @click="getTableData">鏌ヨ</el-button>
</div>
</div>
- <!-- <div class="addUser">
- <el-button class="addBtn" type="primary" @click="dialogCreate = true">鏂板杩濊绫诲瀷</el-button>
- <el-dialog :visible.sync="dialogCreate" title="鏂板杩濊绫诲瀷" width="45%" v-if="dialogCreate"
- :before-close="handleClose">
- <createUser :refresh="getUserList" />
- </el-dialog>
- </div> -->
</div>
</header>
<main>
@@ -30,35 +23,32 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="number" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
</el-table-column>
- <el-table-column prop="typeThird" label="闂灏忕被" min-width="10">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
+ <template slot-scope="scope" v-if="scope.row">
+ <span>{{ getEventSource(scope.row.eventSource)?.label }}</span>
+ </template>
</el-table-column>
- <el-table-column prop="typeSecond" label="闂鎻忚堪" min-width="10">
+ <el-table-column prop="category" label="闂绫诲埆" min-width="10">
+ <template slot-scope="scope" v-if="scope.row">
+ <span>{{ getCategory(scope.row.category)?.label }}</span>
+ </template>
</el-table-column>
- <el-table-column prop="typeFirst" label="鍒涘缓鏃堕棿" min-width="10">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
</el-table-column>
- <el-table-column prop="type" label="鍓╀綑鏃堕棿" min-width="10">
+ <el-table-column prop="limitTime" label="鍓╀綑鏃堕棿" min-width="10">
</el-table-column>
- <el-table-column prop="type" label="闂鐘舵��" min-width="10">
+ <el-table-column prop="stepName" label="闂鐘舵��" min-width="10">
</el-table-column>
<el-table-column min-width="10">
</el-table-column>
- <!-- <el-table-column prop="operation" label="鎿嶄綔" min-width="10">
- <template slot-scope="scope">
- <div class="operation">
- <span @click="handleFind(scope.row)">鏌ョ湅</span>
- <span class="line">|</span>
- <span @click="handleDelete(scope.row)">鍒犻櫎</span>
- </div>
- </template>
- </el-table-column> -->
</el-table>
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '鏉冮檺璁剧疆' :'鏌ョ湅瑙掕壊淇℃伅'"
- v-if="dialogUpdate" :before-close="handleClose">
- <updateUser :updateFlag="updateFlag" :userInfo=userInfo
- :getUserList=" context ? getUserList : getUserList" @changeDialog="changeDialog" />
+ :destroy-on-close="true" :key="updateFlag" :before-close="handleClose">
+ <updateUser v-if="dialogUpdate" :updateFlag="updateFlag" :userInfo=userInfo
+ :getTableData=" context ? getTableData : getTableData" @changeDialog="changeDialog" />
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -79,8 +69,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>
@@ -91,6 +80,11 @@
<script>
import updateUser from "./updateUser"
import createUser from "./createUser"
+import {computeTime} from '@/utils/helper'
+import filterTime from '@/utils/mydate'
+import myWait from "@/api/operate/myWait";
+import { CATEGOTY, RESOURCE_TYPE } from "@/utils/helper";
+
export default {
components: {
updateUser,createUser
@@ -98,7 +92,7 @@
data() {
return {
tableData: [],
- context: "",
+ context: null,
dialogCreate: false,
dialogUpdate: false,
updateFlag: false,
@@ -132,22 +126,20 @@
}
},
created() {
- this.getUserList();
+ this.getTableData();
},
methods: {
- // 鎵归噺鍒犻櫎
- mulDelete(idArr){
- console.log(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'
- })
+ getTableData() {
+ myWait.getMybackLog({ num: this.context })
+ .then(res => {
+ this.tableData = res;
+ this.tableData = this.tableData.filter(item => !!item);
})
+ .catch(err => this.$message({ type: 'error', message: err }))
+ },
+
+ // 鎵归噺鍒犻櫎
+ mulDelete(idArr){
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(val) {
@@ -169,11 +161,7 @@
// 鐩戝惉琛ㄦ牸閫変腑鐘舵��
tableChange(list) {
this.tempList = list;
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 鍏ㄩ��
selectAll() {
@@ -187,78 +175,14 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
- this.$confirm('纭鍒犻櫎锛�')
- .then(_ => {
- console.log(1);
- this.$axios({
- method: 'delete',
- url: `sccg/violations/delete?id=${number}`,
- })
- .then(res => {
- console.log(res);
- this.$message({
- type: res.code === 200 ? 'success' : 'warning',
- message: res.message
- })
-
- this.getUserList();
- })
- })
- .catch(_ => { console.log(2) });
},
- // 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const { currentPage, pageSize, context } = this;
- // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- this.$axios({
- method: 'get',
- url: `sccg/violations/query?current=${currentPage}&size=${pageSize}&keyWord=${context}`,
- })
- .then(res => {
- this.tableData = res.data.records;
- this.totalNum = res.data.total;
- })
- },
- // search() {
- // const that = this;
- // const { currentPage, pageSize, context } = this;
- // // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- // 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) {
@@ -269,31 +193,37 @@
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.getUserList();
- },
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
- this.currentPage = page;
- this.getUserList();
+ this.getTableData();
},
changeDialog(val) {
this.dialogUpdate = val.dialogUpdate;
- console.log(val);
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
+ .then(() => {
this.dialogCreate = false;
this.dialogUpdate = false;
done();
})
- .catch(_ => { });
- }
+ .catch(() => { });
+ },
+ // 璁＄畻鏃堕棿
+ getRestTime(time2){
+ return computeTime(time2);
+ },
+ // 鏀瑰彉鏃ユ湡鏍煎紡
+ changeTime(time){
+ if(time){
+ return filterTime(time);
+ }
+ },
+ getCategory(code) {
+ return CATEGOTY.find(item => item.value === code);
+ },
+
+ getEventSource(code) {
+ return RESOURCE_TYPE.find(item => item.value === code);
+ }
}
}
</script>
@@ -309,7 +239,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -364,7 +293,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.mainTitle {
line-height: 60px;
--
Gitblit v1.8.0