|
@@ -97,15 +97,15 @@
|
|
|
</div>
|
|
|
<div class="XZtree">
|
|
|
<el-table :data="tableData" style="width: 100%">
|
|
|
- <el-table-column prop="yxyzmc" label="因子名称" show-overflow-tooltip>
|
|
|
+ <el-table-column prop="name" label="因子名称" show-overflow-tooltip>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="条件" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ yztj(scope.row.spatial_type) }}</span>
|
|
|
+ <span>{{ yztj(scope.row.default) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column prop="yxz" label="值" show-overflow-tooltip>
|
|
|
+ <el-table-column prop="defaultValue" label="值" show-overflow-tooltip>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
@@ -138,7 +138,7 @@ export default {
|
|
|
|
|
|
data() {
|
|
|
return {
|
|
|
- checkbox_data:0,
|
|
|
+ checkbox_data: 0,
|
|
|
ruleForm: {
|
|
|
xzmj: 0,
|
|
|
xmmc: "",
|
|
@@ -148,7 +148,7 @@ export default {
|
|
|
ydmjbegin: "", //用地面积开始
|
|
|
ydmjend: "", //用地面积结束
|
|
|
sjy: "", //数据源
|
|
|
- xzys: 0,//选址约束,暂时没有在逻辑里添加改字段
|
|
|
+ xzys: 0, //选址约束,暂时没有在逻辑里添加改字段
|
|
|
},
|
|
|
rules: {
|
|
|
xzmj: [{ required: true, message: "请填写范围的数据" }],
|
|
@@ -168,7 +168,9 @@ export default {
|
|
|
],
|
|
|
|
|
|
sjy: [{ required: true, message: "请选择数据源", trigger: "change" }],
|
|
|
- xzys: [{ required: true, message: "请选择选址约束", trigger: "change" }],
|
|
|
+ xzys: [
|
|
|
+ { required: true, message: "请选择选址约束", trigger: "change" },
|
|
|
+ ],
|
|
|
},
|
|
|
options: [],
|
|
|
tableData: [],
|
|
@@ -210,8 +212,8 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
methods: {
|
|
|
- changeCheckBox(val){
|
|
|
-console.log(val,'杰卡斯到货时间啊肯定会刷卡机很大');
|
|
|
+ changeCheckBox(val) {
|
|
|
+ console.log(val, "杰卡斯到货时间啊肯定会刷卡机很大");
|
|
|
},
|
|
|
handleChange(value) {
|
|
|
// console.log(value);
|
|
@@ -290,14 +292,22 @@ console.log(val,'杰卡斯到货时间啊肯定会刷卡机很大');
|
|
|
},
|
|
|
// 影响因子条件展示
|
|
|
yztj(val) {
|
|
|
- if (val == "identity") {
|
|
|
- return "范围内";
|
|
|
- } else if (val == "n_identity") {
|
|
|
- return "范围外";
|
|
|
+ if (val == "intersect") {
|
|
|
+ return "相交";
|
|
|
+ } else if (val == "not_intersect") {
|
|
|
+ return "不相交";
|
|
|
} else if (val == "contain") {
|
|
|
- return "距离包含";
|
|
|
- } else if (val == "n_contain") {
|
|
|
- return "距离不包含";
|
|
|
+ return "包含";
|
|
|
+ } else if (val == "not_contain") {
|
|
|
+ return "不包含";
|
|
|
+ }else if (val == "gt") {
|
|
|
+ return "大于";
|
|
|
+ }else if (val == "lt") {
|
|
|
+ return "小于";
|
|
|
+ }else if (val == "get") {
|
|
|
+ return "大于等于";
|
|
|
+ }else if (val == "let") {
|
|
|
+ return "小于等于";
|
|
|
}
|
|
|
},
|
|
|
yzpz() {
|
|
@@ -343,7 +353,7 @@ console.log(val,'杰卡斯到货时间啊肯定会刷卡机很大');
|
|
|
/deep/ .el-form-item__error {
|
|
|
top: 32px !important;
|
|
|
}
|
|
|
-/deep/ .el-checkbox{
|
|
|
+/deep/ .el-checkbox {
|
|
|
color: #fff;
|
|
|
}
|
|
|
</style>
|