diff --git a/src/api/model/third.js b/src/api/model/third.js
index e4caabb9..0a86fbfb 100644
--- a/src/api/model/third.js
+++ b/src/api/model/third.js
@@ -35,6 +35,15 @@ export default {
},
blt:{
+ list:{
+ name: "全部在线标签列表信息",
+ req: async function(data){
+ return await http.post(
+ `${config.API_URL}/third/tdevice/blt/`,
+ data
+ );
+ }
+ },
all:{
name: "全部在线标签列表信息",
req: async function(data){
@@ -64,5 +73,14 @@ export default {
}
},
+ thirdLog:{
+ name: "第三方日志",
+ req: async function(data){
+ return await http.get(
+ `${config.API_URL}/third/tlog/`,
+ data
+ );
+ }
+ }
}
diff --git a/src/config/route.js b/src/config/route.js
index 6b9fcea2..4e8aaa85 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -525,6 +525,14 @@ const routes = [
"icon": "el-icon-menu",
},
"component": "am/audio"
+ },{
+ "name": "blt",
+ "path": "/am/blt",
+ "meta": {
+ "title": "定位标签",
+ "icon": "el-icon-menu",
+ },
+ "component": "am/blt"
},
]
},
@@ -669,15 +677,15 @@ const routes = [
},
"component": "ops/log_request"
},
- /*{
- "name": "monitor",
- "path": "/ops/monitor",
+ {
+ "name": "thirdLogs",
+ "path": "/ops/thirdLogs",
"meta": {
- "title": "服务监控",
+ "title": "第三方日志",
"icon": "el-icon-fold",
},
- "component": "ops/monitor"
- },*/
+ "component": "ops/thirdLogs"
+ },
]
},
]
diff --git a/src/views/am/blt.vue b/src/views/am/blt.vue
new file mode 100644
index 00000000..6c8e0b87
--- /dev/null
+++ b/src/views/am/blt.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.extra.player.EnvVolume}}
+
+
+
+
+
+ {{scope.row.extra.ip}}
+
+
+
+
+ {{scope.row.extra.online}}
+
+
+
+
+
+
+
+
+ 标记位置
+
+
+
+
+
+
+
+
+
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index d6e776c2..a8d31431 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -833,6 +833,7 @@
userMaskerLayer: null,
jobDomMarkerLayer: null,
riskMarkerLayer: null,//风险区域
+ areaMarkerLayer: null,//区域展示
pointMarkerLayer: null,//点位图层
polygonMaskerLayer: null,//危险作业
cameraMaskerLayer: null,//摄像头
@@ -840,6 +841,7 @@
carsMaskerLayer: null,//车辆
manMaskerLayer: null,//人员
flyManager: null,
+ eareMarker: null,
dropIndex: '1',
countIndex: '2',
markList: [false, false, false, false, false, false, false],
@@ -963,6 +965,8 @@
this.polygonMarkerLayers();//危险作业
this.speakersMaskerLayers();//喇叭
this.jobDomMarkerLayers();//危险作业图片
+ this.areaMarkerLayers();//危险作业图片
+
let compassControl = new jsmap.JSCompassControl({
position: jsmap.JSControlPosition.LEFT_TOP,
offset: {
@@ -979,7 +983,6 @@
}
});
window.map.addControl(zoomControl);
- // this.pointMaskerLayers();//点
});
window.map.on('mapClickNode', event => {
let item = event;
@@ -1096,9 +1099,45 @@
},
methods: {
areaRowClick(data) {
- this.areaDetail = true;
- console.log(data);
- debugger;
+ let that = this;
+ that.areaDetail = true;
+ // let points = data.third_info.xx_rail.detail.polygon.points[0];
+ window.map.flyToPosition(new jsmap.JSPoint(114.63168864138028, 38.81254802029822, 0),{duration:1000});
+
+ /*debugger;
+ let tool = new jsmap.JSMapCoordTool(map);
+ let points = data.third_info.xx_rail.detail.polygon.points;
+ let position = [];*/
+ /*for(let i=0;i
{{data.path}}
{{data.method}}
- {{data.status_code}}
+ {{data.target}}
+ {{data.result}}
+ {{data.status_code}}
{{data.id}}
{{data.requested_at}}
@@ -32,15 +34,17 @@
methods: {
setData(data){
this.data = data;
- // debugger;
- console.log(data);
let dataStr = '';
for (let i in data) {
- let X = i + ':' + data[i]+'
';
+ let X='';
+ if(typeof data[i] ==='object'){
+ let temp =JSON.stringify(data[i]);
+ X =''+i+''+ '：' + temp+'
';
+ }else{
+ X =''+i+''+ '：' + data[i]+'
';
+ }
dataStr += X;
- console.log(i);
}
- console.log(dataStr);
this.dataStr = dataStr;
document.getElementById("logDetail").innerHTML = dataStr;
}
@@ -50,7 +54,7 @@