|
@@ -31,7 +31,7 @@ getLocation 定位
|
|
|
<div class="point">
|
|
|
<span>{{item.Name}}</span>
|
|
|
<el-button size="mini" @click="getDetails(item)" icon="el-icon-edit-outline"></el-button>
|
|
|
- <el-button :disabled="!map" size="mini" @click="btnClick(item)"
|
|
|
+ <el-button :disabled="true" size="mini" @click="btnClick(item)"
|
|
|
:icon="item.X == 0 && item.Y == 0 ? 'el-icon-s-flag' : 'el-icon-place'"></el-button>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -340,19 +340,20 @@ export default {
|
|
|
Filters: `BuildId='${this.buildingData[0]}';floorId='${this.buildingData[1]}'`,
|
|
|
"Cascade": [{ "Name": "imageList" }]
|
|
|
};
|
|
|
- if (this.index == "1") {
|
|
|
+ if (this.activeName2 != "point") {
|
|
|
param.Filters = `BuildId='${this.buildingData[0]}';floorId isNull`
|
|
|
}
|
|
|
this.isLoading = true;
|
|
|
locationPointQuery(param, res => {
|
|
|
this.isLoading = false;
|
|
|
- if (this.index == "1") {
|
|
|
+ if (this.activeName2 != "point") {
|
|
|
this.pointNoData = res.Content;
|
|
|
+ this.$emit("getPointList", []);
|
|
|
}
|
|
|
else {
|
|
|
this.pointData = res.Content;
|
|
|
+ this.$emit("getPointList", res.Content);
|
|
|
}
|
|
|
- this.$emit("getPointList", res.Content);
|
|
|
})
|
|
|
}
|
|
|
},
|