diff --git a/src/config/router.config.js b/src/config/router.config.js
index 5700aa9..36b2372 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -13,7 +13,7 @@ export const asyncRouterMap = [
name: 'index',
component: BasicLayout,
meta: { title: 'menu.home' },
- redirect: '/dashboard/workplace',
+ redirect: '/user/thirdLogin',
children: [
// dashboard
{
@@ -217,7 +217,7 @@ export const constantRouterMap = [
path: '/simulationScene',
name: 'SimulationScene',
component: () => import(/* webpackChunkName: "fail" */ '@/views/simulationScene/index.vue'),
- // redirect: '/simulationScene/systemSelect',
+ redirect: '/simulationScene/centralControl',
children: [
{
path: '/simulationScene/trainer',
@@ -263,6 +263,37 @@ export const constantRouterMap = [
component: () => import(/* webpackChunkName: "fail" */ '@/views/simulationScene/instructor/index.vue'),
meta: { title: '教员系统' },
},
+ {
+ path: '/simulationScene/instructorSystem',
+ name: 'SimulationSceneInstructorSystem',
+ component: () => import(/* webpackChunkName: "fail" */ '@/views/simulationScene/instructor/system/index.vue'),
+ children: [
+ {
+ path: '/simulationScene/instructorSystem/simulationModel',
+ name: 'SimulationSceneInstructorSystemSimulationModel',
+ component: () =>
+ import(/* webpackChunkName: "fail" */ '@/views/simulationScene/instructor/system/simulationModel/index.vue'),
+ },
+ {
+ path: '/simulationScene/instructorSystem/sceneEditing',
+ name: 'SimulationSceneInstructorSystemSceneEditing',
+ component: () =>
+ import(/* webpackChunkName: "fail" */ '@/views/simulationScene/instructor/system/sceneEditing/index.vue'),
+ },
+ {
+ path: '/simulationScene/instructorSystem/display',
+ name: 'SimulationSceneInstructorSystemDisplay',
+ component: () =>
+ import(/* webpackChunkName: "fail" */ '@/views/simulationScene/instructor/system/display/index.vue'),
+ },
+ {
+ path: '/simulationScene/instructorSystem/evaluation',
+ name: 'SimulationSceneInstructorSystemEvaluation',
+ component: () =>
+ import(/* webpackChunkName: "fail" */ '@/views/simulationScene/instructor/system/evaluation/index.vue'),
+ },
+ ],
+ },
{
path: '/simulationScene/systemSelect',
diff --git a/src/views/simulationScene/instructor/index.vue b/src/views/simulationScene/instructor/index.vue
index b730d4a..7b790d6 100644
--- a/src/views/simulationScene/instructor/index.vue
+++ b/src/views/simulationScene/instructor/index.vue
@@ -235,7 +235,7 @@ export default {
handleEnterRoom(roomItem) {
window.localStorage.setItem('instructorRoomId', roomItem.id)
window.localStorage.setItem('instructorRoomName', roomItem.roomName)
- this.$router.push({ name: 'SimulationSceneInstructorMenu' })
+ this.$router.push({ name: 'SimulationSceneInstructorSystemDisplay' })
},
},
}
diff --git a/src/views/simulationScene/instructor/system/display/index.vue b/src/views/simulationScene/instructor/system/display/index.vue
new file mode 100644
index 0000000..793f941
--- /dev/null
+++ b/src/views/simulationScene/instructor/system/display/index.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
diff --git a/src/views/simulationScene/instructor/system/evaluation/index.vue b/src/views/simulationScene/instructor/system/evaluation/index.vue
new file mode 100644
index 0000000..b353cdf
--- /dev/null
+++ b/src/views/simulationScene/instructor/system/evaluation/index.vue
@@ -0,0 +1,14 @@
+
+ SimulationSceneEvaluation
+
+
+
+
+
diff --git a/src/views/simulationScene/instructor/system/index.vue b/src/views/simulationScene/instructor/system/index.vue
new file mode 100644
index 0000000..891f116
--- /dev/null
+++ b/src/views/simulationScene/instructor/system/index.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/simulationScene/instructor/system/sceneEditing/components/LonLatInput.vue b/src/views/simulationScene/instructor/system/sceneEditing/components/LonLatInput.vue
new file mode 100644
index 0000000..43fe543
--- /dev/null
+++ b/src/views/simulationScene/instructor/system/sceneEditing/components/LonLatInput.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
diff --git a/src/views/simulationScene/instructor/system/sceneEditing/index.vue b/src/views/simulationScene/instructor/system/sceneEditing/index.vue
new file mode 100644
index 0000000..3d7500e
--- /dev/null
+++ b/src/views/simulationScene/instructor/system/sceneEditing/index.vue
@@ -0,0 +1,810 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+ {{ it.title }}
+
+
+
+
+
+
+
+
+
+
+ 基础属性
+ 作战行动
+
+
+
+
+
+
+
+
+
+
+ {{ right.detail.name }}
+
+
+
+
+ 推演方:
+ {{ right.detail.position.deduceTypeName }}
+
+
+ 类型:
+ {{ right.detail.position.logisticType | logisticTypeFormat }}
+
+
+ 方向:
+ {{ right.detail.position.direction | numberFormat }}°
+
+
+ 速度:
+ {{ right.detail.position.speed }} 公里/时
+
+
+
经度:
+
{{ right.detail.position.lng | lonFormat }}
+
+
+
+
纬度:
+
{{ right.detail.position.lat | latFormat }}
+
+
+
+
高度/深度:
+
{{ right.detail.position.height | numberFormat }} 米(海拔)
+
+
+
+
+
+ 人员编制数:
+ {{ right.detail.personStatistic.total }} 人
+
+
+ 当前人数:
+ {{ right.detail.personStatistic.current }} 人
+
+
+ 死亡人数:
+ {{ right.detail.personStatistic.death }} 人
+
+
+ 受伤人数:
+ {{ right.detail.personStatistic.injured }} 人
+
+
+
+
+ 野战食物初始量(份):
+ {{ right.detail.foodInfo.startNum }}
+
+
+ 野战食物当前量(份):
+ {{ right.detail.foodInfo.currentNum }}
+
+
+
+
+ 用水初始量(吨):
+ {{ right.detail.waterInfo.startNum }}
+
+
+ 用水当前量(吨):
+ {{ right.detail.waterInfo.currentNum }}
+
+
+
+
+
+ 油料初始量(份):
+ {{ right.detail.oilInfo.startNum }}
+
+
+ 油料当前量(份):
+ {{ right.detail.oilInfo.currentNum }}
+
+
+
+
+ 药材初始量(份):
+ {{ right.detail.medicalInfo.startNum }}
+
+
+ 药材当前量(份):
+ {{ right.detail.medicalInfo.currentNum }}
+
+
+
+
+ 轻武器弹药量(吨):
+ {{ right.detail.ammunition.lightArms }}
+
+
+ 压制武器弹药量(吨):
+ {{ right.detail.ammunition.suppressing }}
+
+
+ 反坦克武器弹药量(吨):
+ {{ right.detail.ammunition.antiTank }}
+
+
+ 防空反导武器弹药量(吨):
+ {{ right.detail.ammunition.antiAircraft }}
+
+
+ 布扫雷装备弹药量(吨):
+ {{ right.detail.ammunition.mineLaying }}
+
+
+ 爆破器材弹药量(吨):
+ {{ right.detail.ammunition.explosiveDevice }}
+
+
+ 烟火装备弹药量(吨):
+ {{ right.detail.ammunition.smokeDevice }}
+
+
+ 防化消耗弹药量(吨):
+ {{ right.detail.ammunition.antiChemical }}
+
+
+
+
+
保障分配类型:
+
+ 自动分配
+ 手动分配
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.typeName || '- -' }}
+
开始时间:{{ item.beginDateTime }}
+
结束时间:{{ item.endDateTime }}
+
+
+
+
+
+
+
+
+
+
+
+ 名称
+
+
+
+
+
+
+
+
+
+
+
+
+ 高度/深度
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/simulationScene/instructor/system/simulationModel/index.vue b/src/views/simulationScene/instructor/system/simulationModel/index.vue
new file mode 100644
index 0000000..1193928
--- /dev/null
+++ b/src/views/simulationScene/instructor/system/simulationModel/index.vue
@@ -0,0 +1,246 @@
+
+
+
+
+
+
+
+
+ 需求清单
+ 保障清单
+
+
+
+
+
+
+
+
+
![]()
+
{{ sx.name }}
+
+
{{ item.label }}:
+
![]()
+
{{ item.text }}
+
+
+
+
+
+
+
+
+ {{ item.label }}:
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/simulationScene/sceneEditing/components/Jcsx.vue b/src/views/simulationScene/sceneEditing/components/Jcsx.vue
new file mode 100644
index 0000000..a6c8fca
--- /dev/null
+++ b/src/views/simulationScene/sceneEditing/components/Jcsx.vue
@@ -0,0 +1,446 @@
+
+
+
+
+
+
+ {{ modelData.team.teamName }}
+
+
+
+
+
+ 名称
+
+
+
+
+
+
+
+ 推演方:
+ {{ modelData.team.type | forceFormat }}
+
+
+
+
经度:
+
{{ modelData.team.lng | lonFormat }}
+
+
+
+
纬度:
+
{{ modelData.team.lat | latFormat }}
+
+
+
+
+
+
+
+
+
+ 人员编制数:
+ {{ modelData.person.total }} 人
+
+
+ 当前人数:
+ {{ modelData.person.current }} 人
+
+
+ 死亡人数:
+ {{ modelData.person.death }} 人
+
+
+ 受伤人数:
+ {{ modelData.person.injured }} 人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/simulationScene/sceneEditing/components/SceneEditing.vue b/src/views/simulationScene/sceneEditing/components/SceneEditing.vue
index fd9ea15..987058a 100644
--- a/src/views/simulationScene/sceneEditing/components/SceneEditing.vue
+++ b/src/views/simulationScene/sceneEditing/components/SceneEditing.vue
@@ -141,10 +141,10 @@
-
+
@@ -153,13 +153,16 @@
-
+
基础属性
作战行动
@@ -168,11 +171,17 @@
diff --git a/src/views/simulationScene/sceneEditing/components/Zzxd.vue b/src/views/simulationScene/sceneEditing/components/Zzxd.vue
new file mode 100644
index 0000000..b497812
--- /dev/null
+++ b/src/views/simulationScene/sceneEditing/components/Zzxd.vue
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+