|
@@ -9,12 +9,12 @@ getLocation 定位
|
|
<el-scrollbar style="height:100%;width:calc(100% - 10px);" v-if="pointData.length" v-loading="isLoading">
|
|
<el-scrollbar style="height:100%;width:calc(100% - 10px);" v-if="pointData.length" v-loading="isLoading">
|
|
<div v-for="(item,index) in pointData" :key="index">
|
|
<div v-for="(item,index) in pointData" :key="index">
|
|
<div class="point">
|
|
<div class="point">
|
|
- <span style="line-height:30px;">{{item.Name}}</span>
|
|
|
|
|
|
+ <span style="line-height:30px;">{{item.name}}</span>
|
|
<div style="height:30px;float:right;font-size:14px;">
|
|
<div style="height:30px;float:right;font-size:14px;">
|
|
<el-button size="mini" @click="getDetails(item)" icon="el-icon-edit-outline"></el-button>
|
|
<el-button size="mini" @click="getDetails(item)" icon="el-icon-edit-outline"></el-button>
|
|
<el-button size="mini" @click="updateOrCreate(item)" icon="el-icon-link"></el-button>
|
|
<el-button size="mini" @click="updateOrCreate(item)" icon="el-icon-link"></el-button>
|
|
<el-button :disabled="!map" size="mini" @click="btnClick(item)"
|
|
<el-button :disabled="!map" size="mini" @click="btnClick(item)"
|
|
- :icon="item.X == 0 && item.Y == 0 ? 'el-icon-s-flag' : 'el-icon-place'"></el-button>
|
|
|
|
|
|
+ :icon="item.x == 0 && item.y == 0 ? 'el-icon-s-flag' : 'el-icon-place'"></el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -22,23 +22,23 @@ getLocation 定位
|
|
|
|
|
|
<div v-if="!pointData.length" class="center" style="height: 400px;padding-top: 260px; box-sizing:border-box;">
|
|
<div v-if="!pointData.length" class="center" style="height: 400px;padding-top: 260px; box-sizing:border-box;">
|
|
<i class="icon-wushuju iconfont"></i>
|
|
<i class="icon-wushuju iconfont"></i>
|
|
- {{pointParam.FloorId ? "数据为空" : "请选择楼层"}}
|
|
|
|
|
|
+ {{pointParam.floorId ? "数据为空" : "请选择楼层"}}
|
|
</div>
|
|
</div>
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
<el-tab-pane label="无法定位到楼层的点位标签" name="noPoint">
|
|
<el-tab-pane label="无法定位到楼层的点位标签" name="noPoint">
|
|
<div v-if="pointNoData.length" v-loading="isLoading" style="max-height: 600px;">
|
|
<div v-if="pointNoData.length" v-loading="isLoading" style="max-height: 600px;">
|
|
<div v-for="(item,index) in pointNoData" :key="index">
|
|
<div v-for="(item,index) in pointNoData" :key="index">
|
|
<div class="point">
|
|
<div class="point">
|
|
- <span>{{item.Name}}</span>
|
|
|
|
|
|
+ <span>{{item.name}}</span>
|
|
<el-button size="mini" @click="getDetails(item)" icon="el-icon-edit-outline"></el-button>
|
|
<el-button size="mini" @click="getDetails(item)" icon="el-icon-edit-outline"></el-button>
|
|
<el-button :disabled="true" 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>
|
|
|
|
|
|
+ :icon="item.x == 0 && item.y == 0 ? 'el-icon-s-flag' : 'el-icon-place'"></el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div v-if="!pointNoData.length" class="center" style="height: 400px;padding-top: 260px; box-sizing:border-box;">
|
|
<div v-if="!pointNoData.length" class="center" style="height: 400px;padding-top: 260px; box-sizing:border-box;">
|
|
<i class="icon-wushuju iconfont"></i>
|
|
<i class="icon-wushuju iconfont"></i>
|
|
- {{pointParam.FloorId ? "数据为空" : "请选择楼层"}}
|
|
|
|
|
|
+ {{pointParam.floorId ? "数据为空" : "请选择楼层"}}
|
|
</div>
|
|
</div>
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
</el-tabs>
|
|
</el-tabs>
|
|
@@ -46,19 +46,19 @@ getLocation 定位
|
|
<div class="qrcode">
|
|
<div class="qrcode">
|
|
<div class="qrcode-view">
|
|
<div class="qrcode-view">
|
|
<img
|
|
<img
|
|
- :src="'/ScanBuilding/service/qrcode/point?projectId=' + projectId + '&pointId=' + pointDetails.PointId + '&FloorId=' + pointDetails.FloorId + '&width=200&height=200'"
|
|
|
|
|
|
+ :src="'/ScanBuilding/service/qrcode/point?projectId=' + projectId + '&pointId=' + pointDetails.id + '&FloorId=' + pointDetails.floorId + '&width=200&height=200'"
|
|
alt="点位标签二维码">
|
|
alt="点位标签二维码">
|
|
</div>
|
|
</div>
|
|
<div class="point-edit">
|
|
<div class="point-edit">
|
|
<p>
|
|
<p>
|
|
- 点位标签的现场位置:{{activeName2 != 'point' ? '无楼层' : pointParam.fllorName}}
|
|
|
|
|
|
+ 点位标签的现场位置:{{activeName2 != 'point' ? '无楼层' : pointParam.floorName}}
|
|
-{{pointDetails.spaceName || '未知原空间'}}
|
|
-{{pointDetails.spaceName || '未知原空间'}}
|
|
- -({{pointDetails.X}},{{pointDetails.Y}})
|
|
|
|
|
|
+ -({{pointDetails.x}},{{pointDetails.y}})
|
|
</p>
|
|
</p>
|
|
<div>
|
|
<div>
|
|
- <form-input :width="100" @change="changeInput" :value="pointDetails.Name" :keys="'Name'" :label="'点位标签'" :isRule="false">
|
|
|
|
|
|
+ <form-input :width="100" @change="changeInput" :value="pointDetails.name" :keys="'name'" :label="'点位标签'" :isRule="false">
|
|
</form-input>
|
|
</form-input>
|
|
- <form-input :width="100" @change="changeInput" :value="pointDetails.LocalId" :keys="'LocalId'" :label="'点位本地编码'"
|
|
|
|
|
|
+ <form-input :width="100" @change="changeInput" :value="pointDetails.localId" :keys="'localId'" :label="'点位本地编码'"
|
|
:isRule="false"></form-input>
|
|
:isRule="false"></form-input>
|
|
<!-- <form-input></form-input> -->
|
|
<!-- <form-input></form-input> -->
|
|
</div>
|
|
</div>
|
|
@@ -69,11 +69,11 @@ getLocation 定位
|
|
<ul>
|
|
<ul>
|
|
<li>
|
|
<li>
|
|
<span>点位标签ID</span>
|
|
<span>点位标签ID</span>
|
|
- <span>{{pointDetails.PointId}}</span>
|
|
|
|
|
|
+ <span>{{pointDetails.id}}</span>
|
|
</li>
|
|
</li>
|
|
<li>
|
|
<li>
|
|
<span>模型ID</span>
|
|
<span>模型ID</span>
|
|
- <span>{{pointDetails.BimId || '暂无'}}</span>
|
|
|
|
|
|
+ <span>{{pointDetails.bimId || '暂无'}}</span>
|
|
</li>
|
|
</li>
|
|
</ul>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
@@ -87,7 +87,7 @@ getLocation 定位
|
|
<li>
|
|
<li>
|
|
<span>备注</span>
|
|
<span>备注</span>
|
|
<span>
|
|
<span>
|
|
- <form-input :width="0" @change="changeInput" :value="pointDetails.Note" :keys="'Note'" :label="''" :isRule="false"></form-input>
|
|
|
|
|
|
+ <form-input :width="0" @change="changeInput" :value="pointDetails.note" :keys="'note'" :label="''" :isRule="false"></form-input>
|
|
</span>
|
|
</span>
|
|
</li>
|
|
</li>
|
|
</ul>
|
|
</ul>
|
|
@@ -97,7 +97,7 @@ getLocation 定位
|
|
<template v-for="(item,index) in installPic">
|
|
<template v-for="(item,index) in installPic">
|
|
<div class="point-image" :key="index">
|
|
<div class="point-image" :key="index">
|
|
<i class="el-icon-delete" @click="delImage(index,installPic)"></i>
|
|
<i class="el-icon-delete" @click="delImage(index,installPic)"></i>
|
|
- <img :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.Key +'&width=200&height=200'" alt>
|
|
|
|
|
|
+ <img :src="geterateImgUrl(item.key)" alt>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<load-img keyName="安装位置" @getKey="getKey"></load-img>
|
|
<load-img keyName="安装位置" @getKey="getKey"></load-img>
|
|
@@ -107,7 +107,7 @@ getLocation 定位
|
|
<template v-for="(item,index) in panorama">
|
|
<template v-for="(item,index) in panorama">
|
|
<div class="point-image" :key="index">
|
|
<div class="point-image" :key="index">
|
|
<i class="el-icon-delete" @click="delImage(index,panorama)"></i>
|
|
<i class="el-icon-delete" @click="delImage(index,panorama)"></i>
|
|
- <img :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.Key +'&width=200&height=200'" alt>
|
|
|
|
|
|
+ <img :src="geterateImgUrl(item.key)" alt>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<load-img keyName="全景照片" @getKey="getKey"></load-img>
|
|
<load-img keyName="全景照片" @getKey="getKey"></load-img>
|
|
@@ -117,7 +117,7 @@ getLocation 定位
|
|
<template v-for="(item,index) in rimPic">
|
|
<template v-for="(item,index) in rimPic">
|
|
<div class="point-image" :key="index">
|
|
<div class="point-image" :key="index">
|
|
<i class="el-icon-delete" @click="delImage(index,rimPic)"></i>
|
|
<i class="el-icon-delete" @click="delImage(index,rimPic)"></i>
|
|
- <img :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.Key +'&width=200&height=200'" alt>
|
|
|
|
|
|
+ <img :src="geterateImgUrl(item.key)" alt>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<load-img keyName="周边照片" @getKey="getKey"></load-img>
|
|
<load-img keyName="周边照片" @getKey="getKey"></load-img>
|
|
@@ -127,7 +127,7 @@ getLocation 定位
|
|
<template v-for="(item,index) in videoPic">
|
|
<template v-for="(item,index) in videoPic">
|
|
<div class="point-image" :key="index">
|
|
<div class="point-image" :key="index">
|
|
<i class="el-icon-delete" @click="delImage(index,videoPic)"></i>
|
|
<i class="el-icon-delete" @click="delImage(index,videoPic)"></i>
|
|
- <img :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.Key +'&width=200&height=200'" alt>
|
|
|
|
|
|
+ <img :src="geterateImgUrl(item.key)" alt>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<load-img keyName="视频" @getKey="getKey"></load-img>
|
|
<load-img keyName="视频" @getKey="getKey"></load-img>
|
|
@@ -137,7 +137,7 @@ getLocation 定位
|
|
<template v-for="(item,index) in elsePic">
|
|
<template v-for="(item,index) in elsePic">
|
|
<div class="point-image" :key="index">
|
|
<div class="point-image" :key="index">
|
|
<i class="el-icon-delete" @click="delImage(index,elsePic)"></i>
|
|
<i class="el-icon-delete" @click="delImage(index,elsePic)"></i>
|
|
- <img :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.Key +'&width=200&height=200'" alt>
|
|
|
|
|
|
+ <img :src="geterateImgUrl(item.key)" alt>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<load-img keyName="其他照片" @getKey="getKey"></load-img>
|
|
<load-img keyName="其他照片" @getKey="getKey"></load-img>
|
|
@@ -217,35 +217,35 @@ export default {
|
|
switch (name) {
|
|
switch (name) {
|
|
case "安装位置":
|
|
case "安装位置":
|
|
this.installPic.push({
|
|
this.installPic.push({
|
|
- Key: val,
|
|
|
|
|
|
+ key: val,
|
|
name: name,
|
|
name: name,
|
|
type: "image_wz"
|
|
type: "image_wz"
|
|
});
|
|
});
|
|
break;
|
|
break;
|
|
case "全景照片":
|
|
case "全景照片":
|
|
this.panorama.push({
|
|
this.panorama.push({
|
|
- Key: val,
|
|
|
|
|
|
+ key: val,
|
|
name: name,
|
|
name: name,
|
|
type: "panorama"
|
|
type: "panorama"
|
|
});
|
|
});
|
|
break;
|
|
break;
|
|
case "周边照片":
|
|
case "周边照片":
|
|
this.rimPic.push({
|
|
this.rimPic.push({
|
|
- Key: val,
|
|
|
|
|
|
+ key: val,
|
|
name: name,
|
|
name: name,
|
|
type: "image_zb"
|
|
type: "image_zb"
|
|
});
|
|
});
|
|
break;
|
|
break;
|
|
case "视频":
|
|
case "视频":
|
|
this.videoPic.push({
|
|
this.videoPic.push({
|
|
- Key: val,
|
|
|
|
|
|
+ key: val,
|
|
name: name,
|
|
name: name,
|
|
type: "video"
|
|
type: "video"
|
|
});
|
|
});
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
this.elsePic.push({
|
|
this.elsePic.push({
|
|
- Key: val,
|
|
|
|
|
|
+ key: val,
|
|
name: name,
|
|
name: name,
|
|
type: "image_else"
|
|
type: "image_else"
|
|
});
|
|
});
|
|
@@ -275,7 +275,7 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
btnClick(item) {
|
|
btnClick(item) {
|
|
- if (item.X == 0 && item.Y == 0) {
|
|
|
|
|
|
+ if (item.x == 0 && item.y == 0) {
|
|
this.$emit("setFalg", item);
|
|
this.$emit("setFalg", item);
|
|
} else {
|
|
} else {
|
|
this.$emit("getLocation", item);
|
|
this.$emit("getLocation", item);
|
|
@@ -288,14 +288,14 @@ export default {
|
|
},
|
|
},
|
|
//修改详情
|
|
//修改详情
|
|
updatePoint() {
|
|
updatePoint() {
|
|
- this.pointDetails.ImageList = [];
|
|
|
|
- this.mapPush(this.pointDetails.ImageList, this.installPic);
|
|
|
|
- this.mapPush(this.pointDetails.ImageList, this.panorama);
|
|
|
|
- this.mapPush(this.pointDetails.ImageList, this.rimPic);
|
|
|
|
- this.mapPush(this.pointDetails.ImageList, this.videoPic);
|
|
|
|
- this.mapPush(this.pointDetails.ImageList, this.elsePic);
|
|
|
|
|
|
+ this.pointDetails.imageList = [];
|
|
|
|
+ this.mapPush(this.pointDetails.imageList, this.installPic);
|
|
|
|
+ this.mapPush(this.pointDetails.imageList, this.panorama);
|
|
|
|
+ this.mapPush(this.pointDetails.imageList, this.rimPic);
|
|
|
|
+ this.mapPush(this.pointDetails.imageList, this.videoPic);
|
|
|
|
+ this.mapPush(this.pointDetails.imageList, this.elsePic);
|
|
let pa = {
|
|
let pa = {
|
|
- Content: [this.pointDetails]
|
|
|
|
|
|
+ content: [this.pointDetails]
|
|
}
|
|
}
|
|
updateLocationPoint(pa, res => {
|
|
updateLocationPoint(pa, res => {
|
|
this.$message.success("修改成功");
|
|
this.$message.success("修改成功");
|
|
@@ -304,8 +304,8 @@ export default {
|
|
getDetails(item) {
|
|
getDetails(item) {
|
|
this.pointShow = true;
|
|
this.pointShow = true;
|
|
this.pointDetails = item;
|
|
this.pointDetails = item;
|
|
- if (item.ImageList && item.ImageList.length) {
|
|
|
|
- this.getPic(item.ImageList);
|
|
|
|
|
|
+ if (item.imageList && item.imageList.length) {
|
|
|
|
+ this.getPic(item.imageList);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
getPic(imgArr) {
|
|
getPic(imgArr) {
|
|
@@ -337,22 +337,22 @@ export default {
|
|
getPointList() {
|
|
getPointList() {
|
|
if (this.buildingData[0] && this.buildingData[1]) {
|
|
if (this.buildingData[0] && this.buildingData[1]) {
|
|
let param = {
|
|
let param = {
|
|
- Filters: `BuildId='${this.buildingData[0]}';floorId='${this.buildingData[1]}'`,
|
|
|
|
- "Cascade": [{ "Name": "imageList" }]
|
|
|
|
|
|
+ filters: `buildId='${this.buildingData[0]}';floorId='${this.buildingData[1]}'`,
|
|
|
|
+ cascade: [{ name: "imageList" }]
|
|
};
|
|
};
|
|
if (this.activeName2 != "point") {
|
|
if (this.activeName2 != "point") {
|
|
- param.Filters = `BuildId='${this.buildingData[0]}';floorId isNull`
|
|
|
|
|
|
+ param.filters = `buildId='${this.buildingData[0]}';floorId isNull`
|
|
}
|
|
}
|
|
this.isLoading = true;
|
|
this.isLoading = true;
|
|
locationPointQuery(param, res => {
|
|
locationPointQuery(param, res => {
|
|
this.isLoading = false;
|
|
this.isLoading = false;
|
|
if (this.activeName2 != "point") {
|
|
if (this.activeName2 != "point") {
|
|
- this.pointNoData = res.Content;
|
|
|
|
|
|
+ this.pointNoData = res.content;
|
|
this.$emit("getPointList", []);
|
|
this.$emit("getPointList", []);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
- this.pointData = res.Content;
|
|
|
|
- this.$emit("getPointList", res.Content);
|
|
|
|
|
|
+ this.pointData = res.content;
|
|
|
|
+ this.$emit("getPointList", res.content);
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@@ -360,11 +360,15 @@ export default {
|
|
//初始化
|
|
//初始化
|
|
reset(data, map) {
|
|
reset(data, map) {
|
|
this.map = map
|
|
this.map = map
|
|
- this.pointParam.FloorId = data.FloorId;
|
|
|
|
- this.pointParam.fllorName = data.fllorName;
|
|
|
|
|
|
+ this.pointParam.floorId = data.floorId;
|
|
|
|
+ this.pointParam.floorName = data.floorName;
|
|
this.buildingData = data.buildingData;
|
|
this.buildingData = data.buildingData;
|
|
this.activeName2 = "point";
|
|
this.activeName2 = "point";
|
|
this.getPointList();
|
|
this.getPointList();
|
|
|
|
+ },
|
|
|
|
+ // 生成图片路径
|
|
|
|
+ geterateImgUrl(key){
|
|
|
|
+ return '/image-service/common/image_get?systemId=dataPlatform&key='+ key +'&width=200&height=200'
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|