diff --git a/public/mockData/9d47c8c8-30d8-3e78-944f-d48ca8084c58.png b/public/mockData/9d47c8c8-30d8-3e78-944f-d48ca8084c58.png
new file mode 100644
index 0000000..fc3b098
Binary files /dev/null and b/public/mockData/9d47c8c8-30d8-3e78-944f-d48ca8084c58.png differ
diff --git a/public/mockData/cb8917d8-6658-cf7f-dd4e-ea2e670edea8.png b/public/mockData/cb8917d8-6658-cf7f-dd4e-ea2e670edea8.png
new file mode 100644
index 0000000..c5a441f
Binary files /dev/null and b/public/mockData/cb8917d8-6658-cf7f-dd4e-ea2e670edea8.png differ
diff --git a/public/mockData/fe6ad2d8-da11-04d8-f447-0d8175826e28.png b/public/mockData/fe6ad2d8-da11-04d8-f447-0d8175826e28.png
new file mode 100644
index 0000000..43dcbd5
Binary files /dev/null and b/public/mockData/fe6ad2d8-da11-04d8-f447-0d8175826e28.png differ
diff --git a/src/components/Common/Cesium/index.js b/src/components/Common/Cesium/index.js
new file mode 100644
index 0000000..59fdd66
--- /dev/null
+++ b/src/components/Common/Cesium/index.js
@@ -0,0 +1 @@
+export default class MyCesium {}
diff --git a/src/components/Common/Layout/ModuleWrapper.vue b/src/components/Common/Layout/ModuleWrapper.vue
index 3121bf6..d770e42 100644
--- a/src/components/Common/Layout/ModuleWrapper.vue
+++ b/src/components/Common/Layout/ModuleWrapper.vue
@@ -1,9 +1,11 @@
-
+
{{ title }}
+ {{ title }}
+
diff --git a/src/components/Common/register.js b/src/components/Common/register.js
index 364a592..8a49134 100644
--- a/src/components/Common/register.js
+++ b/src/components/Common/register.js
@@ -3,11 +3,15 @@ import ModuleWrapper from './Layout/ModuleWrapper.vue'
import GridBox from './Directives/GridBox'
import Flex from './Directives/Flex'
+import MyCesium from './Cesium/index'
+
export default {
install(Vue) {
Vue.component('ModuleWrapper', ModuleWrapper)
Vue.directive('grid-box', GridBox)
Vue.directive('flex', Flex)
+
+ window.MyCesium = MyCesium
},
}
diff --git a/src/config/router.config.js b/src/config/router.config.js
index 7f53c2d..ba6a1ad 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -242,7 +242,7 @@ export const constantRouterMap = [
{
path: '/simulationScene/sceneEditing',
name: 'SimulationSceneSceneEditing',
- component: () => import(/* webpackChunkName: "fail" */ '@/views/simulationScene/database/index.vue'),
+ component: () => import(/* webpackChunkName: "fail" */ '@/views/simulationScene/sceneEditing/index.vue'),
meta: { allow: true, title: '场景编辑子系统' },
},
{
diff --git a/src/main.js b/src/main.js
index ae8cf4a..8a2942d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,7 +22,6 @@ import './permission' // permission control
import './utils/filter' // global filter
import './global.less' // global style
import * as echarts from 'echarts'
-console.log(echarts,'echarts')
import CommonRegister from './components/Common/register'
@@ -54,5 +53,5 @@ new Vue({
i18n,
// init localstorage, vuex, Logo message
created: bootstrap,
- render: h => h(App)
+ render: (h) => h(App),
}).$mount('#app')
diff --git a/src/store/modules/simulation.js b/src/store/modules/simulation.js
index 61e95dc..0147301 100644
--- a/src/store/modules/simulation.js
+++ b/src/store/modules/simulation.js
@@ -1,37 +1,34 @@
+import request from '@/utils/request'
+
export default {
namespace: true,
state: {
systemModules: [
{
- title: '数据库子系统',
- icon: require('@/assets/images/simulation-scene/system-icon/database.png'),
- statusKey: 'database',
- path: '/simulationScene/database',
+ moduleName: '数据库子系统',
+ moduleStatus: '0',
+ moduleCode: 'db_system',
},
{
- title: '仿真模型子系统',
- icon: require('@/assets/images/simulation-scene/system-icon/model.png'),
- statusKey: 'model',
- path: '/simulationScene/simulationModel',
+ moduleName: '仿真模型子系统',
+ moduleStatus: '0',
+ moduleCode: 'simulation_system',
},
{
- title: '场景编辑子系统',
- icon: require('@/assets/images/simulation-scene/system-icon/editing.png'),
- statusKey: 'editing',
- path: '/simulationScene/sceneEditing',
+ moduleName: '场景编辑子系统',
+ moduleStatus: '0',
+ moduleCode: 'scenario_system',
},
{
- title: '显示子系统',
- icon: require('@/assets/images/simulation-scene/system-icon/display.png'),
- statusKey: 'display',
- path: '/simulationScene/display',
+ moduleName: '显示子系统',
+ moduleStatus: '0',
+ moduleCode: 'display_system',
},
{
- title: '评估子系统',
- icon: require('@/assets/images/simulation-scene/system-icon/evaluation.png'),
- statusKey: 'evaluation',
- path: '/simulationScene/evaluation',
+ moduleName: '评估子系统',
+ moduleStatus: '0',
+ moduleCode: 'evaluation_system',
},
],
systemStatusMap: {
@@ -42,14 +39,43 @@ export default {
evaluation: 'running',
},
systemStatusDesc: {
- unstart: '未启动',
- running: '运行中',
+ 0: '未启动',
+ 1: '运行中',
+ },
+ systemIconMap: {
+ db_system: require('@/assets/images/simulation-scene/system-icon/database.png'),
+ simulation_system: require('@/assets/images/simulation-scene/system-icon/model.png'),
+ scenario_system: require('@/assets/images/simulation-scene/system-icon/editing.png'),
+ display_system: require('@/assets/images/simulation-scene/system-icon/display.png'),
+ evaluation_system: require('@/assets/images/simulation-scene/system-icon/evaluation.png'),
+ },
+ systemPathMap: {
+ db_system: '/simulationScene/database',
+ simulation_system: '/simulationScene/simulationModel',
+ scenario_system: '/simulationScene/sceneEditing',
+ display_system: '/simulationScene/display',
+ evaluation_system: '/simulationScene/evaluation',
},
},
- getters: {},
+ getters: {
+ systemIconMap() {},
+ },
- mutations: {},
+ mutations: {
+ setSystemModules(state, payload) {
+ state.systemModules = payload
+ },
+ },
- actions: {},
+ actions: {
+ async getSystemModules({ commit }, payload) {
+ try {
+ const res = await request({ url: '/baseData/moduleStatus/list' })
+ commit('setSystemModules', res.data.data)
+ } catch (error) {
+ console.log(error)
+ }
+ },
+ },
}
diff --git a/src/views/simulationScene/centralControl/index.vue b/src/views/simulationScene/centralControl/index.vue
index 56ea9d6..1b80964 100644
--- a/src/views/simulationScene/centralControl/index.vue
+++ b/src/views/simulationScene/centralControl/index.vue
@@ -3,15 +3,15 @@
- ![]()
-
@@ -155,6 +155,8 @@ export default {
systemModules: (state) => state.simulation.systemModules,
systemStatusMap: (state) => state.simulation.systemStatusMap,
systemStatusDesc: (state) => state.simulation.systemStatusDesc,
+ systemIconMap: (state) => state.simulation.systemIconMap,
+ systemPathMap: (state) => state.simulation.systemPathMap,
}),
},
watch: {},
@@ -188,17 +190,17 @@ export default {
line-height: 1;
color: #ffffff;
}
- .status-running {
+ .status-1 {
background-color: #11b740;
}
- .status-unstart {
+ .status-0 {
background-color: #9d9d9d;
}
}
-.system-unstart {
+.system-0 {
cursor: not-allowed;
}
-.system-running:hover {
+.system-1:hover {
border-color: #00f2fe;
}
diff --git a/src/views/simulationScene/index.vue b/src/views/simulationScene/index.vue
index b0ecfb1..38df00a 100644
--- a/src/views/simulationScene/index.vue
+++ b/src/views/simulationScene/index.vue
@@ -21,63 +21,6 @@ export default {
}
},
},
- mounted() {
- this.$http({
- url: '/baseData/moduleStatus/list',
- }).then((res) => {
- console.log('----res----', res)
- const data = {
- code: 200,
- message: 'ok',
- data: {
- code: 200,
- message: 'ok',
- data: [
- {
- id: 1,
- moduleName: '数据库子系统',
- moduleUrl: '/',
- sortOrder: 1,
- moduleStatus: '0',
- moduleCode: 'db_system',
- },
- {
- id: 2,
- moduleName: '仿真模型子系统',
- moduleUrl: '/',
- sortOrder: 2,
- moduleStatus: '0',
- moduleCode: 'simulation_system',
- },
- {
- id: 3,
- moduleName: '场景编辑子系统',
- moduleUrl: '/',
- sortOrder: 3,
- moduleStatus: '0',
- moduleCode: 'scenario_system',
- },
- {
- id: 4,
- moduleName: '显示子系统',
- moduleUrl: '/',
- sortOrder: 4,
- moduleStatus: '0',
- moduleCode: 'display_system',
- },
- {
- id: 5,
- moduleName: '评估子系统',
- moduleUrl: '/',
- sortOrder: 5,
- moduleStatus: '0',
- moduleCode: 'evaluation_system',
- },
- ],
- },
- }
- })
- },
}
diff --git a/src/views/simulationScene/sceneEditing/index.vue b/src/views/simulationScene/sceneEditing/index.vue
index ded7c09..7d2b235 100644
--- a/src/views/simulationScene/sceneEditing/index.vue
+++ b/src/views/simulationScene/sceneEditing/index.vue
@@ -1,11 +1,203 @@
- {{ block.title }}
-
- {{ systemStatusDesc[systemStatusMap[block.statusKey]] }}
+ ![]()
+
{{ block.moduleName }}
+
+ {{ systemStatusDesc[block.moduleStatus] }}
SimulationSceneSceneEditing
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/views/simulationScene/simulationModel/index.vue b/src/views/simulationScene/simulationModel/index.vue
index 73bcc6e..fb0fcdf 100644
--- a/src/views/simulationScene/simulationModel/index.vue
+++ b/src/views/simulationScene/simulationModel/index.vue
@@ -1,14 +1,137 @@
-
+
+
+
+
+
+
+ {{ item.title }}
+
+ ![]()
+ {{ it.title }}
+
+
+
+
+
+
+
+ ![]()
+
+ {{ zt.name }}
+
+ {{ item.label }}：
+ ![]()
+ {{ item.text }}
+
+
+
+
+
+
+ {{ item.title }}
+
+
-
-
-
+
+
+
+
+
+
+ 需求清单
+ 保障清单
+
+
+
+
+
+
+
+
@@ -16,4 +139,29 @@ export default {
.simulation-model-page {
padding-top: 20px;
}
+.image {
+ width: 100%;
+ padding: 20px;
+ background-color: #0c3040;
+}
+.name {
+ color: #00baff;
+ text-decoration: underline;
+ font-size: 16px;
+ line-height: 26px;
+ margin: 10px 0;
+}
+.sx-item {
+ font-size: 16px;
+ line-height: 30px;
+ letter-spacing: 2px;
+ color: #bbdded;
+}
+.zy-item {
+ text-decoration: underline;
+ font-size: 16px;
+ line-height: 26px;
+ letter-spacing: 0px;
+ color: #00baff;
+}
diff --git a/src/views/simulationScene/systemSelect/index.vue b/src/views/simulationScene/systemSelect/index.vue
index da9dd01..1e70390 100644
--- a/src/views/simulationScene/systemSelect/index.vue
+++ b/src/views/simulationScene/systemSelect/index.vue
@@ -2,23 +2,23 @@
+
+
+
+
+
+
+
+ ![]()
+
+ {{ sx.name }}
+
+ {{ item.label }}：
+ ![]()
+ {{ item.text }}
+
+
+
+
+
+
+ {{ item.label }}：
+
+ {{ item.text }}
+
+
- ![]()
-
{{ block.title }}
-
- {{ systemStatusDesc[systemStatusMap[block.statusKey]] }}
+ ![]()
+
{{ block.moduleName }}
+
+ {{ systemStatusDesc[block.moduleStatus] }}