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/message/myIndex/index.vue | 106 +++++++++++++++++++++++------------------------------
1 files changed, 46 insertions(+), 60 deletions(-)
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index 7053110..87b011c 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,11 +37,11 @@
<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"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
+ :header-cell-style="{background:'white','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">
@@ -52,7 +51,7 @@
</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>
@@ -102,12 +101,6 @@
</div>
</div>
</div>
-
- <el-dialog
- title="楂樼骇鍙傛暟"
- :visible.sync="isShowMoreParams"
- width="30%">
- </el-dialog>
</main>
</div>
</template>
@@ -155,14 +148,14 @@
label: '鎵归噺鎿嶄綔',
disabled: true,
},
- {
- value: 1,
- label: '鎵归噺鍚敤',
- },
- {
- value: 2,
- label: '鎵归噺绂佺敤',
- },
+ // {
+ // value: 1,
+ // label: '鎵归噺鍚敤',
+ // },
+ // {
+ // value: 2,
+ // label: '鎵归噺绂佺敤',
+ // },
{
value: 3,
label: '鎵归噺鍒犻櫎',
@@ -211,7 +204,7 @@
methods: {
// 鏌ヨ
- handleSearch(){
+ handleSearch(){
this.getMessageList();
},
@@ -247,18 +240,19 @@
getMessageList() {
const messageParam = {
current: this.currentPage,
- size: this.pageSize,
+ pageSize: this.pageSize,
channelCode: this.messageType === '00' ? null : this.messageType,
status: this.messageStatus === 2 ? null : this.messageStatus,
head: this.context,
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 +341,6 @@
this.getMessageList();
},
- showMoreParamsDialog() {
- this.isShowMoreParams = true;
- },
-
// 鑷畾涔夊叧闂脊绐�
closeDialog() {
this.isShowDialog = false;
@@ -363,10 +353,10 @@
.userList {
text-align: left;
margin: 10px 20px;
- color: #4b9bb7;
+ color: #606266;
header {
- background-color: #09152f;
+ background-color: white;
.header-nav {
line-height: 40px;
@@ -387,18 +377,15 @@
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;
+ //background-color: #09152f;
+ //border: 1px solid #17324c;
}
}
@@ -420,7 +407,7 @@
}
main {
- background-color: #09152f;
+ background-color: white;
margin-top: 20px;
padding-bottom: 50px;
@@ -476,7 +463,7 @@
&::v-deep .el-input__inner {
border: none;
- background-color: #09152f;
+ //background-color: #09152f;
}
&:hover {
@@ -496,29 +483,29 @@
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;
- }
- }
+ //.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;
+ // }
+ //}
}
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #606266;
+ // font-size: 10px;
&::v-deep .el-table__empty-block {
- background-color: #09152f;
+ //background-color: #09152f;
}
&::v-deep .el-table__empty-block {
@@ -539,11 +526,11 @@
}
.el-table::v-deep .warning-row {
- background: #06122c;
+ //background: #06122c;
}
.el-table::v-deep .success-row {
- background: #071f39;
+ //background: #071f39;
}
&::v-deep .switchStyle .el-switch__label {
@@ -578,7 +565,7 @@
&::v-deep .el-dialog__header,
&::v-deep .el-dialog__body {
- background-color: #06122c;
+ //background-color: #06122c;
}
&::v-deep .el-dialog__header {
@@ -590,20 +577,19 @@
}
&::v-deep .el-dialog__title {
- color: #4b9bb7;
+ color: #606266;
}
&::v-deep .el-dialog__close {
width: 20px;
height: 20px;
- // color: #fff;
}
&::v-deep .el-dialog__body {
padding: 0;
}
:deep(.el-range-input) {
- background-color: #09152f;
+ //background-color: #09152f;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0