diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss index 8235961ea..892933149 100644 --- a/src/assets/scss/buttonstyle.scss +++ b/src/assets/scss/buttonstyle.scss @@ -29,7 +29,7 @@ //蓝色 .diy-button--blue { background: #0056D6 !important; - border-radius: 2px !important; + border-radius: 3px !important; font-size: 14px !important; color: #fff !important; min-width: 60px !important; @@ -202,18 +202,18 @@ //新增 .diy-button--add { color: #fff !important; - background-color: #22c1c3 !important; - border-color: #22c1c3 !important; + background-color: #0056d6 !important; + border-color: #0056d6 !important; } .diy-button--add:hover { color: #fff !important; - background-color: #22c1c3 !important; - border-color: #22c1c3 !important; + background-color: #0056d6 !important; + border-color: #0056d6 !important; } .diy-button--add:focus { color: #fff !important; - background-color: #22c1c3 !important; - border-color: #22c1c3 !important; + background-color: #0056d6 !important; + border-color: #0056d6 !important; } //删除、导入 @@ -263,43 +263,43 @@ //table按钮样式 //查看 -.div-table-button--detail { - color: #3e8ef7 !important; - text-decoration: underline !important; -} +// .div-table-button--detail { +// color: #3e8ef7 !important; +// text-decoration: underline !important; +// } -//修改 -.div-table-button--edit { - color: #00a7a9 !important; - text-decoration: underline !important; -} +// //修改 +// .div-table-button--edit { +// color: #00a7a9 !important; +// text-decoration: underline !important; +// } -//删除 -.div-table-button--delete { - color: #d51010 !important; - text-decoration: underline !important; -} +// //删除 +// .div-table-button--delete { +// color: #d51010 !important; +// text-decoration: underline !important; +// } -//查看 -.div-table-button--detail--noline { - color: #3e8ef7 !important; -} +// //查看 +// .div-table-button--detail--noline { +// color: #3e8ef7 !important; +// } -//更多 -.div-table-button--more { - color: #333333 !important; - text-decoration: underline !important; -} +// //更多 +// .div-table-button--more { +// color: #333333 !important; +// text-decoration: underline !important; +// } -//修改 -.div-table-button--edit--noline { - color: #00a7a9 !important; -} +// //修改 +// .div-table-button--edit--noline { +// color: #00a7a9 !important; +// } -//删除 -.div-table-button--delete--noline { - color: #d51010 !important; -} +// //删除 +// .div-table-button--delete--noline { +// color: #d51010 !important; +// } // .div-table-button--qr { diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index f0989da24..7929ce3ca 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -342,3 +342,6 @@ overflow: hidden; } +.div_btn{ + display: flex; +} diff --git a/src/views/modules/base/huji/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue index d7f61dfe7..98c4d825d 100644 --- a/src/views/modules/base/huji/houseChange/houseChangeList.vue +++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue @@ -126,7 +126,7 @@ border :height="tableHeight" v-loading="tableLoading" - :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" + style="width: 100%"> - 查询 - 重置 + 查询 + @@ -70,10 +71,10 @@
- 新增 - 下载模板 {{importBtnTitle}} - {{ exportBtnTitle }} @@ -132,7 +133,7 @@ 修改 + class="btn-color-edit">编辑 diff --git a/src/views/modules/communityParty/heart/heartAudit.vue b/src/views/modules/communityParty/heart/heartAudit.vue index 11fa03ed8..94f1c8087 100644 --- a/src/views/modules/communityParty/heart/heartAudit.vue +++ b/src/views/modules/communityParty/heart/heartAudit.vue @@ -14,7 +14,7 @@ @selection-change="selectionChange" :height="tableHeight" v-loading="tableLoading" - :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" + style="width: 100%"> + > 查询 + class="diy-button--white" + @click="resetSearch">重置 重置 + class="diy-button--add" + @click="handleSearch">查询 +
@@ -76,7 +77,7 @@ border :height="tableHeight" v-loading="tableLoading" - :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" + style="width: 100%"> - 查询 - 重置 + 查询 + @@ -183,7 +184,7 @@ 新增 - 下载模板 {{importBtnTitle}} - {{ exportBtnTitle }} @@ -215,7 +216,7 @@ border :height="tableHeight" style="width: 100%" - class="resi-table"> + > diff --git a/src/views/modules/communityParty/members/points.vue b/src/views/modules/communityParty/members/points.vue index 1091370b8..6e1a1c30d 100644 --- a/src/views/modules/communityParty/members/points.vue +++ b/src/views/modules/communityParty/members/points.vue @@ -48,8 +48,8 @@ - 查询 - 重置 + 重置 + 查询 @@ -586,11 +586,11 @@ export default { @import "@/assets/scss/buttonstyle.scss"; .resi-container .resi-card-table { - ::v-deep .el-table th { - color: #fff; - background-color: rgba(33, 149, 254, 1); - // border-right: 1px solid rgba(33, 149, 254, 1); - } + // ::v-deep .el-table th { + // color: #fff; + // background-color: rgba(33, 149, 254, 1); + // // border-right: 1px solid rgba(33, 149, 254, 1); + // } } .resi-table { ::v-deep .el-button--text { diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue index dd3b0b23a..d130f24c4 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue @@ -92,12 +92,12 @@ 查询 - 重置 + 查询 @@ -115,18 +115,18 @@ size="small" @click="handleAddSchedule">添加日程提醒 --> 批量删除 导出 - 查询 + class="diy-button--white" + @click="resetSearch">重置 重置 + class="diy-button--add" + @click="handleSearch">查询 + @@ -70,18 +70,18 @@ size="small" @click="handleAddSchedule">添加日程提醒 批量删除 导出 查询 + @click="resetSearch">重置 重置 + @click="handleSearch">查询 @@ -125,7 +125,6 @@ border :height="tableHeight" v-loading="tableLoading" - :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" style="width: 100%"> - 查询重置 重置查询 @@ -866,6 +867,7 @@ export default { diff --git a/src/views/modules/workPc/guidance/guidanceList.vue b/src/views/modules/workPc/guidance/guidanceList.vue index 0f73622c8..4a867f916 100644 --- a/src/views/modules/workPc/guidance/guidanceList.vue +++ b/src/views/modules/workPc/guidance/guidanceList.vue @@ -38,14 +38,14 @@ - 查询 重置 + 查询 - 查询 - 重置 + 查询 +
@@ -55,7 +55,7 @@ border :height="tableHeight" v-loading="tableLoading" - :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" + style="width: 100%"> diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue index 2bde74cf0..aaf015dd7 100644 --- a/src/views/modules/worklog/icworklog.vue +++ b/src/views/modules/worklog/icworklog.vue @@ -75,16 +75,18 @@ + 重置 {{ $t('query') }} - 重置 +