From ca150d38b8ecb9c69b0b32ac865e28fcf8c8fc8f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 28 十一月 2022 16:14:44 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/myWait/index.vue | 561 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 386 insertions(+), 175 deletions(-)
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index 2271aa5..5a99668 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -1,252 +1,463 @@
<template>
- <div class="otherInterface">
+ <div class="userList">
+ <div class="headerTitle">
+ 杩愯惀绠＄悊銆嬫垜鐨勫緟鍔�
+ </div>
<header>
- <div class="headerTitle">杩愯惀绠＄悊 >> 鍩虹璁剧疆 > 鎴戠殑寰呭姙</div>
+ <div class="headerContent">
+ <div class="search">
+ <span>浜嬩欢缂栧彿:</span>
+ <el-input placeholder="璇疯緭鍏ヤ簨浠剁紪鍙�" v-model="context"></el-input>
+ <div class="findBtn">
+ <el-button type="primary" @click="getTableData">鏌ヨ</el-button>
+ </div>
+ </div>
+ </div>
</header>
<main>
- <div class="mainHeader">
- <span>绛涢�夋潯浠�:</span>
- <el-input placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
- </div>
<div class="mainContent">
- <!-- @selection-change="handleSelectionChange" -->
- <!-- 鏁版嵁娓叉煋 -->
- <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+ <!-- 鏁版嵁灞曠ず -->
+ <el-table ref="multipleTable"
:header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
- :row-class-name="tableRowClassName">
- <el-table-column type="selection" width="55">
+ :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 label="浜嬩欢缂栧彿" prop="applicationName" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
</el-table-column>
- <el-table-column prop="applicationType" label="闂灏忕被" min-width="10">
- </el-table-column>
- <el-table-column prop="websiteUrl" label="闂鎻忚堪" min-width="10">
- </el-table-column>
- <el-table-column prop="applicationType" label="鍒涘缓鏃堕棿" min-width="10">
- </el-table-column>
- <el-table-column prop="applicationType" label="鍓╀綑鏃堕棿" min-width="10">
- </el-table-column>
- <el-table-column prop="applicationType" label="闂鐘舵��" min-width="10">
- </el-table-column>
- <!-- <el-table-column label="鎿嶄綔" min-width="10">
- <template slot-scope="scope">
- <span @click="handleView(scope.row)">鏌ョ湅</span>
- <span class="line">|</span>
- <span @click="handleDelete(scope.row)">鍒犻櫎</span>
+ <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>
+ <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="createTime" label="鍒涘缓鏃堕棿" min-width="10">
+ </el-table-column>
+ <el-table-column prop="limitTime" label="鍓╀綑鏃堕棿" min-width="10">
+ </el-table-column>
+ <el-table-column prop="stepName" label="闂鐘舵��" min-width="10">
+ </el-table-column>
+ <el-table-column min-width="10">
+ </el-table-column>
</el-table>
- <!-- 鍒嗛〉 -->
- <!-- <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">
- </el-pagination>
- </div> -->
+ <!-- 鏌ョ湅淇敼椤甸潰 -->
+ <el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '鏉冮檺璁剧疆' :'鏌ョ湅瑙掕壊淇℃伅'"
+ :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">
+ <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>
</main>
- <footer>
- <!-- 鍒涘缓寮圭獥 -->
- <el-dialog :visible.sync="dialogCreate" title="鏂板绗笁鏂规帴鍙�" width="45%" v-if="dialogCreate"
- :before-close="handleClose">
- <createInterface />
- </el-dialog>
- <!-- 鏌ョ湅寮圭獥 -->
- <el-dialog :visible.sync="dialogUpdate" :title="updateFlag ?'淇敼绗笁鏂规帴鍙�':'鏌ョ湅绗笁鏂规帴鍙�'" width="45%"
- v-if="dialogUpdate" :before-close="handleClose">
- <viewInterface :updateFlag="updateFlag" :userInfo=userInfo />
- </el-dialog>
- </footer>
</div>
</template>
<script>
-import createInterface from './components/createInterface';
-import viewInterface from './components/viewInterface'
+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: {
- createInterface, viewInterface
+ updateUser,createUser
},
data() {
return {
tableData: [],
- search: "",
+ context: null,
dialogCreate: false,
dialogUpdate: false,
updateFlag: false,
userInfo: '',
- // totalNum: 200,
- // pageSize: 10,
- // currentPage: 1,
+ totalNum: null,
+ pageSize: 10,
+ currentPage: 1,
+ all: false,
+ unsame: false,
+ myIdx: 0,
+ options: [
+ {
+ value: 0,
+ label: '鎵归噺鎿嶄綔',
+ disabled: true,
+ },
+ {
+ value: 1,
+ label: '鎵归噺鍚敤',
+ },
+ {
+ value: 2,
+ label: '鎵归噺绂佺敤',
+ },
+ {
+ value: 3,
+ label: '鎵归噺鍒犻櫎',
+ }
+ ],
+ tempList: []
}
},
created() {
- this.getUserList();
+ this.getTableData();
},
methods: {
- // 鑾峰彇鎺ュ彛鍒楄〃
- getUserList() {
- const that = this;
- // const { currentPage, pageSize, search } = this;
- this.dialogCreate = false;
- this.$axios.get("sccg/system/portal/thirdApp/search").then(res => {
- const { code, data } = res;
- if (code == 200) {
- this.tableData = data;
- }
+ 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) {
+ 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)
+ })
+ },
+ // 鍒犻櫎鍗曟潯鏁版嵁
+ handleDelete({ number }) {
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
- // 鎵撳紑鏂板鐣岄潰
- handleAdd() {
- this.dialogCreate = true;
+ // 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
+ handleFind(rowData) {
+ this.dialogUpdate = true;
+ this.updateFlag = false;
+ this.userInfo = rowData;
},
- // 鍒涘缓寮圭獥鍏抽棴
+ // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
+ changeCurrentPage(page) {
+ this.currentPage = page;
+ this.getTableData();
+ },
+ changeDialog(val) {
+ this.dialogUpdate = val.dialogUpdate;
+ },
handleClose(done) {
- const that = this;
this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
- that.dialogCreate = false;
+ .then(() => {
+ this.dialogCreate = false;
+ this.dialogUpdate = false;
done();
})
- .catch(_ => { });
+ .catch(() => { });
},
- // 鍒涘缓鏌ョ湅寮圭獥
- handleView(rowData) {
- this.userInfo = rowData;
- this.dialogUpdate = true;
+ // 璁＄畻鏃堕棿
+ getRestTime(time2){
+ return computeTime(time2);
},
- // 鍒犻櫎绗笁鏂规帴鍙�
- handleDelete({ id }) {
- console.log(id);
- this.$axios.delete('sccg/system/portal/thirdApp/delete', {
- params: {
- id
- }
- }).then(res => {
- console.log(res);
- })
- }
- // // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
- // changeCurrentPage(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
- // // 涓婁竴椤电偣鍑讳簨浠�
- // handlePrev(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
- // // 涓嬩竴椤电偣鍑讳簨浠�
- // handleNext(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
+ // 鏀瑰彉鏃ユ湡鏍煎紡
+ 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>
-<!-- sccg/system/portal/thirdApp/search -->
<style lang="scss" scoped>
-.otherInterface {
+.userList {
+ text-align: left;
+ margin: 10px 20px;
+ color: #4b9bb7;
+
+ .headerTitle {
+ line-height: 40px;
+ }
+
header {
- display: flex;
- line-height: 60px;
- justify-content: space-between;
- padding: 0 20px;
- color: #4b9bb7;
- &::v-deep .el-button {
- background-color: #eb5d01;
- border: none;
- color: #fff;
- border-radius: 20px;
+ background-color: #09152f;
+
+ .headerContent {
+ padding: 0 40px;
+ display: flex;
+ line-height: 100px;
+ justify-content: space-between;
+ align-items: center;
+
+ .search {
+ display: flex;
+ justify-content: flex-start;
+
+ span {
+ flex: 1;
+ }
+
+ .el-input {
+ flex: 2;
+ color: #1d3f57;
+
+ &::v-deep .el-input__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+ }
+
+ }
+
+ .findBtn {
+ line-height: 100px;
+ margin-left: 15px;
+ display: flex;
+ align-items: center;
+ margin-top: -2px;
+
+ .el-button {
+ padding: 12px 25px;
+ border-radius: 20px;
+ }
+ }
+
+ .addBtn {
+ background-color: #eb5d01;
+ border: none;
+ border-radius: 20px;
+ padding: 12px 30px;
+ }
}
}
main {
- padding: 10px 20px;
+ background-color: #09152f;
+ margin-top: 20px;
+ padding-bottom: 50px;
- .mainHeader {
- padding-left: 20px;
- display: flex;
+ .mainTitle {
line-height: 60px;
- color: #4b9bb7;
- background-color: #09152f;
- .el-input {
- width: 180px;
- height: 35px;
- margin-left: 10px;
+ }
- &::v-deep .el-input__inner {
- background-color: #09152f;
+ .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 #17324c;
+ 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;
+ }
}
}
}
- .mainContent {
- margin-top: 20px;
- .el-table {
+ .el-table {
+ color: #4b9bb7;
+ font-size: 10px;
+
+ &::v-deep .cell {
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ }
+
+ &::v-deep .el-table__empty-block {
+ background-color: #09152f;
+ }
+
+ &::v-deep .el-table__empty-block {
color: #4b9bb7;
-
- &::v-deep .el-table__empty-block {
- background-color: #06122c;
- }
-
- &::v-deep .el-table__empty-text {
- color: #4b9bb7;
- }
-
- &::v-deep .warning-row {
- background-color: #06122c;
- }
-
- &::v-deep .success-row {
- background-color: #071f39;
- }
}
- .line {
- padding: 0 5px;
- // margin-top: -10px;
+ .operation {
+ display: flex;
+
+ .line {
+ padding: 0 5px;
+ }
+
+ span:hover {
+ cursor: pointer;
+ }
}
+ }
+
+ .el-table::v-deep .warning-row {
+ background: #06122c;
+ }
+
+ .el-table::v-deep .success-row {
+ background: #071f39;
+ }
+
+ &::v-deep .switchStyle .el-switch__label {
+ position: absolute;
+ display: none;
+ color: #fff;
+ }
+
+ &::v-deep .el-switch__core {
+ background-color: rgba(166, 166, 166, 1);
+ }
+
+ &::v-deep .switchStyle .el-switch__label--left {
+ z-index: 9;
+ left: 20px;
+ }
+
+ &::v-deep .switchStyle .el-switch__label--right {
+ z-index: 9;
+ left: 4px;
+ }
+
+ &::v-deep .switchStyle .el-switch__label.is-active {
+ display: block;
+ }
+
+ &::v-deep .switchStyle.el-switch .el-switch__core,
+ &::v-deep .el-switch .el-switch__label {
+ width: 50px !important;
}
}
- footer {
+ &::v-deep .el-dialog__header,
+ &::v-deep .el-dialog__body {
+ background-color: #06122c;
+ }
- &::v-deep .el-dialog__header,
- &::v-deep .el-dialog__body {
- background-color: #06122c;
- }
+ &::v-deep .el-dialog__header {
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ padding: 20px;
+ line-height: 60px;
+ }
- &::v-deep .el-dialog__header {
- display: flex;
- align-items: center;
- background-color: #fff;
- padding: 20px;
- line-height: 60px;
- }
+ &::v-deep .el-dialog__title {
+ color: #4b9bb7;
+ }
- &::v-deep .el-dialog__title {
- color: #4b9bb7;
- }
+ &::v-deep .el-dialog__close {
+ width: 20px;
+ height: 20px;
+ // color: #fff;
+ }
- &::v-deep .el-dialog__close {
- width: 20px;
- height: 20px;
- // color: #fff;
- }
-
- &::v-deep .el-dialog__body {
- padding: 0;
- }
+ &::v-deep .el-dialog__body {
+ padding: 0;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0