From 9b7032666d105dc6abde1b8c7f1cfb2b5f1c989e Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期五, 17 二月 2023 11:28:11 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/rectification/taskList/index.vue | 116 +++++++++++++++++++++++++++------------------------------
1 files changed, 55 insertions(+), 61 deletions(-)
diff --git a/src/views/operate/rectification/taskList/index.vue b/src/views/operate/rectification/taskList/index.vue
index 2861eba..400f7db 100644
--- a/src/views/operate/rectification/taskList/index.vue
+++ b/src/views/operate/rectification/taskList/index.vue
@@ -6,7 +6,7 @@
<main>
<div class="mainHeader">
<div class="add">
- <el-button type="primary" icon="el-icon-plus">鏂板浠诲姟</el-button>
+ <el-button type="primary" icon="el-icon-plus" @click="addTask()">鏂板浠诲姟</el-button>
</div>
<div class="date-search">
<span>鎸夊ぉ鏌ヨ:</span>
@@ -27,32 +27,31 @@
</div>
</div>
<div class="mainContent">
- <!-- @selection-change="handleSelectionChange" -->
<!-- 鏁版嵁娓叉煋 -->
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
+ :header-cell-style="{background:'#06122c','font-weight':'650','line-height':'45px'}"
:row-class-name="tableRowClassName">
<el-table-column type="selection" width="55">
</el-table-column>
- <el-table-column label="浠诲姟缂栧彿" prop="applicationName" min-width="10">
+ <el-table-column prop="number" label="浠诲姟缂栧彿" min-width="10">
</el-table-column>
- <el-table-column prop="applicationType" label="鏍囬" min-width="10">
+ <el-table-column prop="title" label="鏍囬" min-width="10">
</el-table-column>
- <el-table-column prop="websiteUrl" label="绫诲瀷" min-width="10">
+ <el-table-column prop="type" label="绫诲瀷" min-width="10">
</el-table-column>
- <el-table-column prop="applicationType" label="绾у埆" min-width="10">
+ <el-table-column prop="level" label="绾у埆" min-width="10">
</el-table-column>
- <el-table-column prop="applicationType" label="琛楅亾" min-width="10">
+ <el-table-column prop="streetId" label="琛楅亾" min-width="10">
</el-table-column>
- <el-table-column prop="applicationType" label="绀惧尯" min-width="10">
+ <el-table-column prop="communityId" label="绀惧尯" min-width="10">
</el-table-column>
- <el-table-column prop="applicationType" label="寮�濮嬫椂闂�" min-width="10">
+ <el-table-column prop="startTime" label="寮�濮嬫椂闂�" min-width="10">
</el-table-column>
- <el-table-column prop="applicationType" label="缁撴潫鏃堕棿" min-width="10">
+ <el-table-column prop="endTime" label="缁撴潫鏃堕棿" min-width="10">
</el-table-column>
- <el-table-column prop="applicationType" label="浠诲姟鎻忚堪" min-width="10">
+ <el-table-column prop="description" label="浠诲姟鎻忚堪" min-width="10">
</el-table-column>
- <el-table-column prop="applicationType" label="鐘舵��" min-width="10">
+ <el-table-column prop="status" label="鐘舵��" min-width="10">
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="10">
<template slot-scope="scope">
@@ -62,18 +61,11 @@
</template>
</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> -->
</div>
</main>
<footer>
<!-- 鍒涘缓寮圭獥 -->
- <el-dialog :visible.sync="dialogCreate" title="鏂板绗笁鏂规帴鍙�" width="45%" v-if="dialogCreate"
+ <el-dialog :visible.sync="dialogCreate" title="鏂板浠诲姟" width="45%" v-if="dialogCreate"
:before-close="handleClose">
<createInterface />
</el-dialog>
@@ -101,35 +93,55 @@
updateFlag: false,
userInfo: '',
date:'',
- // totalNum: 200,
- // pageSize: 10,
- // currentPage: 1,
+ totalNum: 200,
+ pageSize: 10,
+ currentPage: 1,
}
},
- created() {
- this.getUserList();
+ async created() {
+ const arr = await this.getUserList();
+ this.tableData = arr.records;
+ this.totalNum = arr.total;
},
methods: {
+ addTask() {
+ this.dialogCreate = true;
+ },
// 鑾峰彇鎺ュ彛鍒楄〃
- 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;
+ async getUserList() {
+ let arr = [];
+ const { currentPage, pageSize,context,messageStatus,messageKind } = this;
+ await this.$axios({
+ method: 'post',
+ url: '/sccg/task/list',
+ data: {
+ body: "",
+ channelCode: "",
+ createUser: '',
+ current: currentPage,
+ head: context,
+ messageType: "",
+ pageSize: pageSize,
+ randomCode: "",
+ remark: "",
+ sendTime: "",
+ status:"",
+ targetFrom: "",
+ targetTo: ""
}
})
+ .then(res => {
+ arr = res.data;
+ })
+ return arr;
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 鎵撳紑鏂板鐣岄潰
handleAdd() {
@@ -152,34 +164,16 @@
},
// 鍒犻櫎绗笁鏂规帴鍙�
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();
- // },
}
}
</script>
-<!-- sccg/system/portal/thirdApp/search -->
<style lang="scss" scoped>
.otherInterface {
header {
@@ -205,7 +199,7 @@
display: flex;
line-height: 60px;
color: #4b9bb7;
- background-color: #09152f;
+ // background-color: #09152f;
display: flex;
.add,.search,.btn{
flex:1;
@@ -225,11 +219,11 @@
height: 35px;
margin-left: 10px;
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- font-size: 12px;
- }
+ // &::v-deep .el-input__inner {
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // font-size: 12px;
+ // }
}
}
@@ -237,7 +231,7 @@
margin-top: 20px;
.el-table {
- color: #4b9bb7;
+ // color: #4b9bb7;
&::v-deep .el-table__empty-block {
background-color: #06122c;
--
Gitblit v1.8.0