Browse Source

不用管

wxp
wangxinping 2 months ago
parent
commit
9d483b6056
  1. 2
      ruoyi-admin/src/main/resources/application-druid.yml
  2. 36
      ruoyi-ui/src/api/system/roomPlatformIcon.js
  3. 4
      ruoyi-ui/src/views/childRoom/index.vue

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:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

36
ruoyi-ui/src/api/system/roomPlatformIcon.js

@ -0,0 +1,36 @@
import request from '@/utils/request'
/** 按房间ID查询该房间下所有地图平台图标 */
export function listByRoomId(roomId) {
return request({
url: '/system/roomPlatformIcon/list',
method: 'get',
params: { roomId }
})
}
/** 新增房间地图平台图标 */
export function addRoomPlatformIcon(data) {
return request({
url: '/system/roomPlatformIcon',
method: 'post',
data
})
}
/** 修改房间地图平台图标(位置/朝向/缩放) */
export function updateRoomPlatformIcon(data) {
return request({
url: '/system/roomPlatformIcon',
method: 'put',
data
})
}
/** 删除房间地图平台图标 */
export function delRoomPlatformIcon(id) {
return request({
url: '/system/roomPlatformIcon/' + id,
method: 'delete'
})
}

4
ruoyi-ui/src/views/childRoom/index.vue

@ -2413,8 +2413,8 @@ export default {
? { radius: this.addHoldForm.radius, clockwise: this.addHoldForm.clockwise } ? { radius: this.addHoldForm.radius, clockwise: this.addHoldForm.clockwise }
: { semiMajor: this.addHoldForm.semiMajor, semiMinor: this.addHoldForm.semiMinor, headingDeg: this.addHoldForm.headingDeg, clockwise: this.addHoldForm.clockwise }; : { semiMajor: this.addHoldForm.semiMajor, semiMinor: this.addHoldForm.semiMinor, headingDeg: this.addHoldForm.headingDeg, clockwise: this.addHoldForm.clockwise };
const startTime = this.addHoldForm.startTimeMinutes !== '' && this.addHoldForm.startTimeMinutes != null && !Number.isNaN(Number(this.addHoldForm.startTimeMinutes)) const startTime = this.addHoldForm.startTimeMinutes !== '' && this.addHoldForm.startTimeMinutes != null && !Number.isNaN(Number(this.addHoldForm.startTimeMinutes))
? this.minutesToStartTime(Number(this.addHoldForm.startTimeMinutes)) ? this.minutesToStartTime(Number(this.addHoldForm.startTimeMinutes))
: (nextWp.startTime || 'K+01:00'); : (nextWp.startTime || 'K+01:00');
try { try {
await addWaypoints({ await addWaypoints({
routeId, routeId,

Loading…
Cancel
Save