linwe
2025-11-09 a8715e1b02cef35a82ab438e436cf55d38b03dab
经开分局优化
7 files modified
175 ■■■■ changed files
public/static/config copy.js 2 ●●● patch | view | raw | blame | history
public/static/config.js 4 ●●● patch | view | raw | blame | history
src/api/dept/index.js 8 ●●●●● patch | view | raw | blame | history
src/components/map/index.vue 78 ●●●● patch | view | raw | blame | history
src/router/axios.js 5 ●●●●● patch | view | raw | blame | history
src/views/house/index.vue 2 ●●● patch | view | raw | blame | history
src/views/layout/index.vue 76 ●●●● patch | view | raw | blame | history
public/static/config copy.js
@@ -38,7 +38,7 @@
  // 后台管理跳转地址
  VUE_APP_OUTER_NET_HTURL: 'http://192.168.0.109:1888',
  VUE_APP_INTRANET_HTURL: 'http://47.217.32.232:80:8081',
  VUE_APP_INTRANET_HTURL: 'http://47.217.32.232:8010',
  // 栅格地图的
public/static/config.js
@@ -24,6 +24,8 @@
  // 内网部署
  VUE_APP_INTRANET_SEARCH: 'http://47.212.32.93:9004/ga',
  VUE_APP_INTRANET_QX: 'http://47.212.32.95:12210/',
  // 视频监控平台
  // 本地开发
  VUE_APP_OUTER_NET_VIDEO: 'http://192.168.1.50:18185/api',
@@ -41,7 +43,7 @@
  // 后台管理跳转地址
  VUE_APP_OUTER_NET_HTURL: 'http://192.168.0.126:1888/#/',
  VUE_APP_INTRANET_HTURL: 'http://47.217.32.232:8081/#/',
  VUE_APP_INTRANET_HTURL: 'http://47.217.32.232:8010/#/',
  // 栅格地图的
  // VUE_APP_MAP_YX: 'http://47.217.32.232:80/ysapi',
src/api/dept/index.js
@@ -143,6 +143,14 @@
    }
  })
}
export const get3dTiles = (params) => {
  return request({
    url: '/shangrao-3d-upload/model/list',
    method: 'get',
    requestBaseUrl: 'shangrao-3d-upload',
    params
  })
}
/**
 * 大搜查询--分页
src/components/map/index.vue
@@ -75,9 +75,9 @@
            <div class="img light" @click.stop="highOrLightChange('light')">
              <span :class="{ on: tilesetLayerType == 'light' }">白膜</span>
            </div>
            <!-- <div class="elec high" @click.stop="highOrLightChange('high')">
              <span :class="{ on: tilesetLayerType == 'high' }">高精</span>
            </div> -->
            <div class="elec high" @click.stop="highOrLightChange('high')">
              <span :class="{ on: tilesetLayerType == 'high' }">倾斜</span>
            </div>
          </div>
        </div>
        <div class="angle-btn">
@@ -193,7 +193,9 @@
import createTools from "@/utils/tools/index"
import { mapGetters } from "vuex"
import { getLineSpeed } from "@/utils/turfPolygon"
import {
  get3dTiles
} from "@/api/dept/index.js"
export default {
  name: "mapBox",
@@ -230,6 +232,7 @@
      tilesetLayerType: "",
      angleCheck: true,
      compassBtnTranslate: "rotate(0deg)",
      dtilesList: [],
    }
  },
@@ -467,7 +470,11 @@
    global.DC.ready(initViewer)
    // global.viewer.scene.morphTo2D(1)
    // 添加这一行,在组件挂载后调用 fetchModelList 方法
    this.fetchModelList().then(data => {
      console.log('初始化加载模型列表数据:', data)
      // 如果需要对获取的数据做进一步处理,可以在这里添加代码
    })
    // 清除控制台
    console.clear()
@@ -696,6 +703,51 @@
  },
  methods: {
    /**
      * @description: 获取3D模型列表数据
      * @param {Object} params - 请求参数
      * @return {Promise} 返回接口响应数据
      */
    async fetchModelList (params = {}) {
      try {
        // 默认参数
        const defaultParams = {
          limit: 100,
          page: 1,
          modelName: '',
          status: '',
          createOrg: '经济开发区分局',
          createUser: ''
        }
        // 合并参数
        const requestParams = { ...defaultParams, ...params }
        get3dTiles(requestParams).then(response => {
          console.log('获取模型列表成功:', response.data)
          // 处理响应数据
          if (response && response.data && response.data.result) {
            console.log('获取模型列表成功:', response.data.result)
            this.dtilesList = response.data.result
          } else {
            console.warn('获取模型列表失败: 响应数据为空')
            return null
          }
        })
        // 发起请求
        // const response = await this.$http.get('http://47.212.32.95:12210/shangrao-3d-upload/model/list', {
        //   params: requestParams
        // })
      } catch (error) {
        console.error('获取模型列表时发生错误:', error)
        this.$message({
          message: '获取模型列表失败: ' + error.message,
          type: 'error'
        })
        return null
      }
    },
    // 获取当前地图中心的经纬度
    getSceneCenterPosition (viewer) {
      let centerResult = viewer.camera.pickEllipsoid(
@@ -814,6 +866,10 @@
        this.removeMxTileset(`sdTilesetLayer${item.name}`)
      })
      this.dtilesList.forEach((item) => {
        this.removeMxTileset(`3dsdTilesetLayer${item.id}`)
      })
      // this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`)
      // this.addMxTileset('sdTilesetLayer02', `https://tuan-gis.sit.fengtu.com.cn/361102/wanda/tileset.json`)
      // this.addMxTileset('sdTilesetLayer', `/mx/01/tileset.json`)
