From 0fd4c16d7a7f1aaa06535ba3af336e550a9b82b8 Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 10 Jan 2023 15:40:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=8A=9F=E8=83=BD=E5=88=86?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/trainingPlatform.js | 8 + src/router/index.js | 6 + src/views/publish/publishMap/subsystem.vue | 10 +- src/views/publish/publishMap/systemSubset.vue | 148 ++++++++++++++++++ src/views/trainingPlatform/simulation.vue | 66 ++++---- 5 files changed, 207 insertions(+), 31 deletions(-) create mode 100644 src/views/publish/publishMap/systemSubset.vue diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js index 5cf0dc4d9..842b033cc 100644 --- a/src/api/trainingPlatform.js +++ b/src/api/trainingPlatform.js @@ -138,3 +138,11 @@ export function deleteAllMapFunction(mapId) { method: 'delete' }); } +/** 新增分组 */ +export function updateMapFunctionSubset(data) { + return request({ + url: `/api/mapFunction/group`, + method: 'put', + data + }); +} diff --git a/src/router/index.js b/src/router/index.js index d7e8760c8..9cfad9c8c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -133,6 +133,7 @@ const SimulationPlatform = () => import('@/views/trainingPlatform/simulation'); const PublishMap = () => import('@/views/publish/publishMap/index'); const SubsystemManage = () => import('@/views/publish/publishMap/subsystem'); +const SystemSubsetManage = () => import('@/views/publish/publishMap/systemSubset'); const IscsDataManage = () => import('@/views/publish/publishMap/iscsDataManage/index'); const PublishMapDetail = () => import('@/views/publish/publishMap/list'); // 发布历史 const PublishLesson = () => import('@/views/publish/publishLesson/index'); @@ -1965,6 +1966,11 @@ export const asyncRouter = [ component: SubsystemManage, hidden: true }, + { + path: 'systemSubset', + component: SystemSubsetManage, + hidden: true + }, { path: 'PublishMapDetail', component: PublishMapDetail, diff --git a/src/views/publish/publishMap/subsystem.vue b/src/views/publish/publishMap/subsystem.vue index 9d39773bc..64bcfe080 100644 --- a/src/views/publish/publishMap/subsystem.vue +++ b/src/views/publish/publishMap/subsystem.vue @@ -79,7 +79,7 @@ export default { queryForm: { labelWidth: '80px', reset: true, - leftSpan: 16, + leftSpan: 15, queryObject: { name: { type: 'text', @@ -111,6 +111,10 @@ export default { columnValue: (row) => { return simTypeMap[row.simType]; }, tagType: () => { return 'success'; } }, + { + title: '分组', + prop: 'subset' + }, // DEFAULT_MEMBER: false, // LPF: false, // REAL_DEVICE: false, @@ -174,6 +178,7 @@ export default { actions: [ { text: '一键生成', handler: this.generateMapSystem }, { text: '一键删除', handler: this.deleteAll }, + { text: '功能分组', handler: this.systemSubset }, { text: '新建', handler: this.handleAddSubsystem }, { text: '返回', handler: this.goBack } ] @@ -226,6 +231,9 @@ export default { generateMapSystem() { this.visible = true; }, + systemSubset() { + this.$router.push({ path:'/systemManagement/lineDataManage/systemSubset', query:{ mapId: this.$route.query.mapId, lineCode: this.$route.query.lineCode }}); + }, doCloseGenerate() { this.form.simTypes = []; this.visible = false; diff --git a/src/views/publish/publishMap/systemSubset.vue b/src/views/publish/publishMap/systemSubset.vue new file mode 100644 index 000000000..f00f6a823 --- /dev/null +++ b/src/views/publish/publishMap/systemSubset.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/views/trainingPlatform/simulation.vue b/src/views/trainingPlatform/simulation.vue index 37ad9a09b..79f2e9cc7 100644 --- a/src/views/trainingPlatform/simulation.vue +++ b/src/views/trainingPlatform/simulation.vue @@ -1,17 +1,23 @@