|
@@ -237,7 +237,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<!-- 窗套颜色 -->
|
|
<!-- 窗套颜色 -->
|
|
|
- <div class="design-option">
|
|
|
|
|
|
|
+ <div class="design-option" v-show="selectedWindowStyle != '无'">
|
|
|
<div class="option-title">窗套颜色</div>
|
|
<div class="option-title">窗套颜色</div>
|
|
|
<div class="option-grid stone-colors-grid" ref="windowsRef" @mousedown="handleMouseDown"
|
|
<div class="option-grid stone-colors-grid" ref="windowsRef" @mousedown="handleMouseDown"
|
|
|
@mousemove="handleMouseMove" @mouseup="handleMouseUp" @mouseleave="handleMouseUp">
|
|
@mousemove="handleMouseMove" @mouseup="handleMouseUp" @mouseleave="handleMouseUp">
|
|
@@ -737,8 +737,8 @@ export default class extends Vue {
|
|
|
this.selectedRailing = response.Data.F_CastRailing || this.railings[0].value;
|
|
this.selectedRailing = response.Data.F_CastRailing || this.railings[0].value;
|
|
|
this.selectedTile = response.Data.F_GlazedTile || this.tiles[0].value;//新琉璃瓦
|
|
this.selectedTile = response.Data.F_GlazedTile || this.tiles[0].value;//新琉璃瓦
|
|
|
this.selectedSkirtType = response.Data.F_SkirtType || this.skirtTypes[0].value;//墙裙
|
|
this.selectedSkirtType = response.Data.F_SkirtType || this.skirtTypes[0].value;//墙裙
|
|
|
- this.selectedReliefType = response.Data.F_OutsideRelief || this.outsideRelief[0].value;//浮雕
|
|
|
|
|
- this.selectedWindowStyle = response.Data.F_WindowStyle || this.WindowStyle[0].value;//窗套样式
|
|
|
|
|
|
|
+ this.selectedReliefType = response.Data.F_carvingType || this.outsideRelief[0].value;//浮雕
|
|
|
|
|
+ this.selectedWindowStyle = response.Data.F_WindowsStyle || this.WindowStyle[0].value;//窗套样式
|
|
|
this.oldf_id = response.Data.F_ID;
|
|
this.oldf_id = response.Data.F_ID;
|
|
|
this.color_selValue = response.Data.F_Color || null;// 外墙平涂选中的值
|
|
this.color_selValue = response.Data.F_Color || null;// 外墙平涂选中的值
|
|
|
if (this.color_selValue) {
|
|
if (this.color_selValue) {
|
|
@@ -980,7 +980,7 @@ export default class extends Vue {
|
|
|
const uColorCard = this.ColorCard === '无' ? '' : this.ColorCard;
|
|
const uColorCard = this.ColorCard === '无' ? '' : this.ColorCard;
|
|
|
const uSelectedProcess = this.selectedProcess === '无' ? '' : this.selectedProcess;
|
|
const uSelectedProcess = this.selectedProcess === '无' ? '' : this.selectedProcess;
|
|
|
let uSelectedSplit = this.selectedSplit === '无' ? '' : this.selectedSplit;
|
|
let uSelectedSplit = this.selectedSplit === '无' ? '' : this.selectedSplit;
|
|
|
- const uWindowsColor = this.selectedWindowFrame === '无' ? '' : this.selectedWindowFrame;
|
|
|
|
|
|
|
+ const uWindowsColor = (this.selectedWindowFrame === '无' || this.selectedWindowStyle === '无') ? '' : this.selectedWindowFrame;//窗套样式为空也传空
|
|
|
const uCastRailing = this.selectedRailing === '无' ? '' : this.selectedRailing;
|
|
const uCastRailing = this.selectedRailing === '无' ? '' : this.selectedRailing;
|
|
|
const uColumnType = this.selectedColumnType === '无' ? '' : this.selectedColumnType;//没有传空
|
|
const uColumnType = this.selectedColumnType === '无' ? '' : this.selectedColumnType;//没有传空
|
|
|
const uGlazedTile = this.selectedTile === '无' ? '' : this.selectedTile;
|
|
const uGlazedTile = this.selectedTile === '无' ? '' : this.selectedTile;
|