NEZ-2614 fix: 样式bug修改

This commit is contained in:
zhangyu
2023-02-28 10:36:40 +08:00
parent e9b826c732
commit 4f90aed60e
5 changed files with 16 additions and 5 deletions

View File

@@ -2,6 +2,11 @@
.el-tab-pane{ .el-tab-pane{
height: 100%; height: 100%;
} }
.el-switch{
.el-switch__core {
background-color: $--el-switch-background;
}
}
.props-box { .props-box {
width: 500px; width: 500px;
position: absolute; position: absolute;
@@ -9,7 +14,7 @@
top: 61px; top: 61px;
padding: 0 !important; padding: 0 !important;
box-sizing: border-box; box-sizing: border-box;
right: 0; right: -1px;
background: $--background-color-empty; background: $--background-color-empty;
} }
.form-row-item{ .form-row-item{
@@ -52,7 +57,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 15px; margin-bottom: 15px;
text-transform: capitalize; text-transform: initial;
} }
.form-row-content{ .form-row-content{
margin-bottom: 5px; margin-bottom: 5px;

View File

@@ -266,6 +266,8 @@ $--tooltip-border-color: rgba(112,116,122,0.6);
$--label-background-color: $--background-color-empty; $--label-background-color: $--background-color-empty;
/* 18 进度条颜色 */ /* 18 进度条颜色 */
$--el-progress-bar__outer: #19191C; $--el-progress-bar__outer: #19191C;
/* 19 el-switch background*/
$--el-switch-background: #dcdfe6;
/*** themes/common.scss是与主题切换无关的变量 ***/ /*** themes/common.scss是与主题切换无关的变量 ***/
@import './src/common/var.scss'; @import './src/common/var.scss';
@import './common.scss'; @import './common.scss';

View File

@@ -261,6 +261,8 @@ $--tooltip-border-color: rgba(119,131,145,0.6);
$--label-background-color: #D8d8d8; $--label-background-color: #D8d8d8;
/* 18 进度条颜色 */ /* 18 进度条颜色 */
$--el-progress-bar__outer: #ebeef5; $--el-progress-bar__outer: #ebeef5;
/* 19 el-switch background*/
$--el-switch-background: #dcdfe6;
/*** themes/common.scss是与主题切换无关的变量 ***/ /*** themes/common.scss是与主题切换无关的变量 ***/
@import './src/common/var.scss'; @import './src/common/var.scss';
@import './common.scss'; @import './common.scss';

View File

@@ -13,6 +13,7 @@
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<nezhaColor <nezhaColor
ref="backgroundNezhaColor"
:isTopo="true" :isTopo="true"
:value-arr="[{name:'bac',value: background}]" :value-arr="[{name:'bac',value: background}]"
@colorChange="backgroundChange"/> @colorChange="backgroundChange"/>
@@ -117,6 +118,7 @@ export default {
this.elements = getTopology(this.meta2dId).store.data.pens this.elements = getTopology(this.meta2dId).store.data.pens
this.background = getTopology(this.meta2dId).store.data.background || '#ffffff00' this.background = getTopology(this.meta2dId).store.data.background || '#ffffff00'
this.bkImage = getTopology(this.meta2dId).store.data.bkImage || '' this.bkImage = getTopology(this.meta2dId).store.data.bkImage || ''
this.$refs.backgroundNezhaColor.colors = this.background
}, },
methods: { methods: {
updateShow (key) { updateShow (key) {
@@ -138,7 +140,7 @@ export default {
} }
if (key === 'visible') { if (key === 'visible') {
obj.visible = !item.visible obj.visible = !item.visible
if (!item.visible) { if (item.visible) {
if (getTopology(this.meta2dId).store.active.length && item.id === getTopology(this.meta2dId).store.active[0].id) { if (getTopology(this.meta2dId).store.active.length && item.id === getTopology(this.meta2dId).store.active[0].id) {
bus.$emit('changeSelectPens', []) bus.$emit('changeSelectPens', [])
} }
@@ -151,7 +153,7 @@ export default {
} }
} }
if (key === 'locked') { if (key === 'locked') {
if (!item.locked) { if (item.locked) {
obj.locked = 10 obj.locked = 10
if (getTopology(this.meta2dId).store.active.length && item.id === getTopology(this.meta2dId).store.active[0].id) { if (getTopology(this.meta2dId).store.active.length && item.id === getTopology(this.meta2dId).store.active[0].id) {
bus.$emit('changeSelectPens', []) bus.$emit('changeSelectPens', [])

View File

@@ -989,7 +989,7 @@
</div> </div>
</div> </div>
<div @click="addTooltipLegend" class="thresholds-add"> <div @click="addTooltipLegend" class="thresholds-add">
{{$t('overall.addTooltipLegend')}} <i class="nz-icon nz-icon-add" /> {{$t('overall.addTooltipLegend')}}
</div> </div>
</div> </div>
</div> </div>