|
@@ -12,23 +12,13 @@
|
|
<el-row class="buttons-box">
|
|
<el-row class="buttons-box">
|
|
<div style="height:50px;width:100%;background:#fff;" v-if="showOtherFlag">
|
|
<div style="height:50px;width:100%;background:#fff;" v-if="showOtherFlag">
|
|
<!-- 平面图其他分区 -->
|
|
<!-- 平面图其他分区 -->
|
|
- <el-select v-model="OtherValue" placeholder="请选择">
|
|
|
|
|
|
+ <el-select v-model="OtherValue" placeholder="请选择分区类型" @change="changeOtherZone">
|
|
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
|
|
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
|
|
+ <el-button type="promary" @click="addZoneBtn">添加分区</el-button>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
-<!--添加分区-->
|
|
|
|
- <el-button @click="addZoneBtn">添加分区</el-button>
|
|
|
|
- <el-select v-model="zoneValue" placeholder="请选择">
|
|
|
|
- <el-option
|
|
|
|
- v-for="item in addZone"
|
|
|
|
- :key="item.value"
|
|
|
|
- :label="item.label"
|
|
|
|
- :value="item.value">
|
|
|
|
- </el-option>
|
|
|
|
- </el-select>
|
|
|
|
- |
|
|
|
|
<el-autocomplete popper-class="my-autocomplete" v-model="search" :fetch-suggestions="querySearch" placeholder="输入平面图中已有的业务空间名称进行查找"
|
|
<el-autocomplete popper-class="my-autocomplete" v-model="search" :fetch-suggestions="querySearch" placeholder="输入平面图中已有的业务空间名称进行查找"
|
|
width="180px" @select="handleSelect">
|
|
width="180px" @select="handleSelect">
|
|
<i class="el-icon-search el-input__icon" slot="suffix" @click="handleSelect"></i>
|
|
<i class="el-icon-search el-input__icon" slot="suffix" @click="handleSelect"></i>
|
|
@@ -113,7 +103,7 @@
|
|
<el-button size="small" type="primary" @click="confirm">确认</el-button>
|
|
<el-button size="small" type="primary" @click="confirm">确认</el-button>
|
|
</span>
|
|
</span>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
- <dialogZone ref="zone"/>
|
|
|
|
|
|
+ <dialogZone ref="zone" @createSuccess="getOhterType" />
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<script>
|
|
<script>
|
|
@@ -134,7 +124,8 @@ import {
|
|
getIspNotInSpace,
|
|
getIspNotInSpace,
|
|
createRelateInZoneAndISp,
|
|
createRelateInZoneAndISp,
|
|
groupCreRelaZoneAndISp,
|
|
groupCreRelaZoneAndISp,
|
|
- getZoneQuery
|
|
|
|
|
|
+ getZoneQuery,
|
|
|
|
+ queryAllZoneType, // 定制分区类型
|
|
} from "@/api/scan/request"
|
|
} from "@/api/scan/request"
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -146,8 +137,6 @@ export default {
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
- zoneValue:'',
|
|
|
|
- addZone:[],
|
|
|
|
canvasWidth: 800,
|
|
canvasWidth: 800,
|
|
canvasHeight: 600,
|
|
canvasHeight: 600,
|
|
type: 1, // 默认操作模式
|
|
type: 1, // 默认操作模式
|
|
@@ -182,7 +171,7 @@ export default {
|
|
sourceIdToISP: {},
|
|
sourceIdToISP: {},
|
|
areaValue: 40,
|
|
areaValue: 40,
|
|
areaMarks: { 0: '0m²', 100: '1m²' },
|
|
areaMarks: { 0: '0m²', 100: '1m²' },
|
|
- options: [{ value: '选项1', label: '黄金糕' }, { value: '选项2', label: '双皮奶' }], //其他分区类型
|
|
|
|
|
|
+ options: [], //其他分区类型
|
|
OtherValue: '',
|
|
OtherValue: '',
|
|
showOtherFlag: false, //是否显示其他分区类型添加
|
|
showOtherFlag: false, //是否显示其他分区类型添加
|
|
}
|
|
}
|
|
@@ -295,11 +284,34 @@ export default {
|
|
if (tab.code == "OtherZone") {
|
|
if (tab.code == "OtherZone") {
|
|
// 其他分区
|
|
// 其他分区
|
|
this.showOtherFlag = true
|
|
this.showOtherFlag = true
|
|
|
|
+ this.getOhterType();
|
|
} else {
|
|
} else {
|
|
this.showOtherFlag = false;
|
|
this.showOtherFlag = false;
|
|
this.init(initType);
|
|
this.init(initType);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ // 其他分区类型查询
|
|
|
|
+ getOhterType() {
|
|
|
|
+ let pa = {
|
|
|
|
+ Cascade: [{ Name: 'zoneType' }],
|
|
|
|
+ Filters: `Code="OtherZone"`
|
|
|
|
+ }
|
|
|
|
+ queryAllZoneType(pa, res => {
|
|
|
|
+ if (res.Content[0].ZoneType && res.Content[0].ZoneType.length) {
|
|
|
|
+ this.options = res.Content[0].ZoneType.map(t => {
|
|
|
|
+ t.value = t.Code;
|
|
|
|
+ t.label = t.Name;
|
|
|
|
+ return t;
|
|
|
|
+ })
|
|
|
|
+ } else {
|
|
|
|
+ this.options = []
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ // 其他类型下拉change
|
|
|
|
+ changeOtherZone(val) {
|
|
|
|
+ console.log(val)
|
|
|
|
+ },
|
|
// 获取未绑定业务空间的元空间
|
|
// 获取未绑定业务空间的元空间
|
|
getISPSPUnrelaBSP() {
|
|
getISPSPUnrelaBSP() {
|
|
let pa = {
|
|
let pa = {
|