Commit c6cf0950 by 张超军

比中信息管理模块

parent af268840
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
color: #055fe7; color: #055fe7;
} }
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时,:focus-within伪类的元素就会有效著作权归作者所有。 // :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时,:focus-within伪类的元素就会有效著作权归作者所有。
/deep/.el-input.is-active .el-input__inner, /deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus-within { /deep/.el-input__inner:focus-within {
...@@ -22,6 +28,13 @@ ...@@ -22,6 +28,13 @@
color: #055fe7; color: #055fe7;
} }
} }
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
}
/deep/.el-table td, /deep/.el-table td,
.el-table th.is-leaf { .el-table th.is-leaf {
background-color: #ffffff; background-color: #ffffff;
...@@ -73,6 +86,54 @@ ...@@ -73,6 +86,54 @@
width: 100% !important; width: 100% !important;
} }
// el-table 左侧固定 样式统一
/deep/.el-table__fixed {
height: 100% !important;
&::before {
height: 0;
}
}
/deep/.el-table__fixed-header-wrapper {
height: 48px !important;
.el-table__header {
width: 100% !important;
height: 48px !important;
background-color: #ecf1f7 !important;
font-size: 0.875rem !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c !important;
height: 3rem !important;
padding: 0 !important;
}
thead {
font-size: 0.875rem !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c !important;
.cell {
font-weight: normal !important;
}
}
th {
border: none !important;
background-color: #ecf1f7 !important;
}
}
/deep/.el-table__fixed-body-wrapper {
// height: 100% !important;
}
/deep/.hover-row {
.el-table__cell {
background-color: #f2f7fe !important;
}
}
/deep/.el-table__fixed-right {
height: 100% !important;
&::before {
height: 0;
}
}
/deep/.btn-prev { /deep/.btn-prev {
cursor: pointer; cursor: pointer;
i { i {
......
...@@ -1167,7 +1167,7 @@ export default { ...@@ -1167,7 +1167,7 @@ export default {
height: 42px; height: 42px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #e6e6e8; // border: 1px solid #e6e6e8;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
......
...@@ -458,7 +458,7 @@ export default { ...@@ -458,7 +458,7 @@ export default {
let w1 = 1920; let w1 = 1920;
let w2 = window.innerWidth; let w2 = window.innerWidth;
this.height = (this.height * w2) / w1; // this.height = (this.height * w2) / w1;
this.width1 = (this.width1 * w2) / w1; this.width1 = (this.width1 * w2) / w1;
this.width2 = (this.width2 * w2) / w1; this.width2 = (this.width2 * w2) / w1;
this.width3 = (this.width3 * w2) / w1; this.width3 = (this.width3 * w2) / w1;
...@@ -848,7 +848,7 @@ export default { ...@@ -848,7 +848,7 @@ export default {
background: #055fe7; background: #055fe7;
} }
.RAList { .RAList {
height: 700px; // height: 700px;
box-sizing: border-box; box-sizing: border-box;
padding: 0 24px; padding: 0 24px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
...@@ -924,6 +924,20 @@ export default { ...@@ -924,6 +924,20 @@ export default {
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #ffffff; color: #ffffff;
line-height: 22px; line-height: 22px;
span {
cursor: pointer;
}
&:hover {
background: #377fec !important;
}
&:active {
background: #044cb9 !important;
}
}
/deep/.el-button {
span {
cursor: pointer;
}
} }
} }
} }
...@@ -1083,7 +1097,7 @@ export default { ...@@ -1083,7 +1097,7 @@ export default {
color: #333333; color: #333333;
} }
/deep/.el-table { /deep/.el-table {
height: 100%; // height: 100%;
} }
/deep/.el-table th > .cell { /deep/.el-table th > .cell {
font-size: 14px; font-size: 14px;
...@@ -1154,6 +1168,7 @@ export default { ...@@ -1154,6 +1168,7 @@ export default {
/deep/.el-table--enable-row-hover .el-table__body tr:hover { /deep/.el-table--enable-row-hover .el-table__body tr:hover {
cursor: pointer; cursor: pointer;
} }
@import "@/assets/css/globalBase.scss";
</style> </style>
<style lang="scss" > <style lang="scss" >
.el-table__expand-icon { .el-table__expand-icon {
...@@ -1191,8 +1206,4 @@ export default { ...@@ -1191,8 +1206,4 @@ export default {
background-color: #006aff; background-color: #006aff;
border-color: #006aff; border-color: #006aff;
} }
/deep/.el-table {
height: 33rem;
}
@import "@/assets/css/globalBase.scss";
</style> </style>
...@@ -1054,7 +1054,7 @@ const datas1 = [ ...@@ -1054,7 +1054,7 @@ const datas1 = [
height: 42px; height: 42px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #e6e6e8; // border: 1px solid #e6e6e8;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
......
...@@ -921,11 +921,11 @@ export default { ...@@ -921,11 +921,11 @@ export default {
cursor: pointer; cursor: pointer;
} }
&:hover { // &:hover {
background: #F6F8FA; // background: #F6F8FA;
color: #055fe7; // color: #055fe7;
border-radius: 16px; // border-radius: 16px;
} // }
} }
.el-tabs__item.is-top.is-closable { .el-tabs__item.is-top.is-closable {
// padding: 6px 24px; // padding: 6px 24px;
...@@ -950,11 +950,11 @@ export default { ...@@ -950,11 +950,11 @@ export default {
cursor: pointer; cursor: pointer;
} }
&:hover { // &:hover {
color: #055fe7; // color: #055fe7;
background: #F6F8FA; // background: #F6F8FA;
border-radius: 16px; // border-radius: 16px;
} // }
} }
.is-active { .is-active {
...@@ -1358,5 +1358,5 @@ export default { ...@@ -1358,5 +1358,5 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
@import "@/assets/css/globalBase.scss"; // @import "@/assets/css/globalBase.scss";
</style> </style>
\ No newline at end of file
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-01 15:25:22 * @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-27 20:28:06 * @LastEditTime: 2022-01-13 10:39:50
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue * @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span class="clearCheck" @click="toggleSelection()">清空</span> <span class="clearCheck" @click="toggleSelection()">清空</span>
</el-tag> </el-tag>
<el-table :max-height="height" ref="multipleTable" :data="tableDate" :row-key="getRowKeys" tooltip-effect="dark" style="width: 100%;" :class="{delSelection: !selectBoo}" class="bzxxfh-table" @selection-change="handleSelectionChange"> <el-table :height="height" ref="multipleTable" :data="tableDate" :row-key="getRowKeys" tooltip-effect="dark" style="width: 100%;" :class="{delSelection: !selectBoo}" class="bzxxfh-table" @selection-change="handleSelectionChange">
<el-table-column type="selection" :reserve-selection="true" :width="width33"> <el-table-column type="selection" :reserve-selection="true" :width="width33">
</el-table-column> </el-table-column>
<el-table-column prop="ytmh" label="源条码号" :width="width1"> <el-table-column prop="ytmh" label="源条码号" :width="width1">
...@@ -145,6 +145,7 @@ ...@@ -145,6 +145,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="bzxxfh-content-bottom"></div>
<!-- 撤销复核弹窗 --> <!-- 撤销复核弹窗 -->
<div class="cxfh-dialog" v-show="cxfhVisiable"> <div class="cxfh-dialog" v-show="cxfhVisiable">
<div class="cxfh-header"> <div class="cxfh-header">
...@@ -202,7 +203,7 @@ export default { ...@@ -202,7 +203,7 @@ export default {
width2: 160, width2: 160,
width3: 90, width3: 90,
width5: 100, width5: 100,
height: 450, height: "30rem",
tableDate: [ tableDate: [
], ],
...@@ -235,7 +236,6 @@ export default { ...@@ -235,7 +236,6 @@ export default {
created () { created () {
let w1 = 1920; let w1 = 1920;
let w2 = window.innerWidth; let w2 = window.innerWidth;
this.height = (this.height * w2) / w1;
this.width1 = (this.width1 * w2) / w1; this.width1 = (this.width1 * w2) / w1;
this.width2 = (this.width2 * w2) / w1; this.width2 = (this.width2 * w2) / w1;
this.width3 = (this.width3 * w2) / w1; this.width3 = (this.width3 * w2) / w1;
...@@ -545,19 +545,13 @@ export default { ...@@ -545,19 +545,13 @@ export default {
this.isShowTip = !this.isShowTip; this.isShowTip = !this.isShowTip;
this.toggleSelection(); this.toggleSelection();
// this.$set(this.multipleSelection, []) // this.$set(this.multipleSelection, [])
if (this.isShowTip) { // if (this.isShowTip) {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '24.625rem'); // document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '29rem');
this.height = 394 // this.height = "29rem"
let w1 = 1920; // } else {
let w2 = window.innerWidth; // document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '33rem');
this.height = (this.height * w2) / w1; // this.height = "33rem"
} else { // }
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '28.125rem');
this.height = 540
let w1 = 1920;
let w2 = window.innerWidth;
this.height = (this.height * w2) / w1;
}
}, },
/** /**
* @description: 清除所有选项 * @description: 清除所有选项
...@@ -610,6 +604,7 @@ export default { ...@@ -610,6 +604,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "./scss/bzxxfh.scss"; @import "./scss/bzxxfh.scss";
@import "@/assets/css/globalBase.scss";
</style> </style>
<style lang="scss"> <style lang="scss">
// 修改下拉框样式 // 修改下拉框样式
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-01 15:25:22 * @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-20 15:18:40 * @LastEditTime: 2022-01-13 11:32:35
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxsh.vue * @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxsh.vue
...@@ -136,8 +136,9 @@ ...@@ -136,8 +136,9 @@
<div class="bzxxsh-table"> <div class="bzxxsh-table">
<el-table <el-table
:border="false"
ref="multipleTable" ref="multipleTable"
:max-height="tableHeight" :height="tableHeight"
:data="tableDate" :data="tableDate"
:row-key="getRowKeys" :row-key="getRowKeys"
:key="tableKey" :key="tableKey"
...@@ -307,6 +308,7 @@ ...@@ -307,6 +308,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="bzxxsh-content-bottom"></div>
<div class="cxfh-dialog" v-show="shDialogVisiable"> <div class="cxfh-dialog" v-show="shDialogVisiable">
<div class="cxfh-header"> <div class="cxfh-header">
...@@ -398,7 +400,7 @@ export default { ...@@ -398,7 +400,7 @@ export default {
totalPage: 0, // 总共页数 totalPage: 0, // 总共页数
tableDate: [], tableDate: [],
tableHeight: 430, tableHeight: "30rem",
selectwidth: 50, selectwidth: 50,
czWidth: 160, czWidth: 160,
isStRole: false, // 用于标记是省厅角色还是地市角色 isStRole: false, // 用于标记是省厅角色还是地市角色
...@@ -477,7 +479,7 @@ export default { ...@@ -477,7 +479,7 @@ export default {
let w2 = window.innerWidth let w2 = window.innerWidth
let scalePercent = w2 / w1 let scalePercent = w2 / w1
_that.tableHeight = _that.tableHeight * scalePercent // _that.tableHeight = _that.tableHeight * scalePercent
_that.czWidth = _that.czWidth * scalePercent _that.czWidth = _that.czWidth * scalePercent
_that.selectwidth = _that.selectwidth * scalePercent _that.selectwidth = _that.selectwidth * scalePercent
...@@ -845,6 +847,7 @@ const initRuleFrom = { ...@@ -845,6 +847,7 @@ const initRuleFrom = {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "./scss/bzxxsh.scss"; @import "./scss/bzxxsh.scss";
@import "@/assets/css/globalBase.scss";
</style> </style>
<style lang="scss"> <style lang="scss">
// 修改下拉框样式 // 修改下拉框样式
......
// table表的高度 // table表的高度
$tableHeight: var(--tableHeight, 450px); $tableHeight: var(--tableHeight, 33rem);
#bzxxfh { #bzxxfh {
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
...@@ -52,12 +52,12 @@ $tableHeight: var(--tableHeight, 450px); ...@@ -52,12 +52,12 @@ $tableHeight: var(--tableHeight, 450px);
} }
} }
/deep/ .el-input.is-active .el-input__inner, // /deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus { // /deep/ .el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06) !important; // box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06) !important;
border: 1px solid #e6e6e8 !important; // border: 1px solid #e6e6e8 !important;
border-radius: 4px; // border-radius: 4px;
} // }
/deep/.el-input__icon { /deep/.el-input__icon {
height: auto; height: auto;
...@@ -185,6 +185,9 @@ $tableHeight: var(--tableHeight, 450px); ...@@ -185,6 +185,9 @@ $tableHeight: var(--tableHeight, 450px);
.bzxxfh-content { .bzxxfh-content {
width: 100%; width: 100%;
padding: 0 24px; padding: 0 24px;
// margin: 0 24px;
// border-bottom: 1px solid #eeeeee;
height: 585px;
.bzxxfh-content-top { .bzxxfh-content-top {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -338,9 +341,18 @@ $tableHeight: var(--tableHeight, 450px); ...@@ -338,9 +341,18 @@ $tableHeight: var(--tableHeight, 450px);
height: $tableHeight; height: $tableHeight;
} }
} }
.bzxxfh-content-bottom {
height: 1px;
width: 1592px;
margin: 0 24px;
background-color: #eeeeee;
}
.bzxxfh-content-content-footer { .bzxxfh-content-content-footer {
margin-top: 16px; // margin-top: 16px;
width: 100%; width: 1592px;
position: fixed;
bottom: 27px;
// width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
......
...@@ -51,12 +51,12 @@ $tableHeight: var(--tableHeight, 450px); ...@@ -51,12 +51,12 @@ $tableHeight: var(--tableHeight, 450px);
} }
} }
/deep/ .el-input.is-active .el-input__inner, // /deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus { // /deep/ .el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06) !important; // box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06) !important;
border: 1px solid #e6e6e8 !important; // border: 1px solid #e6e6e8 !important;
border-radius: 4px; // border-radius: 4px;
} // }
/deep/ .el-input__icon { /deep/ .el-input__icon {
height: auto; height: auto;
...@@ -239,6 +239,7 @@ $tableHeight: var(--tableHeight, 450px); ...@@ -239,6 +239,7 @@ $tableHeight: var(--tableHeight, 450px);
width: 100%; width: 100%;
padding: 0 24px; padding: 0 24px;
clear: both; clear: both;
height: 585px;
.bzxxsh-content-top { .bzxxsh-content-top {
display: flex; display: flex;
...@@ -412,10 +413,19 @@ $tableHeight: var(--tableHeight, 450px); ...@@ -412,10 +413,19 @@ $tableHeight: var(--tableHeight, 450px);
height: $tableHeight; height: $tableHeight;
} }
} }
.bzxxsh-content-bottom {
height: 1px;
width: 1592px;
margin: 0 24px;
background-color: #eeeeee;
}
.bzxxsh-content-content-footer { .bzxxsh-content-content-footer {
margin-top: 16px; // margin-top: 16px;
width: 100%; width: 1592px;
position: fixed;
bottom: 27px;
// width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -601,5 +611,3 @@ $tableHeight: var(--tableHeight, 450px); ...@@ -601,5 +611,3 @@ $tableHeight: var(--tableHeight, 450px);
border-color: #377fec; border-color: #377fec;
} }
} }
...@@ -1312,6 +1312,7 @@ const setQueryClass = [ ...@@ -1312,6 +1312,7 @@ const setQueryClass = [
} }
</style> </style>
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/assets/css/globalBase.scss";
.width70 { .width70 {
width: 70px !important; width: 70px !important;
display: inline-block; display: inline-block;
...@@ -1927,5 +1928,4 @@ b { ...@@ -1927,5 +1928,4 @@ b {
background-repeat: no-repeat; background-repeat: no-repeat;
transform: rotate(180deg) !important; transform: rotate(180deg) !important;
} }
@import "@/assets/css/globalBase.scss";
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment