diff --git a/public/config/config.json b/public/config/config.json index 27d5341..7aea057 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title": "安全生产智慧监管系统", - "baseUrl": "http://192.168.83.37:6909/safe-server/", - "mediaBaseUrl": "http://192.168.83.42:80", + "baseUrl": "http://10.8.50.210:6909/safe-server/", + "mediaBaseUrl": "http://10.8.50.210:80", "lat-bd": "39.91459528", "lng-bd": "116.26499505", "lat": "39.90", @@ -10,5 +10,5 @@ "maxZoom": "13", "zoom": "10", "timeGap": 3000, - "systemType": "gm" + "systemType": "sm" } diff --git a/public/config/config.json b/public/config/config.json index 27d5341..7aea057 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title": "安全生产智慧监管系统", - "baseUrl": "http://192.168.83.37:6909/safe-server/", - "mediaBaseUrl": "http://192.168.83.42:80", + "baseUrl": "http://10.8.50.210:6909/safe-server/", + "mediaBaseUrl": "http://10.8.50.210:80", "lat-bd": "39.91459528", "lng-bd": "116.26499505", "lat": "39.90", @@ -10,5 +10,5 @@ "maxZoom": "13", "zoom": "10", "timeGap": 3000, - "systemType": "gm" + "systemType": "sm" } diff --git a/src/main.ts b/src/main.ts index e7130ad..f91e0d9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -37,6 +37,7 @@ window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl) window.localStorage.setItem('timeGap', result.data.timeGap) window.localStorage.setItem('systemType', result.data.systemType) + window.localStorage.setItem('zoom', result.data.zoom) const app = createApp(App) app.config.globalProperties.hasPerm = hasPermission diff --git a/public/config/config.json b/public/config/config.json index 27d5341..7aea057 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title": "安全生产智慧监管系统", - "baseUrl": "http://192.168.83.37:6909/safe-server/", - "mediaBaseUrl": "http://192.168.83.42:80", + "baseUrl": "http://10.8.50.210:6909/safe-server/", + "mediaBaseUrl": "http://10.8.50.210:80", "lat-bd": "39.91459528", "lng-bd": "116.26499505", "lat": "39.90", @@ -10,5 +10,5 @@ "maxZoom": "13", "zoom": "10", "timeGap": 3000, - "systemType": "gm" + "systemType": "sm" } diff --git a/src/main.ts b/src/main.ts index e7130ad..f91e0d9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -37,6 +37,7 @@ window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl) window.localStorage.setItem('timeGap', result.data.timeGap) window.localStorage.setItem('systemType', result.data.systemType) + window.localStorage.setItem('zoom', result.data.zoom) const app = createApp(App) app.config.globalProperties.hasPerm = hasPermission diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 394cc5a..d955a4f 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -12,7 +12,7 @@ meta: { title: '首页', icon: 'icon-map', - auth: '/dashboard' + auth: '/dashboard', }, children: [ { @@ -25,10 +25,10 @@ sidebar: false, breadcrumb: false, activeMenu: '/dashboard', - auth: '/dashboard' - } - } - ] + auth: '/dashboard', + }, + }, + ], }, // 远程监管 { @@ -39,7 +39,7 @@ meta: { title: '远程监管', icon: 'icon-yc', - auth: '/monitor' + auth: '/monitor', }, children: [ { @@ -50,32 +50,32 @@ meta: { title: '实时监控', icon: 'icon-camera', - auth: '/realTime' + auth: '/realTime', }, children: [ { path: 'page', name: 'page', component: () => - // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路 - // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路 - // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc - import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路 - // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国 + import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路 + // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路 + // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc + // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路 + // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国 meta: { title: '实时监控', auth: '/realTime', sidebar: false, breadcrumb: false, - activeMenu: '/ssjk' - } + activeMenu: '/ssjk', + }, }, { path: 'control', name: 'control', - // component: () => import('@/views/ycjg/ssjk/control-noPlugin.vue'), // SDK + component: () => import('@/views/ycjg/ssjk/control-noPlugin.vue'), // SDK // component: () => import('@/views/ycjg/ssjk/control-isc.vue'), // isc - component: () => import('@/views/ycjg/ssjk/control-media.vue'), // 流媒体 + // component: () => import('@/views/ycjg/ssjk/control-media.vue'), // 流媒体 // component: () => import('@/views/ycjg/ssjk/control-new-gm-plugin.vue'), // 国 meta: { title: '实时监控', @@ -83,10 +83,10 @@ sidebar: false, breadcrumb: false, breadHide: true, - activeMenu: '/ssjk' - } - } - ] + activeMenu: '/ssjk', + }, + }, + ], }, // { // path: '/aqbb', @@ -121,24 +121,24 @@ meta: { title: '场景回放', icon: 'icon-hf', - auth: '/playback' + auth: '/playback', }, children: [ { path: 'home', name: 'home', - // component: () => import('@/views/ycjg/sjhf/index.vue'), // SDK + component: () => import('@/views/ycjg/sjhf/index.vue'), // SDK // component: () => import('@/views/ycjg/sjhf/index-isc.vue'), // isc - component: () => import('@/views/ycjg/sjhf/index-media.vue'), // 流媒体 + // component: () => import('@/views/ycjg/sjhf/index-media.vue'), // 流媒体 meta: { title: '场景回放', auth: '/playback', sidebar: false, breadcrumb: false, - activeMenu: '/cjhf' - } - } - ] + activeMenu: '/cjhf', + }, + }, + ], }, { path: '/sbgl', @@ -148,7 +148,7 @@ meta: { title: '设备管理', icon: 'icon-device', - auth: '/device' + auth: '/device', }, children: [ { @@ -160,10 +160,10 @@ auth: '/device', sidebar: false, breadcrumb: false, - activeMenu: '/sbgl' - } - } - ] + activeMenu: '/sbgl', + }, + }, + ], }, { path: '/fzsq', @@ -173,7 +173,7 @@ meta: { title: '分组授权', icon: 'icon-sq', - auth: '/empower' + auth: '/empower', }, children: [ { @@ -185,10 +185,10 @@ auth: '/empower', sidebar: false, breadcrumb: false, - activeMenu: '/fzsq' - } - } - ] + activeMenu: '/fzsq', + }, + }, + ], }, { path: '/sjtj', @@ -198,7 +198,7 @@ meta: { title: '数据统计', icon: 'icon-line', - auth: '/statistics' + auth: '/statistics', }, children: [ { @@ -210,12 +210,12 @@ auth: '/statistics', sidebar: false, breadcrumb: false, - activeMenu: '/sjtj' - } - } - ] - } - ] + activeMenu: '/sjtj', + }, + }, + ], + }, + ], }, // 预警分析 // 系统设置 @@ -227,7 +227,7 @@ meta: { title: '系统设置', icon: 'ep:key', - auth: '/system' + auth: '/system', }, children: [ { @@ -238,7 +238,7 @@ meta: { title: '区域管理', icon: 'ep:key', - auth: '/sys/area' + auth: '/sys/area', }, children: [ { @@ -250,10 +250,10 @@ auth: '/sys/area', sidebar: false, breadcrumb: false, - activeMenu: '/area' - } - } - ] + activeMenu: '/area', + }, + }, + ], }, { path: '/resource', @@ -263,7 +263,7 @@ meta: { title: '资源管理', icon: 'ep:key', - auth: '/sys/resource' + auth: '/sys/resource', }, children: [ { @@ -275,10 +275,10 @@ auth: '/sys/resource', sidebar: false, breadcrumb: false, - activeMenu: '/resource' - } - } - ] + activeMenu: '/resource', + }, + }, + ], }, { path: '/dept', @@ -288,7 +288,7 @@ meta: { title: '组织管理', icon: 'ep:key', - auth: '/sys/dept' + auth: '/sys/dept', }, children: [ { @@ -300,10 +300,10 @@ auth: '/sys/dept', sidebar: false, breadcrumb: false, - activeMenu: '/dept' - } - } - ] + activeMenu: '/dept', + }, + }, + ], }, { path: '/role', @@ -313,7 +313,7 @@ meta: { title: '角色管理', icon: 'ep:key', - auth: '/sys/role' + auth: '/sys/role', }, children: [ { @@ -325,10 +325,10 @@ auth: '/sys/role', sidebar: false, breadcrumb: false, - activeMenu: '/role' - } - } - ] + activeMenu: '/role', + }, + }, + ], }, { path: '/user', @@ -338,7 +338,7 @@ meta: { title: '用户管理', icon: 'ep:key', - auth: '/sys/mgr' + auth: '/sys/mgr', }, children: [ { @@ -350,10 +350,10 @@ auth: '/sys/mgr', sidebar: false, breadcrumb: false, - activeMenu: '/user' - } - } - ] + activeMenu: '/user', + }, + }, + ], }, { path: '/dict', @@ -363,7 +363,7 @@ meta: { title: '字典管理', icon: 'ep:key', - auth: '/sys/dict' + auth: '/sys/dict', }, children: [ { @@ -375,10 +375,10 @@ auth: '/sys/dict', sidebar: false, breadcrumb: false, - activeMenu: '/dict' - } - } - ] + activeMenu: '/dict', + }, + }, + ], }, { path: '/businessLog', @@ -388,7 +388,7 @@ meta: { title: '业务日志', icon: 'ep:key', - auth: '/sys/log/biz/list' + auth: '/sys/log/biz/list', }, children: [ { @@ -400,10 +400,10 @@ auth: '/sys/log/biz/list', sidebar: false, breadcrumb: false, - activeMenu: '/businessLog' - } - } - ] + activeMenu: '/businessLog', + }, + }, + ], }, { path: '/error', @@ -413,7 +413,7 @@ meta: { title: '异常日志', icon: 'ep:key', - auth: '/sys/log/error/list' + auth: '/sys/log/error/list', }, children: [ { @@ -425,10 +425,10 @@ auth: '/sys/log/error/list', sidebar: false, breadcrumb: false, - activeMenu: '/error' - } - } - ] + activeMenu: '/error', + }, + }, + ], }, { path: '/loginDiary', @@ -438,7 +438,7 @@ meta: { title: '登录日志', icon: 'ep:key', - auth: '/sys/loginLog' + auth: '/sys/loginLog', }, children: [ { @@ -450,13 +450,13 @@ auth: '/sys/loginLog', sidebar: false, breadcrumb: false, - activeMenu: '/loginDiary' - } - } - ] - } - ] - } + activeMenu: '/loginDiary', + }, + }, + ], + }, + ], + }, ] export default routes diff --git a/public/config/config.json b/public/config/config.json index 27d5341..7aea057 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title": "安全生产智慧监管系统", - "baseUrl": "http://192.168.83.37:6909/safe-server/", - "mediaBaseUrl": "http://192.168.83.42:80", + "baseUrl": "http://10.8.50.210:6909/safe-server/", + "mediaBaseUrl": "http://10.8.50.210:80", "lat-bd": "39.91459528", "lng-bd": "116.26499505", "lat": "39.90", @@ -10,5 +10,5 @@ "maxZoom": "13", "zoom": "10", "timeGap": 3000, - "systemType": "gm" + "systemType": "sm" } diff --git a/src/main.ts b/src/main.ts index e7130ad..f91e0d9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -37,6 +37,7 @@ window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl) window.localStorage.setItem('timeGap', result.data.timeGap) window.localStorage.setItem('systemType', result.data.systemType) + window.localStorage.setItem('zoom', result.data.zoom) const app = createApp(App) app.config.globalProperties.hasPerm = hasPermission diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 394cc5a..d955a4f 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -12,7 +12,7 @@ meta: { title: '首页', icon: 'icon-map', - auth: '/dashboard' + auth: '/dashboard', }, children: [ { @@ -25,10 +25,10 @@ sidebar: false, breadcrumb: false, activeMenu: '/dashboard', - auth: '/dashboard' - } - } - ] + auth: '/dashboard', + }, + }, + ], }, // 远程监管 { @@ -39,7 +39,7 @@ meta: { title: '远程监管', icon: 'icon-yc', - auth: '/monitor' + auth: '/monitor', }, children: [ { @@ -50,32 +50,32 @@ meta: { title: '实时监控', icon: 'icon-camera', - auth: '/realTime' + auth: '/realTime', }, children: [ { path: 'page', name: 'page', component: () => - // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路 - // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路 - // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc - import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路 - // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国 + import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路 + // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路 + // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc + // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路 + // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国 meta: { title: '实时监控', auth: '/realTime', sidebar: false, breadcrumb: false, - activeMenu: '/ssjk' - } + activeMenu: '/ssjk', + }, }, { path: 'control', name: 'control', - // component: () => import('@/views/ycjg/ssjk/control-noPlugin.vue'), // SDK + component: () => import('@/views/ycjg/ssjk/control-noPlugin.vue'), // SDK // component: () => import('@/views/ycjg/ssjk/control-isc.vue'), // isc - component: () => import('@/views/ycjg/ssjk/control-media.vue'), // 流媒体 + // component: () => import('@/views/ycjg/ssjk/control-media.vue'), // 流媒体 // component: () => import('@/views/ycjg/ssjk/control-new-gm-plugin.vue'), // 国 meta: { title: '实时监控', @@ -83,10 +83,10 @@ sidebar: false, breadcrumb: false, breadHide: true, - activeMenu: '/ssjk' - } - } - ] + activeMenu: '/ssjk', + }, + }, + ], }, // { // path: '/aqbb', @@ -121,24 +121,24 @@ meta: { title: '场景回放', icon: 'icon-hf', - auth: '/playback' + auth: '/playback', }, children: [ { path: 'home', name: 'home', - // component: () => import('@/views/ycjg/sjhf/index.vue'), // SDK + component: () => import('@/views/ycjg/sjhf/index.vue'), // SDK // component: () => import('@/views/ycjg/sjhf/index-isc.vue'), // isc - component: () => import('@/views/ycjg/sjhf/index-media.vue'), // 流媒体 + // component: () => import('@/views/ycjg/sjhf/index-media.vue'), // 流媒体 meta: { title: '场景回放', auth: '/playback', sidebar: false, breadcrumb: false, - activeMenu: '/cjhf' - } - } - ] + activeMenu: '/cjhf', + }, + }, + ], }, { path: '/sbgl', @@ -148,7 +148,7 @@ meta: { title: '设备管理', icon: 'icon-device', - auth: '/device' + auth: '/device', }, children: [ { @@ -160,10 +160,10 @@ auth: '/device', sidebar: false, breadcrumb: false, - activeMenu: '/sbgl' - } - } - ] + activeMenu: '/sbgl', + }, + }, + ], }, { path: '/fzsq', @@ -173,7 +173,7 @@ meta: { title: '分组授权', icon: 'icon-sq', - auth: '/empower' + auth: '/empower', }, children: [ { @@ -185,10 +185,10 @@ auth: '/empower', sidebar: false, breadcrumb: false, - activeMenu: '/fzsq' - } - } - ] + activeMenu: '/fzsq', + }, + }, + ], }, { path: '/sjtj', @@ -198,7 +198,7 @@ meta: { title: '数据统计', icon: 'icon-line', - auth: '/statistics' + auth: '/statistics', }, children: [ { @@ -210,12 +210,12 @@ auth: '/statistics', sidebar: false, breadcrumb: false, - activeMenu: '/sjtj' - } - } - ] - } - ] + activeMenu: '/sjtj', + }, + }, + ], + }, + ], }, // 预警分析 // 系统设置 @@ -227,7 +227,7 @@ meta: { title: '系统设置', icon: 'ep:key', - auth: '/system' + auth: '/system', }, children: [ { @@ -238,7 +238,7 @@ meta: { title: '区域管理', icon: 'ep:key', - auth: '/sys/area' + auth: '/sys/area', }, children: [ { @@ -250,10 +250,10 @@ auth: '/sys/area', sidebar: false, breadcrumb: false, - activeMenu: '/area' - } - } - ] + activeMenu: '/area', + }, + }, + ], }, { path: '/resource', @@ -263,7 +263,7 @@ meta: { title: '资源管理', icon: 'ep:key', - auth: '/sys/resource' + auth: '/sys/resource', }, children: [ { @@ -275,10 +275,10 @@ auth: '/sys/resource', sidebar: false, breadcrumb: false, - activeMenu: '/resource' - } - } - ] + activeMenu: '/resource', + }, + }, + ], }, { path: '/dept', @@ -288,7 +288,7 @@ meta: { title: '组织管理', icon: 'ep:key', - auth: '/sys/dept' + auth: '/sys/dept', }, children: [ { @@ -300,10 +300,10 @@ auth: '/sys/dept', sidebar: false, breadcrumb: false, - activeMenu: '/dept' - } - } - ] + activeMenu: '/dept', + }, + }, + ], }, { path: '/role', @@ -313,7 +313,7 @@ meta: { title: '角色管理', icon: 'ep:key', - auth: '/sys/role' + auth: '/sys/role', }, children: [ { @@ -325,10 +325,10 @@ auth: '/sys/role', sidebar: false, breadcrumb: false, - activeMenu: '/role' - } - } - ] + activeMenu: '/role', + }, + }, + ], }, { path: '/user', @@ -338,7 +338,7 @@ meta: { title: '用户管理', icon: 'ep:key', - auth: '/sys/mgr' + auth: '/sys/mgr', }, children: [ { @@ -350,10 +350,10 @@ auth: '/sys/mgr', sidebar: false, breadcrumb: false, - activeMenu: '/user' - } - } - ] + activeMenu: '/user', + }, + }, + ], }, { path: '/dict', @@ -363,7 +363,7 @@ meta: { title: '字典管理', icon: 'ep:key', - auth: '/sys/dict' + auth: '/sys/dict', }, children: [ { @@ -375,10 +375,10 @@ auth: '/sys/dict', sidebar: false, breadcrumb: false, - activeMenu: '/dict' - } - } - ] + activeMenu: '/dict', + }, + }, + ], }, { path: '/businessLog', @@ -388,7 +388,7 @@ meta: { title: '业务日志', icon: 'ep:key', - auth: '/sys/log/biz/list' + auth: '/sys/log/biz/list', }, children: [ { @@ -400,10 +400,10 @@ auth: '/sys/log/biz/list', sidebar: false, breadcrumb: false, - activeMenu: '/businessLog' - } - } - ] + activeMenu: '/businessLog', + }, + }, + ], }, { path: '/error', @@ -413,7 +413,7 @@ meta: { title: '异常日志', icon: 'ep:key', - auth: '/sys/log/error/list' + auth: '/sys/log/error/list', }, children: [ { @@ -425,10 +425,10 @@ auth: '/sys/log/error/list', sidebar: false, breadcrumb: false, - activeMenu: '/error' - } - } - ] + activeMenu: '/error', + }, + }, + ], }, { path: '/loginDiary', @@ -438,7 +438,7 @@ meta: { title: '登录日志', icon: 'ep:key', - auth: '/sys/loginLog' + auth: '/sys/loginLog', }, children: [ { @@ -450,13 +450,13 @@ auth: '/sys/loginLog', sidebar: false, breadcrumb: false, - activeMenu: '/loginDiary' - } - } - ] - } - ] - } + activeMenu: '/loginDiary', + }, + }, + ], + }, + ], + }, ] export default routes diff --git a/src/views/map/map-bak.vue b/src/views/map/map-bak.vue index bb115f2..c49510b 100644 --- a/src/views/map/map-bak.vue +++ b/src/views/map/map-bak.vue @@ -200,9 +200,9 @@ resolutions: (function () { const level = 19 var res = [] - res[0] = Math.pow(2, 18) // 2的18次幂 + res[0] = 2 ** 18 // 2的18次幂 for (var i = 1; i < level; i++) { - res[i] = Math.pow(2, 18 - i) + res[i] = 2 ** (18 - i) } return res })(), @@ -242,7 +242,7 @@ minZoom: 5, maxZoom: 18, center: [39.91459528, 116.26499505], - zoom: 10, + zoom: window.localStorage.getItem('zoom') ? Number(window.localStorage.getItem('zoom')) : 15, zoomControl: false, attributionControl: false, crs: L.CRS.Baidu, @@ -285,7 +285,7 @@