Skip to content

F
founder_vue
Commit 9f3583a2 by 李姝悦
Options

--no commit message

parent 4dba56fa
Showing with 44 additions and 25 deletions
src/views/zzwcj/fingerprint.scss
......@@ -74,10 +74,11 @@ $hegeBorder: var(--hegeBorder , #17d010);//合格的边框
// 按钮
$btnBorder: var(--btnBorder, #AEB5C2 ); //#464646 #979FA8
$btnfontColor: var(--btnfontColor,#2E3846); // #efefef #343A3F
$btnhover: var(--btnhover, #efefef); // #4A4E52
$btnfontcolorHover: var(--btnfontcolorHover,#055fe7);// #efefef #343A3F
$btnhover: var(--btnhover,#055fe7 ); //#efefef #4A4E52
// 弹出对话框
$btndialogBg: var(--btndialogBg,#F6F8FA ); //#535353 #E7EAEE
$btndialogTitle: var(--btndialogTitle,#333333 ); //#ffc005 #323942
$btndialogTitle: var(--btndialogTitle,#333333 ); //#333333 #323942
$btndialogbodyBg: var(--btndialogbodyBg,#ffffff ); //#3f3f3f #CCD2D8
$btndialogbodyTxt: var(--btndialogbodyTxt,#282F3C ); //#dddddd #222222
$btndialogPrimary:var(--btndialogPrimary,#282f3c);//是
......@@ -132,7 +133,7 @@ $settingTitleChange: var(--settingTitleChange, #9f9f9f); // #738290
// 底部按钮
$dialogBtn: var(--dialogBtn,#282F3C ); //#9f9f9f #323942
$dialogBtnBg: var(--dialogBtnBg,#ffffff ); //#3f3f3f #E7EAEE
$dialogBtnBorder: var(--dialogBtnBorder,#AEB5C2 ); //#909090 #E7EAEE
$dialogBtnBorder: var(--dialogBtnBorder,#AEB5C2 ); //#3f3f3f #E7EAEE
$dialogSpan: var(--dialogSpan,#282F3C ); //#9f9f9f #323942
$dialogBtnHover: var(--dialogBtnHover, #0060f0); //#dddddd #86919B
$dialogBtnHoverSpan: var(--dialogBtnHoverSpan,#0060f0 ); //#dddddd #323942
......@@ -1114,8 +1115,8 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
position: absolute;
width: 18px;
height: 62px;
top: -2px;
right: 42px;
top: -4px;
right: 41.5px;
}
.finger4 {
position: absolute;
......@@ -1592,14 +1593,14 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
}
}
.el-button.el-button--primary:hover {
border: 1px solid $btndialogPrimaryHoverBorder;
border: 1px solid $btndialogPrimaryHoverBorder !important;
span{
color:$btndialogPrimaryHover
color:$btndialogPrimaryHover !important
}
}
.el-button.el-button--default:hover {
border: 1px solid $btndialogDefaultHoverBorder;
border: 1px solid $btndialogDefaultHoverBorder !important;
background:$btndialogDefaultBgHover !important
// span{
// color:$btndialogDefaultBg
......@@ -2525,14 +2526,17 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
padding-right: 20px !important;
.dialog-footer {
.el-button.el-button--default {
width: 30px;
height: 20px;
width: 108px;
height: 32px;
border:1px solid $btndialogBorder;
border-radius: 18px;
background: $btndialogDefaultBg !important;
span {
font-size: 15px;
font-family: HarmonyOS_Sans_SC;
font-weight: 400;
line-height: 20px;
color: $dialogBtn;
color: $btndialogDefault;
}
}
.el-button.el-button--primary {
......@@ -2551,11 +2555,18 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
}
}
.el-button.el-button--primary:hover {
border: 1px solid $dialogBtnHover;
border: 1px solid $dialogBtnHover !important;
span {
color: $dialogBtnHoverSpan;
}
}
.el-button.el-button--default:hover {
border: 1px solid $btndialogDefaultHoverBorder !important;
background:$btndialogDefaultBgHover !important
// span{
// color:$btndialogDefaultBg
// }
}
}
}
}
......@@ -2584,9 +2595,11 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
}
.save:hover {
border: 2px solid $btnhover;
color:$btnfontcolorHover;
}
.finish:hover {
border: 2px solid $finishTrue; //2px
border: 2px solid $btnhover; //2px
color:$btnfontcolorHover;
}
.save {
margin-top: 23px;
......@@ -2804,7 +2817,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
}
}
.el-button.el-button--primary:hover {
border: 1px solid $btndialogbodyTxt;
// border: 1px solid $btndialogbodyTxt;
}
}
}
......
src/views/zzwcj/fingerprint.vue
......@@ -589,7 +589,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="settingConfirm">确定</el-button>
<el-button type="primary" @click="cancelSetting">取消</el-button>
<el-button type="default" @click="cancelSetting">取消</el-button>
</span>
</el-dialog>
</div>
......@@ -1348,7 +1348,7 @@ export default {
self.ip = ipRes
//console.log(self.ip);
NProgress.start();
this.pop = true
this.pop = false
this.isAlter = true
this.errTitle = '设备初始化'
this.errDescription = '设备正在启动中。。。'
......@@ -9665,7 +9665,8 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--handTxt', '#666666');//左右手俩字
document.getElementsByTagName('body')[0].style.setProperty('--tipTitle', '#333333');//框下边的大字
document.getElementsByTagName('body')[0].style.setProperty('--tipP', '#999999');//大字下边的小字
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBg', '#ffffff');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBg', '#f9f9F9');//指纹格子
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxHoverBg', '#ffffff');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBorder', '#cccccc');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxTxt', '#333333');//左八字颜色
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxtxtBg', '#F6F8FA'); //左八字背景
......@@ -9679,7 +9680,8 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--hegeBorder', '#17d010'); //合格边框
document.getElementsByTagName('body')[0].style.setProperty('--btnBorder', '#AEB5C2');//按钮边框
document.getElementsByTagName('body')[0].style.setProperty('--btnfontColor', '#2E3846');
document.getElementsByTagName('body')[0].style.setProperty('--btnhover', '#efefef');
document.getElementsByTagName('body')[0].style.setProperty('--btnfontcolorHover', '#055fe7');
document.getElementsByTagName('body')[0].style.setProperty('--btnhover', '#055fe7');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogBg', '#F6F8FA');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogTitle', '#333333');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogbodyBg', '#ffffff');
......@@ -9801,6 +9803,7 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--tipTitle', '#ffc005');
document.getElementsByTagName('body')[0].style.setProperty('--tipP', '#c4c4c4');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBg', '#1B1B1B');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxHoverBg', '#1b1b1b');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBorder', '#464646');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxTxt', '#909090');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxtxtBg', '#1b1b1b'); //左八字背景
......@@ -9814,15 +9817,16 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--hegeBorder', '#17d010'); //合格边框
document.getElementsByTagName('body')[0].style.setProperty('--btnBorder', '#464646');
document.getElementsByTagName('body')[0].style.setProperty('--btnfontColor', '#efefef');
document.getElementsByTagName('body')[0].style.setProperty('--btnfontcolorHover', '#efefef');
document.getElementsByTagName('body')[0].style.setProperty('--btnhover', '#efefef');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogBg', '#535353');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogTitle', '#ffc005');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogTitle', '#333333');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogbodyBg', '#3f3f3f');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogbodyTxt', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimary', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryHover', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryHoverBorder', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultHoverBorder', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultHoverBorder', '#86919B');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryBg', '#535353');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultBg', '#535353');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultBgHover', '#535353');
......@@ -9868,10 +9872,10 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--settingAfter', '#1b1b1b');
document.getElementsByTagName('body')[0].style.setProperty('--settingTitleChange', '#9F9F9F');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtn', '#9F9F9F');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBg', '#3f3f3f');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBorder', '#909090');
document.getElementsByTagName('body')[0].style.setProperty('--dialogSpan', '#9f9f9f');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHover', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBg', '#535353');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBorder', '#3f3f3f');
document.getElementsByTagName('body')[0].style.setProperty('--dialogSpan', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHover', '#86919B');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHoverSpan', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--versionColor', '#fff');
document.getElementsByTagName('body')[0].style.setProperty('--uploadingBg', '#3f3f3f');
......@@ -9936,6 +9940,7 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--tipTitle', '#121619');
document.getElementsByTagName('body')[0].style.setProperty('--tipP', '#4D5358');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBg', '#878D96');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxHoverBg', '#878d96');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBorder', '#DDE1E6');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxTxt', '#DDE1E6');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxtxtBg', '#878D96'); //左八字背景
......@@ -9949,6 +9954,7 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--hegeBorder', '#17d010 '); //合格边框
document.getElementsByTagName('body')[0].style.setProperty('--btnBorder', '#979FA8');
document.getElementsByTagName('body')[0].style.setProperty('--btnfontColor', '#343A3F');
document.getElementsByTagName('body')[0].style.setProperty('--btnfontcolorHover', '#343A3F');
document.getElementsByTagName('body')[0].style.setProperty('--btnhover', '#4A4E52');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogBg', '#E7EAEE');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogTitle', '#323942');
......@@ -9957,7 +9963,7 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimary', '#222222');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryHover', '#222222');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryHoverBorder', '#222222');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultHoverBorder', '#222222');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultHoverBorder', '#86919B');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryBg', '#E7EAEE');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultBg', '#E7EAEE');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultBgHover', '#E7EAEE');
......
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