Browse Source

bug修复

master
menghao 2 months ago
parent
commit
6a853c53e1
  1. 2
      ruoyi-admin/src/main/resources/application-druid.yml
  2. 2
      ruoyi-ui/.env.development
  3. 8
      ruoyi-ui/src/views/cesiumMap/index.vue
  4. 2
      ruoyi-ui/vue.config.js

2
ruoyi-admin/src/main/resources/application-druid.yml

@ -8,7 +8,7 @@ spring:
master: master:
url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: A20040303ctw! password: 123456
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

2
ruoyi-ui/.env.development

@ -8,7 +8,7 @@ ENV = 'development'
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
# 访问地址(绕过 /dev-api 代理,用于解决静态资源/图片访问 401 认证问题) # 访问地址(绕过 /dev-api 代理,用于解决静态资源/图片访问 401 认证问题)
VUE_APP_BACKEND_URL = 'http://192.168.50.30:8080' VUE_APP_BACKEND_URL = 'http://192.168.50.145:8080'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

8
ruoyi-ui/src/views/cesiumMap/index.vue

@ -358,7 +358,7 @@ export default {
const backendUrl = process.env.VUE_APP_BACKEND_URL || ''; const backendUrl = process.env.VUE_APP_BACKEND_URL || '';
return backendUrl + cleanPath; return backendUrl + cleanPath;
}, },
//线style waypoint { pixelSize, color, outlineColor, outlineWidth }line { style, width, color, gapColor, dashLength } //线
renderRouteWaypoints(waypoints, routeId = 'default', platformId, platform, style) { renderRouteWaypoints(waypoints, routeId = 'default', platformId, platform, style) {
if (!waypoints || waypoints.length < 1) return; if (!waypoints || waypoints.length < 1) return;
// 线 // 线
@ -367,6 +367,12 @@ export default {
if (existingLine) { if (existingLine) {
this.viewer.entities.remove(existingLine); this.viewer.entities.remove(existingLine);
} }
// 线
const platformBillboardId = `route-platform-${routeId}`;
const existingPlatform = this.viewer.entities.getById(platformBillboardId);
if (existingPlatform) {
this.viewer.entities.remove(existingPlatform);
}
// 线 // 线
waypoints.forEach((wp,index) => { waypoints.forEach((wp,index) => {
const waypointEntityId = `wp_${routeId}_${wp.id}`; const waypointEntityId = `wp_${routeId}_${wp.id}`;

2
ruoyi-ui/vue.config.js

@ -15,7 +15,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
const baseUrl = 'http://192.168.50.30:8080' // 后端接口 const baseUrl = 'http://192.168.50.145:8080' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口
// 定义 Cesium 源码路径 // 定义 Cesium 源码路径

Loading…
Cancel
Save