@@ -823,21 +879,23 @@
      } else {
        this.tilesetLayerType = type
        type == "light"
          ? window.TILESET_LABEL.forEach((item) => {
        if (type == "light") {
          window.TILESET_LABEL.forEach((item) => {
            this.addMxTileset(
              `sdTilesetLayer${item.name}`,
              `${tile3DUrl}/sf3d/361102/model/all/${item.name}/tileset.json`,
              item
            )
          })
          : window.TILESET_LABEL.forEach((item) => {
        } else {
          this.dtilesList.forEach((item) => {
            this.addMxTileset(
              `sdTilesetLayer${item.name}`,
              `${tile3DUrl}/sf3d/361102/model/all1/${item.name}/tileset.json`,
              `3dsdTilesetLayer${item.id}`,
              `${item.accessUrl}`,
              item
            )
          })
        }
        if (this.$route.path == "/layout/house") {
          this.$EventBus.$emit("showHouseingTileset", {
src/router/axios.js
@@ -23,17 +23,20 @@
let defaultApi = ''
let searchAllApi = ''
let searchAllQxApi = ''
let videoApi = ''
if (process.env.NODE_ENV == 'development') {
  // 开发
  defaultApi = window.BASE_URL_CONFIG.VUE_APP_OUTER_NET
  searchAllApi = window.BASE_URL_CONFIG.VUE_APP_OUTER_NET_SEARCH
  searchAllQxApi = window.BASE_URL_CONFIG.VUE_APP_INTRANET_QX
  videoApi = window.BASE_URL_CONFIG.VUE_APP_OUTER_NET_VIDEO
} else {
  // 部署
  defaultApi = window.BASE_URL_CONFIG.VUE_APP_INTRANET
  searchAllApi = window.BASE_URL_CONFIG.VUE_APP_INTRANET_SEARCH
  searchAllQxApi = window.BASE_URL_CONFIG.VUE_APP_INTRANET_QX
  videoApi = window.BASE_URL_CONFIG.VUE_APP_INTRANET_VIDEO
}
@@ -64,6 +67,8 @@
      config.baseURL = defaultApi
    } else if (config.requestBaseUrl == "fengtDS") {
      config.baseURL = searchAllApi
    } else if (config.requestBaseUrl == "shangrao-3d-upload") {
      config.baseURL = searchAllQxApi
    } else {
      const meta = config.meta || {}
      const isToken = meta.isToken === false
src/views/house/index.vue
@@ -1925,7 +1925,7 @@
        then.$EventBus.$emit("showThreeDimensions", {
          positions: houseData.kmj3a,
          minHeight: res.data.data.properties.hwtxa.features[0].properties.yjpca,
          maxHeight: res.data.data.properties.hwtxa.features[0].properties.mbfdr + res.data.data.properties.hwtxa.features[0].properties.yjpca,
          maxHeight: res.data.data.properties.hwtxa.features[0].properties.mbfdr + res.data.data.properties.hwtxa.features[0].properties.yjpca + 20,
        })
        then.unitChoosed3DList = houseData.nwwqd.features
        then.curHousingHWTXAYjpca = houseData.hwtxa.features[0].properties.yjpca
src/views/layout/index.vue
@@ -218,52 +218,52 @@
        // },
      ],
      menuRightList: [
        // {
        //   menuName: '电子沙盘',
        //   path: '/layout/activity'
        // },
        {
          menuName: '电子沙盘',
          path: '/layout/activity'
        },
        // {
        //   menuName: '警情信息',
        //   path: '/layout/policeinfor'
        // },
        {
          menuName: '场所展示',
          // path: '/layout/scanOrCode',
          path: '/layout/site',
          path: '/layout/scanOrCode',
          // path: '/layout/site',
          childrenFlag: false,
          children: [
            // {
            //   menuName: '群众上报',
            //   path: '/layout/scanOrCode'
            // },
            // {
            //   menuName: '九小场所',
            //   path: '/layout/site'
            // },
            // {
            //   menuName: '矛盾纠纷',
            //   path: '/layout/contradictionEventShow'
            // },
            // {
            //   menuName: '反诈宣防',
            //   path: '/layout/antiFraudShow'
            // },
            // {
            //   menuName: '租赁信息',
            //   path: '/layout/rentalInfo'
            // },
            // {
            //   menuName: '阵地管理',
            //   path: '/layout/positionManage'
            // },
            // {
            //   menuName: '从业人员',
            //   path: '/layout/practitionersManage'
            // },
            // {
            //   menuName: '扫码报警',
            //   path: '/layout/policeAlarmRecordsManage'
            // },
            {
              menuName: '群众上报',
              path: '/layout/scanOrCode'
            },
            {
              menuName: '九小场所',
              path: '/layout/site'
            },
            {
              menuName: '矛盾纠纷',
              path: '/layout/contradictionEventShow'
            },
            {
              menuName: '反诈宣防',
              path: '/layout/antiFraudShow'
            },
            {
              menuName: '租赁信息',
              path: '/layout/rentalInfo'
            },
            {
              menuName: '阵地管理',
              path: '/layout/positionManage'
            },
            {
              menuName: '从业人员',
              path: '/layout/practitionersManage'
            },
            {
              menuName: '扫码报警',
              path: '/layout/policeAlarmRecordsManage'
            },
            /* {
                menuName: '综合搜索',
                path: '/layout/comprehensiveSearch'