Compare commits
2 Commits
59a02d7713
...
e273ba9951
Author | SHA1 | Date | |
---|---|---|---|
![]() |
e273ba9951 | ||
![]() |
0faf494aff |
@ -656,7 +656,7 @@ export default {
|
|||||||
if (this.map) {
|
if (this.map) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.map.resize()
|
this.map.resize()
|
||||||
}, 500)
|
}, 200)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<el-timeline :reverse="true" class="p-l-50 p-r-50">
|
<el-timeline :reverse="true" class="p-l-50 p-r-50">
|
||||||
<el-timeline-item v-for="(activity, index) in log" :key="index" :icon="activity.icon" :type="activity.type"
|
<el-timeline-item v-for="(activity, index) in log" :key="index" :icon="activity.icon" :type="activity.type"
|
||||||
:color="activity.color" :size="activity.size"
|
:color="activity.color" :size="activity.size"
|
||||||
:timestamp="activity.timestamp | parseTime('{y}-{m}-{d} {h}:{i}:{s}')">
|
:timestamp="activity.timestamp | parseTime('{h}:{i}:{s}')">
|
||||||
{{ activity.content }}
|
{{ activity.content }}
|
||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
</el-timeline>
|
</el-timeline>
|
||||||
@ -53,6 +53,11 @@ export default {
|
|||||||
this.drawer = true
|
this.drawer = true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
watch: {
|
||||||
|
newLog (val) {
|
||||||
|
console.error(`提交日志${val.content}`)
|
||||||
|
}
|
||||||
|
},
|
||||||
created () {
|
created () {
|
||||||
},
|
},
|
||||||
destroyed () {
|
destroyed () {
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
<el-container>
|
<el-container>
|
||||||
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
||||||
<div class="l">
|
<div class="l">
|
||||||
<i v-if="pageState === 'add'" class="iconfont el-icon-plus f-s-20"></i>
|
<i v-if="pageState === 'add'" class="el-icon-plus f-s-20"></i>
|
||||||
<i v-else class="iconfont el-icon-edit f-s-20"></i>
|
<i v-else class="el-icon-edit f-s-20"></i>
|
||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
<el-container>
|
<el-container>
|
||||||
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
||||||
<div class="l">
|
<div class="l">
|
||||||
<i v-if="pageState === 'add'" class="iconfont el-icon-plus f-s-20"></i>
|
<i v-if="pageState === 'add'" class="el-icon-plus f-s-20"></i>
|
||||||
<i v-else class="iconfont el-icon-edit f-s-20"></i>
|
<i v-else class="el-icon-edit f-s-20"></i>
|
||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
<el-container>
|
<el-container>
|
||||||
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
||||||
<div class="l">
|
<div class="l">
|
||||||
<i v-if="pageState === 'add'" class="iconfont el-icon-plus f-s-20"></i>
|
<i v-if="pageState === 'add'" class="el-icon-plus f-s-20"></i>
|
||||||
<i v-else class="iconfont el-icon-edit f-s-20"></i>
|
<i v-else class="el-icon-edit f-s-20"></i>
|
||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
<el-container>
|
<el-container>
|
||||||
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
||||||
<div class="l">
|
<div class="l">
|
||||||
<i v-if="pageState === 'add'" class="iconfont el-icon-plus f-s-20"></i>
|
<i v-if="pageState === 'add'" class="el-icon-plus f-s-20"></i>
|
||||||
<i v-else class="iconfont el-icon-edit f-s-20"></i>
|
<i v-else class="el-icon-edit f-s-20"></i>
|
||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
<el-container>
|
<el-container>
|
||||||
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
||||||
<div class="l">
|
<div class="l">
|
||||||
<i v-if="pageState === 'add'" class="iconfont el-icon-plus f-s-20"></i>
|
<i v-if="pageState === 'add'" class="el-icon-plus f-s-20"></i>
|
||||||
<i v-else class="iconfont el-icon-edit f-s-20"></i>
|
<i v-else class="el-icon-edit f-s-20"></i>
|
||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
<el-container>
|
<el-container>
|
||||||
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
||||||
<div class="l">
|
<div class="l">
|
||||||
<i v-if="pageState === 'add'" class="iconfont el-icon-plus f-s-20"></i>
|
<i v-if="pageState === 'add'" class="el-icon-plus f-s-20"></i>
|
||||||
<i v-else class="iconfont el-icon-edit f-s-20"></i>
|
<i v-else class="el-icon-edit f-s-20"></i>
|
||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
<el-container>
|
<el-container>
|
||||||
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
<el-header height="42px" class="l-h-42 p-l-10 p-r-10 border border-b-n">
|
||||||
<div class="l">
|
<div class="l">
|
||||||
<i v-if="pageState === 'add'" class="iconfont el-icon-plus f-s-20"></i>
|
<i v-if="pageState === 'add'" class="el-icon-plus f-s-20"></i>
|
||||||
<i v-else class="iconfont el-icon-edit f-s-20"></i>
|
<i v-else class="el-icon-edit f-s-20"></i>
|
||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
@ -107,7 +107,7 @@ export default {
|
|||||||
if (this.$store.state.app.isWideScreen) {
|
if (this.$store.state.app.isWideScreen) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.$store.commit('app/setCollapse')
|
this.$store.commit('app/setCollapse')
|
||||||
}, 10)
|
}, 100)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
|
@ -102,6 +102,9 @@ export default {
|
|||||||
if (plane.planeState.position.length > 1000) {
|
if (plane.planeState.position.length > 1000) {
|
||||||
plane.planeState.position.shift() // 删除最早的经纬度
|
plane.planeState.position.shift() // 删除最早的经纬度
|
||||||
}
|
}
|
||||||
|
} else if (key === 'statusText') {
|
||||||
|
/* 飞控信息 插入日志 */
|
||||||
|
this.$store.dispatch('fetchLog', { content: jsonData[key], color: '#f57c00' })
|
||||||
} else {
|
} else {
|
||||||
plane.planeState[key] = jsonData[key] // 按订阅信息 刷新飞机状态
|
plane.planeState[key] = jsonData[key] // 按订阅信息 刷新飞机状态
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user