|
@@ -46,11 +46,13 @@
|
|
|
<el-input type="textarea" disabled v-model="EquipItem.formula" :rows="2" placeholder="请输入内容"> </el-input>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="box-padding box-border-bottom">
|
|
|
+ <div class="box-padding box-border-bottom property">
|
|
|
<p class="box-title">字符</p>
|
|
|
<div class="base-property">
|
|
|
<div class="base-property-item">
|
|
|
- <el-color-picker show-alpha class="fix-box-1" v-model="color"></el-color-picker>
|
|
|
+ <div class="cololorSelect">
|
|
|
+ <el-color-picker show-alpha class="fix-box-1" v-model="color"></el-color-picker>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="base-property-item"></div>
|
|
|
</div>
|
|
@@ -100,8 +102,8 @@ export default {
|
|
|
},
|
|
|
set: function () {
|
|
|
this.EquipItem.color = new SColor(this.color);
|
|
|
- }
|
|
|
- }
|
|
|
+ },
|
|
|
+ },
|
|
|
},
|
|
|
methods: {
|
|
|
// 设置宽
|
|
@@ -256,6 +258,21 @@ export default {
|
|
|
padding-right: 12px;
|
|
|
}
|
|
|
}
|
|
|
+ .cololorSelect {
|
|
|
+ width: 32px;
|
|
|
+ height: 20px;
|
|
|
+ overflow: hidden;
|
|
|
+ position: relative;
|
|
|
+ margin: 4px 0;
|
|
|
+ .fix-box-1 {
|
|
|
+ margin-top: -8px;
|
|
|
+ margin-left: -8px;
|
|
|
+ /deep/ .el-color-picker__trigger {
|
|
|
+ width: 200px;
|
|
|
+ height: 200px;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</style>
|