|
@@ -53,9 +53,24 @@
|
|
v-model="scope.row.condition"
|
|
v-model="scope.row.condition"
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
class="input-style"
|
|
class="input-style"
|
|
|
|
+ v-if="scope.row.condition == 'identity'"
|
|
>
|
|
>
|
|
<el-option
|
|
<el-option
|
|
- v-for="item in conditionList"
|
|
|
|
|
|
+ v-for="item in conditionList1"
|
|
|
|
+ :key="item.value"
|
|
|
|
+ :label="item.label"
|
|
|
|
+ :value="item.value"
|
|
|
|
+ >
|
|
|
|
+ </el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="scope.row.condition"
|
|
|
|
+ placeholder="请选择"
|
|
|
|
+ class="input-style"
|
|
|
|
+ v-if="scope.row.condition == 'contain'"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="item in conditionList2"
|
|
:key="item.value"
|
|
:key="item.value"
|
|
:label="item.label"
|
|
:label="item.label"
|
|
:value="item.value"
|
|
:value="item.value"
|
|
@@ -543,15 +558,25 @@ export default {
|
|
optionsTemp: [],
|
|
optionsTemp: [],
|
|
selectdialogData: [],
|
|
selectdialogData: [],
|
|
dialogData: [],
|
|
dialogData: [],
|
|
- conditionList: [
|
|
|
|
|
|
+ conditionList1: [
|
|
{ label: "范围内", value: "identity" },
|
|
{ label: "范围内", value: "identity" },
|
|
{ label: "范围外", value: "n_identity" },
|
|
{ label: "范围外", value: "n_identity" },
|
|
|
|
+ ],
|
|
|
|
+ conditionList2: [
|
|
{ label: "距离包含", value: "contain" },
|
|
{ label: "距离包含", value: "contain" },
|
|
{ label: "距离不包含", value: "n_contain" },
|
|
{ label: "距离不包含", value: "n_contain" },
|
|
- // { label: "分析", value: "F" },contain,n_contain,相交/不相交::identity,n_identity
|
|
|
|
],
|
|
],
|
|
};
|
|
};
|
|
},
|
|
},
|
|
|
|
+ computed: {
|
|
|
|
+ conditionList(val) {
|
|
|
|
+ if (val == "identity") {
|
|
|
|
+ return this.conditionList1;
|
|
|
|
+ } else {
|
|
|
|
+ return this.conditionList2;
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ },
|
|
mounted() {
|
|
mounted() {
|
|
// this.getList();
|
|
// this.getList();
|
|
this.GetFxyzList();
|
|
this.GetFxyzList();
|