|
@@ -464,15 +464,15 @@ export default {
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </span>" +
|
|
" </span>" +
|
|
- "<span>" +
|
|
|
|
- ' <div class="d-l-con">' +
|
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
|
- " <h4>地址:" +
|
|
|
|
- (item.address ? item.address : "") +
|
|
|
|
- "</h4>" +
|
|
|
|
- " </div>" +
|
|
|
|
- " </div>" +
|
|
|
|
- " </span>" +
|
|
|
|
|
|
+ // "<span>" +
|
|
|
|
+ // ' <div class="d-l-con">' +
|
|
|
|
+ // ' <div class="d-l-l-text">' +
|
|
|
|
+ // " <h4>地址:" +
|
|
|
|
+ // (item.address ? item.address : "") +
|
|
|
|
+ // "</h4>" +
|
|
|
|
+ // " </div>" +
|
|
|
|
+ // " </div>" +
|
|
|
|
+ // " </span>" +
|
|
"<span>" +
|
|
"<span>" +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
@@ -510,8 +510,8 @@ export default {
|
|
},
|
|
},
|
|
];
|
|
];
|
|
const labelChannels = [];
|
|
const labelChannels = [];
|
|
- if(0<data1.cameras.length)
|
|
|
|
- {
|
|
|
|
|
|
+ // if(0<data1.cameras.length)
|
|
|
|
+ // {
|
|
for (let i in data1.cameras) {
|
|
for (let i in data1.cameras) {
|
|
treeLabels.push({
|
|
treeLabels.push({
|
|
id: null,
|
|
id: null,
|
|
@@ -541,6 +541,7 @@ export default {
|
|
labelChannels: labelChannels,
|
|
labelChannels: labelChannels,
|
|
},
|
|
},
|
|
]
|
|
]
|
|
|
|
+ console.log(dianshiqiang)
|
|
this.$refs.TVWalls.showTVWall1(
|
|
this.$refs.TVWalls.showTVWall1(
|
|
dianshiqiang,
|
|
dianshiqiang,
|
|
{
|
|
{
|
|
@@ -550,7 +551,16 @@ export default {
|
|
data1.detail
|
|
data1.detail
|
|
);
|
|
);
|
|
|
|
|
|
- }
|
|
|
|
|
|
+ // }else {
|
|
|
|
+ // this.$refs.TVWalls.showTVWall1(
|
|
|
|
+ // [],
|
|
|
|
+ // {
|
|
|
|
+ // longitude: params.longitude,
|
|
|
|
+ // latitude: params.latitude
|
|
|
|
+ // },
|
|
|
|
+ // data1.detail
|
|
|
|
+ // );
|
|
|
|
+ // }
|
|
})
|
|
})
|
|
},
|
|
},
|
|
indentleftByDeptIdSetMarkers(deptId) {
|
|
indentleftByDeptIdSetMarkers(deptId) {
|