diff --git a/public/HKVideo/codebase/webVideoCtrl.js b/public/HKVideo/codebase/webVideoCtrl.js index 2a94fd9..676a2e0 100644 --- a/public/HKVideo/codebase/webVideoCtrl.js +++ b/public/HKVideo/codebase/webVideoCtrl.js @@ -5094,7 +5094,6 @@ m_utilsInc = new Utils() return this })() - debugger var NS = (window.WebVideoCtrl = WebVideoCtrl) NS.version = '3.3.0' })(this) diff --git a/public/HKVideo/codebase/webVideoCtrl.js b/public/HKVideo/codebase/webVideoCtrl.js index 2a94fd9..676a2e0 100644 --- a/public/HKVideo/codebase/webVideoCtrl.js +++ b/public/HKVideo/codebase/webVideoCtrl.js @@ -5094,7 +5094,6 @@ m_utilsInc = new Utils() return this })() - debugger var NS = (window.WebVideoCtrl = WebVideoCtrl) NS.version = '3.3.0' })(this) diff --git a/src/router/index.js b/src/router/index.js index 805197a..edfa51d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,24 +28,24 @@ * 静态路由 */ export const constantRouterMap = [ - { - path: '/', - component: Layout, - redirect: '/overview', - name: 'Overview', - meta: { - title: '地图总览', - icon: 'icon-map' // 图标 - }, - children: [ - { - path: '/overview', - name: 'Overview', - component: () => import('@/views/overview/listoverview.vue'), - meta: { title: '地图总览', icon: '' } - } - ] - }, + // { + // path: '/', + // component: Layout, + // redirect: '/overview', + // name: 'Overview', + // meta: { + // title: '地图总览', + // icon: 'icon-map' // 图标 + // }, + // children: [ + // { + // path: '/overview', + // name: 'Overview', + // component: () => import('@/views/overview/listoverview.vue'), + // meta: { title: '地图总览', icon: '' } + // } + // ] + // }, { // 重定向 path: '/redirect', component: Layout, diff --git a/public/HKVideo/codebase/webVideoCtrl.js b/public/HKVideo/codebase/webVideoCtrl.js index 2a94fd9..676a2e0 100644 --- a/public/HKVideo/codebase/webVideoCtrl.js +++ b/public/HKVideo/codebase/webVideoCtrl.js @@ -5094,7 +5094,6 @@ m_utilsInc = new Utils() return this })() - debugger var NS = (window.WebVideoCtrl = WebVideoCtrl) NS.version = '3.3.0' })(this) diff --git a/src/router/index.js b/src/router/index.js index 805197a..edfa51d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,24 +28,24 @@ * 静态路由 */ export const constantRouterMap = [ - { - path: '/', - component: Layout, - redirect: '/overview', - name: 'Overview', - meta: { - title: '地图总览', - icon: 'icon-map' // 图标 - }, - children: [ - { - path: '/overview', - name: 'Overview', - component: () => import('@/views/overview/listoverview.vue'), - meta: { title: '地图总览', icon: '' } - } - ] - }, + // { + // path: '/', + // component: Layout, + // redirect: '/overview', + // name: 'Overview', + // meta: { + // title: '地图总览', + // icon: 'icon-map' // 图标 + // }, + // children: [ + // { + // path: '/overview', + // name: 'Overview', + // component: () => import('@/views/overview/listoverview.vue'), + // meta: { title: '地图总览', icon: '' } + // } + // ] + // }, { // 重定向 path: '/redirect', component: Layout, diff --git a/src/utils/request.js b/src/utils/request.js index 1074dae..33f34b9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,6 +15,7 @@ if (store.getters.token) { config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 } + // config.headers['token'] = '59c4345f-6ec9-4d8a-b499-6de2da92d2b1' // 让每个请求携带自定义token 请根据实际情况自行修改 return config }, error => { diff --git a/public/HKVideo/codebase/webVideoCtrl.js b/public/HKVideo/codebase/webVideoCtrl.js index 2a94fd9..676a2e0 100644 --- a/public/HKVideo/codebase/webVideoCtrl.js +++ b/public/HKVideo/codebase/webVideoCtrl.js @@ -5094,7 +5094,6 @@ m_utilsInc = new Utils() return this })() - debugger var NS = (window.WebVideoCtrl = WebVideoCtrl) NS.version = '3.3.0' })(this) diff --git a/src/router/index.js b/src/router/index.js index 805197a..edfa51d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,24 +28,24 @@ * 静态路由 */ export const constantRouterMap = [ - { - path: '/', - component: Layout, - redirect: '/overview', - name: 'Overview', - meta: { - title: '地图总览', - icon: 'icon-map' // 图标 - }, - children: [ - { - path: '/overview', - name: 'Overview', - component: () => import('@/views/overview/listoverview.vue'), - meta: { title: '地图总览', icon: '' } - } - ] - }, + // { + // path: '/', + // component: Layout, + // redirect: '/overview', + // name: 'Overview', + // meta: { + // title: '地图总览', + // icon: 'icon-map' // 图标 + // }, + // children: [ + // { + // path: '/overview', + // name: 'Overview', + // component: () => import('@/views/overview/listoverview.vue'), + // meta: { title: '地图总览', icon: '' } + // } + // ] + // }, { // 重定向 path: '/redirect', component: Layout, diff --git a/src/utils/request.js b/src/utils/request.js index 1074dae..33f34b9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,6 +15,7 @@ if (store.getters.token) { config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 } + // config.headers['token'] = '59c4345f-6ec9-4d8a-b499-6de2da92d2b1' // 让每个请求携带自定义token 请根据实际情况自行修改 return config }, error => { diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue index b51764c..8b63646 100644 --- a/src/views/overview/listoverview.vue +++ b/src/views/overview/listoverview.vue @@ -231,9 +231,9 @@ initMap() { const map = L.map('map', { minZoom: 3, - maxZoom: 18, + maxZoom: 16, center: [27.75962, 116.06021], - zoom: 11, + zoom: 18, zoomControl: false, attributionControl: false, crs: L.CRS.EPSG3857 @@ -350,9 +350,9 @@ var item = [Number(this.alllist[i].latitude), Number(this.alllist[i].longitude)] list.push(item) } - if (list.length !== 0) { - this.setZoom(list) - } + // if (list.length !== 0) { + // this.setZoom(list) + // } var Icon for (var i = 0; i < this.alllist.length; i++) { diff --git a/public/HKVideo/codebase/webVideoCtrl.js b/public/HKVideo/codebase/webVideoCtrl.js index 2a94fd9..676a2e0 100644 --- a/public/HKVideo/codebase/webVideoCtrl.js +++ b/public/HKVideo/codebase/webVideoCtrl.js @@ -5094,7 +5094,6 @@ m_utilsInc = new Utils() return this })() - debugger var NS = (window.WebVideoCtrl = WebVideoCtrl) NS.version = '3.3.0' })(this) diff --git a/src/router/index.js b/src/router/index.js index 805197a..edfa51d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,24 +28,24 @@ * 静态路由 */ export const constantRouterMap = [ - { - path: '/', - component: Layout, - redirect: '/overview', - name: 'Overview', - meta: { - title: '地图总览', - icon: 'icon-map' // 图标 - }, - children: [ - { - path: '/overview', - name: 'Overview', - component: () => import('@/views/overview/listoverview.vue'), - meta: { title: '地图总览', icon: '' } - } - ] - }, + // { + // path: '/', + // component: Layout, + // redirect: '/overview', + // name: 'Overview', + // meta: { + // title: '地图总览', + // icon: 'icon-map' // 图标 + // }, + // children: [ + // { + // path: '/overview', + // name: 'Overview', + // component: () => import('@/views/overview/listoverview.vue'), + // meta: { title: '地图总览', icon: '' } + // } + // ] + // }, { // 重定向 path: '/redirect', component: Layout, diff --git a/src/utils/request.js b/src/utils/request.js index 1074dae..33f34b9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,6 +15,7 @@ if (store.getters.token) { config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 } + // config.headers['token'] = '59c4345f-6ec9-4d8a-b499-6de2da92d2b1' // 让每个请求携带自定义token 请根据实际情况自行修改 return config }, error => { diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue index b51764c..8b63646 100644 --- a/src/views/overview/listoverview.vue +++ b/src/views/overview/listoverview.vue @@ -231,9 +231,9 @@ initMap() { const map = L.map('map', { minZoom: 3, - maxZoom: 18, + maxZoom: 16, center: [27.75962, 116.06021], - zoom: 11, + zoom: 18, zoomControl: false, attributionControl: false, crs: L.CRS.EPSG3857 @@ -350,9 +350,9 @@ var item = [Number(this.alllist[i].latitude), Number(this.alllist[i].longitude)] list.push(item) } - if (list.length !== 0) { - this.setZoom(list) - } + // if (list.length !== 0) { + // this.setZoom(list) + // } var Icon for (var i = 0; i < this.alllist.length; i++) { diff --git a/src/views/video/history.vue b/src/views/video/history.vue index 8f8c267..4fdf963 100644 --- a/src/views/video/history.vue +++ b/src/views/video/history.vue @@ -163,22 +163,13 @@ }, startTimeFocus() { if (WebVideoCtrl) { - const iframeWndHeight = $(window).height(); // iframe窗口高度 - const iframeWndWidth = $(window).width(); // iframe窗口宽度 - const divLeft = $("#divPlugin").get(0).getBoundingClientRect().left; - const divTop = $("#divPlugin").get(0).getBoundingClientRect().top; - // 左,上,宽,高 - WebVideoCtrl.JS_CuttingPartWindow(divLeft, divTop, iframeWndWidth, 600) + WebVideoCtrl.JS_CuttingPartWindow(0, 0, 3000, 2000) } }, startTimeBlur() { if (WebVideoCtrl) { - const iframeWndHeight = $(window).height(); // iframe窗口高度 - const iframeWndWidth = $(window).width(); // iframe窗口宽度 - const divLeft = $("#divPlugin").get(0).getBoundingClientRect().left; - const divTop = $("#divPlugin").get(0).getBoundingClientRect().top; - // 左,上,宽,高 - WebVideoCtrl.JS_RepairPartWindow(divLeft, divTop, iframeWndWidth, 600) + // WebVideoCtrl.JS_RepairPartWindow(divLeft, divTop, iframeWndWidth, 600) + WebVideoCtrl.JS_RepairPartWindow(0, 0, 3000, 2000) } } }