Merge branch 'master' of http://123.132.248.154:10000/xujingliang/Fei_Xian_Lin_Ye_Fang_Huo
commit
5168041b57
|
|
@ -17,12 +17,12 @@
|
|||
<div class="flex jc-sb">
|
||||
<div style="positon:relative;width:160px;left:50px;">
|
||||
<div style="color:#156EF9;font-size:18px;">{{item.name}}</div>
|
||||
<div>{{item.phone}}</div>
|
||||
<div>类型:{{item.type}}{{item.phone}}</div>
|
||||
</div>
|
||||
<div class="flex ai-c jc-e" style="width:75px">
|
||||
<img class="img-box" src="/img/homeimg/video-call-icon.png" @click="videoCall(item.phone)" />
|
||||
<img class="img-box" v-if="item.type=='人员'" src="/img/homeimg/video-call-icon.png" @click="videoCall(item.phone)" />
|
||||
<img class="img-box" src="/img/homeimg/to-position-icon.png" @click="toPosition([item.lng,item.lat])" />
|
||||
<img class="img-box" src="/img/phone.png" @click="callPhoneOne(item.phone)" />
|
||||
<img class="img-box" v-if="item.type=='人员'" src="/img/phone.png" @click="callPhoneOne(item.phone)" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -169,6 +169,7 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common';
|
|||
this.markGraphicLayerArr = [];
|
||||
|
||||
this.list.forEach((item, index) => {
|
||||
let showVideo = item.type == '人员' ? 'inline':'none';
|
||||
let graphic = new mars3d.graphic.BillboardEntity({
|
||||
position: [item.lng, item.lat],
|
||||
style: {
|
||||
|
|
@ -176,7 +177,7 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common';
|
|||
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
|
||||
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
|
||||
clampToGround: true,
|
||||
scale: 0.7,
|
||||
scale: 0.4,
|
||||
label: {
|
||||
text: "",
|
||||
font_size: 14,
|
||||
|
|
@ -206,7 +207,7 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common';
|
|||
<div class="data-li">
|
||||
<div class="data-label"></div>
|
||||
<div class="data-value">
|
||||
<span class="label-tag data-value-status-2" title="视频通话" onclick="videoCall('${item.phone}')">视频通话</span></div>
|
||||
<span class="label-tag data-value-status-2" style="display:${showVideo}" title="视频通话" onclick="videoCall('${item.phone}')">视频通话</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue