+
@@ -50,6 +50,9 @@
+
+ 管理
+
@@ -76,7 +79,7 @@ export default {
{ name: '数据分析', router: 'dataAnalysis', index: 1, routerList: ['dataAnalysis'], img: require('../assets/image/header-img4.png') },
// { name: '设备菜单', router: '', routerList: [], img: require('../assets/image/header-img5.png') },
//systemManage systemManage
- { name: '管理', router: '', routerList: [''], img: require('../assets/image/header-img6.png') },
+ { name: '管理', router: 'manage', routerList: ['manage'], img: require('../assets/image/header-img6.png') },
{ name: '大数据', router: 'largeScreen', routerList: ['largeScreen'], img: require('../assets/image/header-img8.png') }
],
diff --git a/src/views/manage/index.vue b/src/views/manage/index.vue
new file mode 100644
index 0000000..1badf8b
--- /dev/null
+++ b/src/views/manage/index.vue
@@ -0,0 +1,19 @@
+
+
+ 管理
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue
index cf3fefc..aee3e28 100644
--- a/src/views/page/realTime.vue
+++ b/src/views/page/realTime.vue
@@ -81,8 +81,8 @@
-
-
+
+
@@ -1024,21 +1024,22 @@ export default {
cameraid: nowDevice.cameraSerialNumber,
channelid: nowDevice.cameraChannelNumber
}
-
+ this.imgUrl = nowDevice.hls
//当前没有设备 默认写死 后续有数据需要改回去
// var data2 = {
// cameraid: 'L18357958',
// channelid: '1'
// }
if (!this.player) {
- this.api.getGethls(data2).then(res => {
- if (res.data.code == 200) {
- this.url = res.data.data.ezopen
- this.createVideoNew(res.data.data.accesstoken)
- } else {
- this.imgUrl = nowDevice.hls
- }
- })
+
+ // this.api.getGethls(data2).then(res => {
+ // if (res.data.code == 200) {
+ // this.url = res.data.data.ezopen
+ // this.createVideoNew(res.data.data.accesstoken)
+ // } else {
+ // this.imgUrl = nowDevice.hls
+ // }
+ // })
}
} else if (this.deviceName == 10) {
@@ -1143,22 +1144,23 @@ export default {
cameraid: nowDevice.cameraSerialNumber,
channelid: nowDevice.cameraChannelNumber
}
-
+ this.imgUrl = nowDevice.hls
//当前没有设备 默认写死 后续有数据需要改回去
// var data2 = {
// cameraid: 'L18357958',
// channelid: '1'
// }
if (!this.player) {
- this.api.getGethls(data2).then(res => {
- // console.log(res.data, 11);
- if (res.data.code == 200) {
- this.url = res.data.data.ezopen
- this.createVideoNew(res.data.data.accesstoken)
- } else {
- this.imgUrl = nowDevice.hls
- }
- })
+ // this.imgUrl = nowDevice.hls
+ // this.api.getGethls(data2).then(res => {
+ // // console.log(res.data, 11);
+ // if (res.data.code == 200) {
+ // this.url = res.data.data.ezopen
+ // this.createVideoNew(res.data.data.accesstoken)
+ // } else {
+ // this.imgUrl = nowDevice.hls
+ // }
+ // })
}
} else if (this.deviceName == 30) {
this.api.getControlRtDatastation(formData).then(res => {