~admin/srs-police-affairs.git

parent: 2595c6e0 | patch | commit | ignore whitespace

guanqb

2023-04-03 d046638e8d56abc458c5a79786be04a3bd4dfcc5

社区修改

5 files modified

	public/static/config.js	4 ●●●●● patch \| view \| raw \| blame \| history
	src/api/dept/index.js	16 ●●●●● patch \| view \| raw \| blame \| history
	src/components/map/index.vue	15 ●●●●● patch \| view \| raw \| blame \| history
	src/store/modules/popupParams.js	4 ●●●●● patch \| view \| raw \| blame \| history
	src/views/house/index.vue	3 ●●●●● patch \| view \| raw \| blame \| history

 public/static/config.js

@@ -11,7 +11,8 @@
window.BASE_URL_CONFIG = {
    // 丰图数据
    // 本地开发
    VUE_APP_OUTER_NET: 'http://192.168.0.112:18080',
    // VUE_APP_OUTER_NET: 'http://192.168.0.112:18080',
    VUE_APP_OUTER_NET: 'https://tuan-gis.sit.fengtu.com.cn',
    // 内网部署
    VUE_APP_INTRANET: 'http://10.141.11.11:80/twapi',

@@ -19,6 +20,7 @@
    // 本地开发 
    // VUE_APP_OUTER_NET_SEARCH: 'http://192.168.0.112:9091',
    VUE_APP_OUTER_NET_SEARCH: 'https://s16s652780.51mypc.cn',

    // 内网部署
    VUE_APP_INTRANET_SEARCH: 'http://10.141.11.11:80/bsapi',


 src/api/dept/index.js

@@ -29,7 +29,7 @@
 */
export const getResidentialQuartersList = (adcode) => {
    return request({
        url: '/sf3d/area/list',
        url: '/sf3d_xinzhou/area/list',
        method: 'get',
        requestBaseUrl: 'fengt',
        params: {
@@ -45,7 +45,7 @@
 */
export const getResidentialQuartersInfo = (area_id, adcode) => {
    return request({
        url: '/sf3d/area/info',
        url: '/sf3d_xinzhou/area/info',
        method: 'get',
        authorization: false,
        requestBaseUrl: 'fengt',
@@ -64,8 +64,8 @@
 */
export const getAoiByPt = (lng, lat, height, adcode, tolerance) => {
    return request({
        // url: '/sf3d/area/getAoiByPt',
        url: '/sf3d/area/stdgetAoiByPt',
        // url: '/sf3d_xinzhou/area/getAoiByPt',
        url: '/sf3d_xinzhou/area/stdgetAoiByPt',
        method: 'get',
        authorization: false,
        requestBaseUrl: 'fengt',
@@ -86,7 +86,7 @@
 */
export const getUnitbuild = (area_id, adcode) => {
    return request({
        url: '/sf3d/area/unitbuild',
        url: '/sf3d_xinzhou/area/unitbuild',
        method: 'get',
        requestBaseUrl: 'fengt',
        params: {
@@ -103,8 +103,8 @@
 */
export const getHouses = (build_id, adcode) => {
    return request({
        // url: '/sf3d/build/houses',
        url: '/sf3d/build/stdhouses',
        // url: '/sf3d_xinzhou/build/houses',
        url: '/sf3d_xinzhou/build/stdhouses',
        method: 'get',
        authorization: false,
        requestBaseUrl: 'fengt',
@@ -181,7 +181,7 @@
// 转id
export const getAoiByBgId = (bg_id) => {
    return request({
        url: `/sf3d/area/getAoiByBgId`,
        url: `/sf3d_xinzhou/area/getAoiByBgId`,
        method: 'get',
        requestBaseUrl: 'fengt',
        params: {

 src/components/map/index.vue

@@ -220,13 +220,14 @@
                curTools[key].install(global.viewer)
            })

            // let curTilesetLayer = new global.DC.TilesetLayer('curTilesetLayer')
            // global.viewer.addLayer(curTilesetLayer)
            // let curTileset = new global.DC.Tileset(
            //     '/mx/tileset.json'
            // )
            // curTileset.setHeight(20)
            // curTilesetLayer.addOverlay(curTileset)
            let curTilesetLayer = new global.DC.TilesetLayer('curTilesetLayer')
            global.viewer.addLayer(curTilesetLayer)
            let curTileset = new global.DC.Tileset(
                // '/mx/tileset.json'
                'https://tuan-gis.sit.fengtu.com.cn/361102/wanda/tileset.json'
            )
            curTileset.setHeight(20)
            curTilesetLayer.addOverlay(curTileset)

            global.viewer.setPitchRange(-90, -45)


 src/store/modules/popupParams.js

@@ -55,24 +55,20 @@

        SET_MAPSEARCHPOPUP (state, mapSearchPopup) {
            state.mapSearchPopup = mapSearchPopup
            console.log('SET_MAPSEARCHPOPUP', mapSearchPopup)

        },

        SET_MAPSEARCHPOPUPDATA (state, mapSearchPopupData) {
            state.mapSearchPopupData = mapSearchPopupData
            console.log('SET_MAPSEARCHPOPUPDATA', mapSearchPopupData)

        },

        SET_HOUSEDEEPDATAPOPUP (state, houseDeepDataPopup) {
            state.houseDeepDataPopup = houseDeepDataPopup
            console.log('SET_HOUSEDEEPDATAPOPUP', houseDeepDataPopup)
        },

        SET_HOUSEDEEPDATAPOPUPDATA (state, houseDeepDataPopupData) {
            state.houseDeepDataPopupData = houseDeepDataPopupData
            console.log('SET_HOUSEDEEPDATAPOPUPDATA', houseDeepDataPopupData)
        }

    },

 src/views/house/index.vue

@@ -187,7 +187,7 @@
                                                <!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div class="warning"></div>-->
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -1475,6 +1475,7 @@
                }
                let wall = new global.DC.Wall(positionStr)

                console.log('/sf3d/area/info', res.data.data)
                wall.setStyle({
                    material: new global.DC.WallTrailMaterialProperty({
                        color: global.DC.Namespace.Cesium.Color.fromBytes(

			@@ -11,7 +11,8 @@
			window.BASE_URL_CONFIG = {
			// 丰图数据
			// 本地开发
			VUE_APP_OUTER_NET: 'http://192.168.0.112:18080',
			// VUE_APP_OUTER_NET: 'http://192.168.0.112:18080',
			VUE_APP_OUTER_NET: 'https://tuan-gis.sit.fengtu.com.cn',
			// 内网部署
			VUE_APP_INTRANET: 'http://10.141.11.11:80/twapi',

			@@ -19,6 +20,7 @@
			// 本地开发
			// VUE_APP_OUTER_NET_SEARCH: 'http://192.168.0.112:9091',
			VUE_APP_OUTER_NET_SEARCH: 'https://s16s652780.51mypc.cn',

			// 内网部署
			VUE_APP_INTRANET_SEARCH: 'http://10.141.11.11:80/bsapi',

			@@ -29,7 +29,7 @@
			*/
			export const getResidentialQuartersList = (adcode) => {
			return request({
			url: '/sf3d/area/list',
			url: '/sf3d_xinzhou/area/list',
			method: 'get',
			requestBaseUrl: 'fengt',
			params: {
			@@ -45,7 +45,7 @@
			*/
			export const getResidentialQuartersInfo = (area_id, adcode) => {
			return request({
			url: '/sf3d/area/info',
			url: '/sf3d_xinzhou/area/info',
			method: 'get',
			authorization: false,
			requestBaseUrl: 'fengt',
			@@ -64,8 +64,8 @@
			*/
			export const getAoiByPt = (lng, lat, height, adcode, tolerance) => {
			return request({
			// url: '/sf3d/area/getAoiByPt',
			url: '/sf3d/area/stdgetAoiByPt',
			// url: '/sf3d_xinzhou/area/getAoiByPt',
			url: '/sf3d_xinzhou/area/stdgetAoiByPt',
			method: 'get',
			authorization: false,
			requestBaseUrl: 'fengt',
			@@ -86,7 +86,7 @@
			*/
			export const getUnitbuild = (area_id, adcode) => {
			return request({
			url: '/sf3d/area/unitbuild',
			url: '/sf3d_xinzhou/area/unitbuild',
			method: 'get',
			requestBaseUrl: 'fengt',
			params: {
			@@ -103,8 +103,8 @@
			*/
			export const getHouses = (build_id, adcode) => {
			return request({
			// url: '/sf3d/build/houses',
			url: '/sf3d/build/stdhouses',
			// url: '/sf3d_xinzhou/build/houses',
			url: '/sf3d_xinzhou/build/stdhouses',
			method: 'get',
			authorization: false,
			requestBaseUrl: 'fengt',
			@@ -181,7 +181,7 @@
			// 转id
			export const getAoiByBgId = (bg_id) => {
			return request({
			url: `/sf3d/area/getAoiByBgId`,
			url: `/sf3d_xinzhou/area/getAoiByBgId`,
			method: 'get',
			requestBaseUrl: 'fengt',
			params: {

			@@ -220,13 +220,14 @@
			curTools[key].install(global.viewer)
			})

			// let curTilesetLayer = new global.DC.TilesetLayer('curTilesetLayer')
			// global.viewer.addLayer(curTilesetLayer)
			// let curTileset = new global.DC.Tileset(
			// '/mx/tileset.json'
			// )
			// curTileset.setHeight(20)
			// curTilesetLayer.addOverlay(curTileset)
			let curTilesetLayer = new global.DC.TilesetLayer('curTilesetLayer')
			global.viewer.addLayer(curTilesetLayer)
			let curTileset = new global.DC.Tileset(
			// '/mx/tileset.json'
			'https://tuan-gis.sit.fengtu.com.cn/361102/wanda/tileset.json'
			)
			curTileset.setHeight(20)
			curTilesetLayer.addOverlay(curTileset)

			global.viewer.setPitchRange(-90, -45)

			@@ -55,24 +55,20 @@

			SET_MAPSEARCHPOPUP (state, mapSearchPopup) {
			state.mapSearchPopup = mapSearchPopup
			console.log('SET_MAPSEARCHPOPUP', mapSearchPopup)

			},

			SET_MAPSEARCHPOPUPDATA (state, mapSearchPopupData) {
			state.mapSearchPopupData = mapSearchPopupData
			console.log('SET_MAPSEARCHPOPUPDATA', mapSearchPopupData)

			},

			SET_HOUSEDEEPDATAPOPUP (state, houseDeepDataPopup) {
			state.houseDeepDataPopup = houseDeepDataPopup
			console.log('SET_HOUSEDEEPDATAPOPUP', houseDeepDataPopup)
			},

			SET_HOUSEDEEPDATAPOPUPDATA (state, houseDeepDataPopupData) {
			state.houseDeepDataPopupData = houseDeepDataPopupData
			console.log('SET_HOUSEDEEPDATAPOPUPDATA', houseDeepDataPopupData)
			}

			},

			@@ -187,7 +187,7 @@
			<!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
			{{ value.properties.fojcu }}
			<!-- <div class="flow"></div>
			<div class="warning"></div>-->
			<div class="warning"></div>-->
			</div>
			</div>
			</div>
			@@ -1475,6 +1475,7 @@
			}
			let wall = new global.DC.Wall(positionStr)

			console.log('/sf3d/area/info', res.data.data)
			wall.setStyle({
			material: new global.DC.WallTrailMaterialProperty({
			color: global.DC.Namespace.Cesium.Color.fromBytes(