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/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss index dfaf49407..57b5bc143 100644 --- a/src/assets/scss/modules/management/edit-main.scss +++ b/src/assets/scss/modules/management/edit-main.scss @@ -39,12 +39,22 @@ } } - -.m-edit-btn { - display: flex; - margin-top: 20px; - margin-right:16px; - justify-content: flex-end; - text-align: center; +//取消按钮 +::v-deep .el-button--default { + font-size: 14px !important; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #0056d6 !important; + // line-height: 22px !important; + min-width: 60px !important; + height: 30px !important; + // padding:0 8px !important; + background: #FFFFFF !important; + border-radius: 2px !important; + border: 1px solid #0056d6 !important; +} +::v-deep .el-button--default:hover{ +border: 1px solid #0042a3 !important; +color: #0042a3 !important; } 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%">
重置 - 取消
- 关闭
@@ -1858,7 +1858,7 @@ export default { 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%"> -
-
+
+
新增 @@ -166,7 +166,18 @@ 取 消
--> + +
+ \ No newline at end of file diff --git a/src/views/modules/communityService/labelConfig/index.vue b/src/views/modules/communityService/labelConfig/index.vue index 3ee86c8ac..9d3098635 100644 --- a/src/views/modules/communityService/labelConfig/index.vue +++ b/src/views/modules/communityService/labelConfig/index.vue @@ -1,235 +1,234 @@ diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 38ed6a844..8a10518f6 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -283,7 +283,7 @@ :close-on-press-escape="false" :title="addDiaTitle" :modal-append-to-body="false" - width="850px" + width="720px" top="5vh" class="dialog-h" @closed="showAdd = false"> diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue index 59740f539..47469fae5 100644 --- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue +++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue @@ -80,12 +80,12 @@ 查询 + class="diy-button--white" + @click="resetSearch">重置 重置 + class="diy-button--add" + @click="handleSearch">查询
@@ -99,7 +99,6 @@ border :height="tableHeight" v-loading="tableLoading" - :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" style="width: 100%"> diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue index 68d57ae28..01013c285 100644 --- a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue +++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue @@ -10,7 +10,7 @@ border :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">查询 +
@@ -96,7 +96,7 @@ border :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">查询 @@ -82,7 +82,6 @@ border :height="tableHeight" v-loading="tableLoading" - :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" style="width: 100%"> - 查询 - 重置 + 重置 + 查询 @@ -83,7 +83,7 @@ size="small" @click="handleAdd">新增 - 下载模板 @@ -99,7 +99,7 @@ :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest"> - {{ importBtnTitle @@ -108,7 +108,7 @@ 导出 diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue index 36b55cc5b..a241d2780 100644 --- a/src/views/modules/communityService/worklog/workLog.vue +++ b/src/views/modules/communityService/worklog/workLog.vue @@ -84,14 +84,15 @@ end-placeholder="结束日期"> - 查询 + @click="resetSearch">重置 重置 + @click="handleSearch">查询 + @@ -130,7 +131,7 @@ border :height="tableHeight" v-loading="tableLoading" - :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" + style="width: 100%"> 查询 重置 @@ -85,7 +85,7 @@ @click="handleAdd">新增 下载模板 @@ -102,16 +102,16 @@ :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest"> 导入 + :class="mubanUrl?'diy-button--add':'diy-button--white'" style="margin-left:10px">导入 导出 + :class="importUrl?'diy-button--white':'diy-button--add'" + size="small" style="margin-left:10px">导出 导出员工登记码 - + - {{ $t('query') }} + 重置 - 重置 + {{ $t('query') }} + @@ -87,9 +88,9 @@
- {{ $t('export') }} + {{ $t('export') }}
- +