From 1eaf5917bb92bdbafc02de9d8425ea57b41658de Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 30 十一月 2022 14:55:21 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master
---
src/views/operate/message/myIndex/index.vue | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index 80da3a4..72cdaea 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -3,7 +3,6 @@
<header>
<div class="header-nav">
<span class="nav-left">鏁版嵁绛涢��</span>
- <span class="nav-right" @click="showMoreParamsDialog">楂樼骇鎼滅储</span>
</div>
<div class="header-content">
<div class="search">
@@ -25,7 +24,7 @@
</el-select>
</div>
<div class="search">
- <span>淇敼鏃堕棿:</span>
+ <span>鍒涘缓鏃堕棿:</span>
<el-date-picker style="width: 200px" type="datetimerange" v-model="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</div>
<div class="find">
@@ -38,7 +37,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button type="primary" icon="el-icon-plus" @click="handleOpera(null, 'create')">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="handleOpera(null, 'create')">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
@@ -52,14 +51,14 @@
</el-table-column>
<el-table-column prop="head" label="鏍囬" min-width="10">
</el-table-column>
- <el-table-column prop="createTime" label="淇敼鏃堕棿" min-width="10">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
</el-table-column>
<el-table-column prop="createUser" label="鍙戝竷浜哄憳" min-width="15">
</el-table-column>
<el-table-column prop="messageTypeName" label="娑堟伅鏍忕洰" min-width="10">
</el-table-column>
<el-table-column prop="status" label="鍙戝竷鐘舵��" min-width="5">
- <template slot-scope="scope">
+ <template v-if="scope.row.status" slot-scope="scope">
{{scope.row.status === 0 ? '鏈彂甯�' :'宸插彂甯�'}}
</template>
</el-table-column>
@@ -102,12 +101,6 @@
</div>
</div>
</div>
-
- <el-dialog
- title="楂樼骇鍙傛暟"
- :visible.sync="isShowMoreParams"
- width="30%">
- </el-dialog>
</main>
</div>
</template>
@@ -254,11 +247,11 @@
startTime: this.datetime ? this.datetime[0] : null,
endTime: this.datetime ? this.datetime[1] : null
}
- debugger
getMessageList(messageParam)
- .then(({ records, total }) => {
+ .then(({ records, total,size }) => {
this.tableData = records;
this.totalNum = total;
+ this.pageSize=size;
})
.catch(err => {
this.$message({ type: 'error', message: err });
@@ -347,10 +340,6 @@
this.getMessageList();
},
- showMoreParamsDialog() {
- this.isShowMoreParams = true;
- },
-
// 鑷畾涔夊叧闂脊绐�
closeDialog() {
this.isShowDialog = false;
@@ -387,15 +376,12 @@
display: flex;
justify-content: space-between;
align-items: center;
-
span {
flex: 1;
}
-
.el-input {
flex: 2;
color: #1d3f57;
-
&::v-deep .el-input__inner {
background-color: #09152f;
border: 1px solid #17324c;
@@ -596,7 +582,6 @@
&::v-deep .el-dialog__close {
width: 20px;
height: 20px;
- // color: #fff;
}
&::v-deep .el-dialog__body {
--
Gitblit v1.8.0