Skip to content

Commit 1011364

Browse files
committed
修改bug
1 parent ae6ca3f commit 1011364

File tree

3 files changed

+23
-37
lines changed

3 files changed

+23
-37
lines changed

public/lib/includeLibs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ if (isLocal) {
9595
kriging: ["kriging/kriging.min.js"],
9696
three: ["three/three.js"],
9797
olcesium: ["ol/ol.css", "ol/ol.js", "ol/ol-cesium/olcesium.js"],
98-
hls: ["video/hls/hls.js", "video/hls/hls.js.map"],
98+
hls: ["video/hls/hls.js"],
9999
datgui: ["datgui/dat.gui.min.js"]
100100
}
101101
} else {

src/example/graphic/space/satelliteShading/index.vue

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,14 @@
22
<PannelBox class="infoView">
33
<a-form>
44
<a-form-item label="卫星张角:">
5-
<a-slider
6-
@change="changeAngle"
7-
v-model:value="formState.slideAngle"
8-
:min="1" :max="70" :step="1" />
5+
<a-slider @change="changeAngle" v-model:value="formState.slideAngle" :min="1" :max="70" :step="1" />
96
</a-form-item>
107

118
<a-form-item label="开始时间:">
12-
<mars-date-picker
13-
v-model:value="startTime"
14-
format="YYYY-MM-DD HH:mm:ss"
15-
:show-time="{ defaultValue: dayjs('00:00:00', 'HH:mm:ss') }"
16-
/>
9+
<mars-date-picker v-model:value="startTime" format="YYYY-MM-DD HH:mm:ss" :show-time="{ defaultValue: dayjs('00:00:00', 'HH:mm:ss') }" />
1710
</a-form-item>
1811
<a-form-item label="结束时间:">
19-
<mars-date-picker
20-
v-model:value="endTime"
21-
format="YYYY-MM-DD HH:mm:ss"
22-
:show-time="{ defaultValue: dayjs('00:00:00', 'HH:mm:ss') }"
23-
/>
12+
<mars-date-picker v-model:value="endTime" format="YYYY-MM-DD HH:mm:ss" :show-time="{ defaultValue: dayjs('00:00:00', 'HH:mm:ss') }" />
2413
</a-form-item>
2514

2615
<a-form-item label="区域颜色:">
@@ -38,37 +27,28 @@
3827
</a-space>
3928
</a-form-item>
4029

41-
<a-form-item >
42-
<a-checkbox
43-
v-model:checked="formState.guidaoS"
44-
@change="changeGuidaoS"
45-
>升轨</a-checkbox
46-
>
47-
<a-checkbox
48-
v-model:checked="formState.guidaoJ"
49-
@change="changeGuidaoJ"
50-
>降轨</a-checkbox
51-
>
30+
<a-form-item>
31+
<a-checkbox v-model:checked="formState.guidaoS" @change="changeGuidaoS">升轨</a-checkbox>
32+
<a-checkbox v-model:checked="formState.guidaoJ" @change="changeGuidaoJ">降轨</a-checkbox>
5233
</a-form-item>
5334
</a-form>
5435
</PannelBox>
5536
</template>
5637

5738
<script setup lang="ts">
58-
import { reactive, ref } from "vue"
39+
import { onMounted, reactive, ref } from "vue"
5940
import dayjs, { Dayjs } from "dayjs"
6041
import type { UnwrapRef } from "vue"
6142
import PannelBox from "@comp/OperationPannel/PannelBox.vue"
6243
63-
6444
interface FormState {
65-
slideAngle:number
66-
slideOpacity:number
45+
slideAngle: number
46+
slideOpacity: number
6747
startTime: Dayjs | null
6848
endTime: Dayjs | null
6949
areaColor: string
70-
guidaoS:boolean
71-
guidaoJ:boolean
50+
guidaoS: boolean
51+
guidaoJ: boolean
7252
}
7353
7454
// mapWork是map.js内定义的所有对象, 在项目中使用时可以改为import方式使用: import * as mapWork from './map.js'
@@ -84,8 +64,12 @@ const formState: UnwrapRef<FormState> = reactive({
8464
guidaoJ: true
8565
})
8666
87-
const startTime = ref<Dayjs>(dayjs(mapWork.weixinData.startTime, "YYYY-MM-DD HH:mm:ss"))
88-
const endTime = ref<Dayjs>(dayjs(mapWork.weixinData.endTime, "YYYY-MM-DD HH:mm:ss"))
67+
const startTime = ref()
68+
const endTime = ref()
69+
mapWork.eventTarget.on("loadOK", (event: any) => {
70+
startTime.value = dayjs(event.startTime, "YYYY-MM-DD HH:mm:ss")
71+
endTime.value = dayjs(event.endTime, "YYYY-MM-DD HH:mm:ss")
72+
})
8973
9074
const changeAngle = () => {
9175
mapWork.changeAngle(formState.slideAngle)

src/example/graphic/space/satelliteShading/map.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var map
22
var graphicLayer
3-
var weixinData = {}
3+
var eventTarget = new mars3d.BaseClass()
44

55
function initMap(options) {
66
// 合并属性参数,可覆盖config.json中的对应配置
@@ -110,10 +110,12 @@ function initMap(options) {
110110
}, 1000)
111111

112112
var now = Cesium.JulianDate.toDate(map.clock.currentTime)
113-
weixinData.startTime = mars3d.Util.formatDate(now, "yyyy-MM-dd HH:mm:ss")
113+
const startTime = mars3d.Util.formatDate(now, "yyyy-MM-dd HH:mm:ss")
114114

115115
now.setMinutes(now.getMinutes() + 60)
116-
weixinData.endTime = mars3d.Util.formatDate(now, "yyyy-MM-dd HH:mm:ss")
116+
const endTime = mars3d.Util.formatDate(now, "yyyy-MM-dd HH:mm:ss")
117+
118+
eventTarget.fire("loadOK", { startTime, endTime })
117119
}
118120

119121
function btnAdd(data, bt, et) {

0 commit comments

Comments
 (0)