shuishen
2023-02-09 1a1c89d2148b8485a351a53574b8f3b7d3eb7a61
内外网区分
5 files modified
46 ■■■■ changed files
src/api/home/index.js 4 ●●● patch | view | raw | blame | history
src/api/police/index.js 4 ●●●● patch | view | raw | blame | history
src/api/video/index.js 10 ●●●● patch | view | raw | blame | history
src/components/map/index.vue 21 ●●●●● patch | view | raw | blame | history
src/views/video/list.vue 7 ●●●● patch | view | raw | blame | history
src/api/home/index.js
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-12-27 14:19:19
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-09 10:46:30
 * @LastEditTime: 2023-02-09 14:52:13
 * @FilePath: \srs-police-affairs\src\api\home\index.js
 * @Description: 
 * 
@@ -139,7 +139,9 @@
        method: 'get',
        params: {
            ...params,
            // 内网
            deviceId: '36110000002009999000'
            // 外网
            // deviceId: '34020000002000000003'
        }
    })
src/api/police/index.js
@@ -17,9 +17,9 @@
 */
export const getHistoricalTrack = (params, requestBaseUrl = 'outside') => {
    return request({
        // 平台ID在这里更换,不要传了内网使用
        // 内网
        url: `/position/history/36110000002009999000`,
        // 开发使用
        // 外网
        // url: `/position/history/34020000002000000003`,
        method: 'get',
        requestBaseUrl,
src/api/video/index.js
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-11-15 15:10:41
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-09 10:46:58
 * @LastEditTime: 2023-02-09 14:50:58
 * @FilePath: \srs-police-affairs\src\api\video\index.js
 * @Description: 
 * 
@@ -20,9 +20,9 @@
 */
export const getVideoList = (page, count, query, params = {}) => {
    return request({
        // 内网使用地址,外网把36110000002009999000更换掉
        // 内网
        url: '/device/query/devices/36110000002009999000/channels',
        // 外网使用地址
        // 外网
        // url: '/device/query/devices/34020000002000000003/channels',
        method: 'get',
        requestBaseUrl: 'outside',
@@ -42,9 +42,9 @@
 */
export const getDevices = (channelId) => {
    return request({
        // 内网使用地址,外网把36110000002009999000更换掉
        // 内网
        url: `/play/start/36110000002009999000/${channelId}`,
        // 外网使用地址
        // 外网
        // url: `/play/start/34020000002000000003/${channelId}`,
        method: 'get',
        requestBaseUrl: 'outside'
src/components/map/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-09 14:47:45
 * @LastEditTime: 2023-02-09 14:52:36
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -197,7 +197,10 @@
            // })
            // global.viewer.addTerrain(terrain)
            // 天地图 影像
            // 内网
            that.switchImg()
            // 外网
            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
@@ -207,15 +210,6 @@
            //         maximumLevel: 18
            //     })
            // )
            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //         url: 'http://10.141.11.11:80/ysapi/geoserver/gwc/service/wmts/{z}/{y}/{x}.png',
            //     })
            // )
            // 添加影像
            that.switchImg()
            // 设置地图初始位置,角度等
            global.viewer.camera.setView({
@@ -236,7 +230,9 @@
            let sqTitleLayer = new global.DC.TilesetLayer('sqTitleLayer')
            global.viewer.addLayer(sqTitleLayer)
            let sqTileset = new global.DC.Tileset(
                // 内网
                'http://10.141.11.11:18080/sf3d/361102/model/wanda/tileset.json'
                // 外网
                // 'http://192.168.0.112:18080/sf3d/361102/model/wanda/tileset.json'
            )
@@ -281,9 +277,6 @@
            //         material: global.DC.Namespace.Cesium.Color.RED.withAlpha(0.5),
            //     }
            // })
            // console.log(floorPositions)
src/views/video/list.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-09 10:47:17
 * @LastEditTime: 2023-02-09 14:51:52
 * @FilePath: \srs-police-affairs\src\views\video\list.vue
 * @Description: 辖区管理
 * 
@@ -278,7 +278,10 @@
                this.searchTreeData = []
                getSearchTreeDevices({
                    // 内网
                    deviceId: '36110000002009999000',
                    // 外网
                    // deviceId: '34020000002000000003',
                    parentId: '361102',
                    deptId: this.userInfo.dept_id,
                    name: this.searchValue.trim()
@@ -550,7 +553,9 @@
            }
            await getTreeDevices({
                // 内网
                deviceId: '36110000002009999000',
                // 外网
                // deviceId: '34020000002000000003',
                parentId,
                deptId: this.userInfo.dept_id,