From 59ed7140aebcf09b8ecc6393a8634cf2af884a04 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 1 Mar 2021 17:15:10 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E8=81=8C?=
 =?UTF-8?q?=E9=99=A2=E8=B0=83=E6=95=B4&=E6=95=99=E5=AD=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/ProjectConfig.js             |  2 +-
 src/views/organization/index.vue         | 10 ++++--
 src/views/teach/detail/index.vue         |  6 ++--
 src/views/teach/index.vue                | 17 +++++-----
 src/views/trainingPlatform/demonList.vue | 42 +++++++++++++++++-------
 5 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index cfb399e69..258eb3c43 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -192,7 +192,7 @@ export const loginInfo = {
         systemType: '014'
     },
     cgy: {
-        title: '成都工业职业技术学院轨道交通虚拟仿真实训平台',
+        title: '成都工业职业技术学院轨道交通虚拟仿真实训中心',
         loginPath: '/login?project=cgy',
         loginParam: 'CGY',
         titleDistance: '-150px',
diff --git a/src/views/organization/index.vue b/src/views/organization/index.vue
index 20de68208..263acdbcd 100644
--- a/src/views/organization/index.vue
+++ b/src/views/organization/index.vue
@@ -49,7 +49,7 @@
         <el-table :data="tableData" border style="width: 100%;margin-top: 10px;" :max-height="height">
           <el-table-column prop="account" label="学号" />
           <el-table-column prop="name" label="姓名" />
-          <el-table-column prop="companyName" label="组织" />
+          <!--<el-table-column prop="companyName" label="组织" />-->
           <el-table-column prop="departmentName" label="班级" />
           <el-table-column label="操作">
             <template slot-scope="scope">
@@ -249,6 +249,12 @@ export default {
                                         if (dataList.length) {
                                             const depart = dataList[1][0].trim();
                                             const parentDepart = dataList[0][0].trim();
+                                            if (!parentDepart) {
+                                                throw new Error(`导入信息年级不能为空！`);
+                                            }
+                                            if (!depart) {
+                                                throw new Error(`导入信息班级不能为空！`);
+                                            }
                                             studentData.depart = depart;
                                             studentData.parentDepart = parentDepart;
                                             for ( let i = 2; i <= dataList[0].length; i++) {
@@ -264,7 +270,7 @@ export default {
                                                     } else if (!name) {
                                                         throw new Error(`学号为：《${studentId}》的数据学生姓名为空！`);
                                                     } else if (!studentIdJudge) {
-                                                        throw new Error(`,学号为：《${studentId}》的数据学号格式不正确！`);
+                                                        throw new Error(`学号为：《${studentId}》的数据学号格式不正确！`);
                                                     }
                                                 }
                                             }
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index e604d2241..547bb08ae 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="joylink-card card_hidden_box">
     <div class="card-title">
-      {{ $t('teach.courseName') }}: {{ courseModel.name }}
+      {{ project ==='cgy'?'项目名称': $t('teach.courseName') }}: {{ courseModel.name }}
     </div>
     <div class="content_box" style="">
       <el-tabs v-model="activeName">
-        <el-tab-pane :label="$t('teach.courseDetails')" name="first">
+        <el-tab-pane :label="project ==='cgy'?'任务详情':$t('teach.courseDetails')" name="first">
           <div>
             <el-tree
               ref="tree"
@@ -37,7 +37,7 @@
     <div class="btn-buy">
       <!-- <el-button type="success" :disabled="disabled" @click="buy">{{ $t('teach.buy') }}</el-button> -->
       <el-button v-if="hasPermssion" type="primary" :disabled="disabled" @click="distribute">{{ $t('teach.permissionDistribute') }}</el-button>
-      <el-button v-if="!$route.query.noPreLogout" type="primary" :disabled="disabled" @click="backLessonList">{{ $t('teach.returnCourseList') }}</el-button>
+      <el-button v-if="!$route.query.noPreLogout" type="primary" :disabled="disabled" @click="backLessonList">{{ project ==='cgy'?'返回项目列表': $t('teach.returnCourseList') }}</el-button>
       <el-button v-if="$route.query.noPreLogout" type="primary" :disabled="disabled" @click="quit">退出</el-button>
     </div>
   </div>
diff --git a/src/views/teach/index.vue b/src/views/teach/index.vue
index 5ad4fcf72..febec83d0 100644
--- a/src/views/teach/index.vue
+++ b/src/views/teach/index.vue
@@ -4,23 +4,23 @@
       <div slot="header" class="lessonHeader">
         {{ $t('global.lessonSystem') }}
       </div>
-      <el-button v-if="isCompanyAdmin || isAdmin" size="mini" type="primary" style="position: absolute;right: 10px;top: 10px;" @click="draftLessonManage">草稿课程管理</el-button>
+      <el-button v-if="(isCompanyAdmin || isAdmin) && project !== 'cgy'" size="mini" type="primary" style="position: absolute;right: 10px;top: 10px;" @click="draftLessonManage">草稿课程管理</el-button>
     </el-card>
     <el-card v-loading="loading">
       <el-table :data="tableData" border style="width: 100%">
-        <el-table-column prop="name" :label="this.$t('teach.courseName')" />
+        <el-table-column prop="name" :label="project === 'cgy'?'项目名称':this.$t('teach.courseName')" />
         <el-table-column v-if="isGzbShow" prop="classNames" label="所属班级">
           <template slot-scope="scope">
             <el-tag v-for="(item, index) in scope.row.classNames" :key="index" type="success">{{ item }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="remarks" show-overflow-tooltip :label="this.$t('teach.courseDescription')" />
+        <el-table-column prop="remarks" show-overflow-tooltip :label="project === 'cgy'?'项目描述':this.$t('teach.courseDescription')" />
         <el-table-column :label="this.$t('global.operate')">
           <template slot-scope="scope">
-            <el-button size="mini" type="primary" @click="goLesson(scope.row)">{{ $t('teach.enterTheCourse') }}</el-button>
+            <el-button size="mini" type="primary" @click="goLesson(scope.row)">{{ project === 'cgy'?'进入项目':$t('teach.enterTheCourse') }}</el-button>
             <el-button v-if="((isCompanyAdmin && userId === scope.row.creatorId) || isAdmin) && !scope.row.systemFault" size="mini" type="primary" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button v-if="((isCompanyAdmin && userId === scope.row.creatorId) || isAdmin) && !scope.row.systemFault" size="mini" type="warning" @click="handleSoldOut(scope.row)">下架</el-button>
-            <el-button v-if="((isCompanyAdmin && userId === scope.row.creatorId) || isAdmin) && !scope.row.systemFault" size="mini" type="danger" @click="handleDelete(scope.row)">删除课程</el-button>
+            <!--<el-button v-if="((isCompanyAdmin && userId === scope.row.creatorId) || isAdmin) && !scope.row.systemFault" size="mini" type="warning" @click="handleSoldOut(scope.row)">下架</el-button>-->
+            <el-button v-if="((isCompanyAdmin && userId === scope.row.creatorId) || isAdmin) && !scope.row.systemFault" size="mini" type="danger" @click="handleDelete(scope.row)">{{ project === 'cgy'?'删除项目':'删除课程' }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -48,7 +48,6 @@ export default {
         return {
             tableData: [],
             loading: false,
-            project: '',
             mapId: '',
             prdType: '',
             cityCode: ''
@@ -58,6 +57,9 @@ export default {
         isGzbShow() {
             return getSessionStorage('project').startsWith('gzb');
         },
+        project() {
+            return getSessionStorage('project');
+        },
         userId() {
             return this.$store.state.user.id;
         },
@@ -75,7 +77,6 @@ export default {
     },
     mounted() {
         this.loadInitPage();
-        this.project = getSessionStorage('project');
     },
     methods: {
         loadInitPage() {
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index adf064867..d2dbf1c17 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -122,18 +122,18 @@ export default {
                         this.toNextPage(isReplace, router);
                         break;
                     case 'Simulation':
-						if (resp.data.prdType == '08') {
-							//运行图编辑工作站
-							getPublishMapInfo(this.mapId).then(rest => {
-								this.setLocalRoute(`${UrlConfig.trainingPlatform.runPlan}/${this.mapId}?lineCode=${rest.data.lineCode}`);
-								router = { path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: { lineCode: rest.data.lineCode}};
-								this.toNextPage(isReplace, router);
-							});
-						} else {
-							this.setLocalRoute(`${UrlConfig.trainingPlatform.prodDetail}/${obj.id}?mapId=${this.mapId}`);
-							router = { path: `${UrlConfig.trainingPlatform.prodDetail}/${obj.id}`, query: { mapId: this.mapId}};
-							this.toNextPage(isReplace, router);
-						}
+                        if (resp.data.prdType == '08') {
+                            // 运行图编辑工作站
+                            getPublishMapInfo(this.mapId).then(rest => {
+                                this.setLocalRoute(`${UrlConfig.trainingPlatform.runPlan}/${this.mapId}?lineCode=${rest.data.lineCode}`);
+                                router = { path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: { lineCode: rest.data.lineCode}};
+                                this.toNextPage(isReplace, router);
+                            });
+                        } else {
+                            this.setLocalRoute(`${UrlConfig.trainingPlatform.prodDetail}/${obj.id}?mapId=${this.mapId}`);
+                            router = { path: `${UrlConfig.trainingPlatform.prodDetail}/${obj.id}`, query: { mapId: this.mapId}};
+                            this.toNextPage(isReplace, router);
+                        }
                         break;
                     }
                 }).catch((error) => {
@@ -173,6 +173,24 @@ export default {
                     item.key = item.id;
                     this.forTree(item);
                 });
+                if (this.project === 'cgy') {
+                    this.treeList = [];
+                    res.data.forEach(item => {
+                        const childList = [];
+                        item && item.children && item.children.forEach(elem => {
+                            if (elem.id === 'Lesson') {
+                                childList[0] = elem;
+                            } else if (elem.id === 'Exam') {
+                                childList[1] = elem;
+                            } else if (elem.id === 'Simulation') {
+                                childList[3] = elem;
+                            } else {
+                                childList[2] = elem;
+                            }
+                        });
+                        item.children = childList;
+                    });
+                }
                 this.treeList = res.data;
                 this.getExpandList(filterSelect);
                 this.$nextTick(() => {

From ee7b19de57671a3baeb0077268bef855f1c0aa11 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 1 Mar 2021 17:51:14 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E8=81=8C?=
 =?UTF-8?q?=E9=99=A2=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trainingPlatform/demonList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index d2dbf1c17..0469aadea 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -181,9 +181,9 @@ export default {
                             if (elem.id === 'Lesson') {
                                 childList[0] = elem;
                             } else if (elem.id === 'Exam') {
-                                childList[1] = elem;
-                            } else if (elem.id === 'Simulation') {
                                 childList[3] = elem;
+                            } else if (elem.id === 'Simulation') {
+                                childList[1] = elem;
                             } else {
                                 childList[2] = elem;
                             }

From 4241e019fbff71ab0102af0311fd5dda15c16a5d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 5 Mar 2021 17:44:32 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/ProjectConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index 258eb3c43..7a05c2060 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -192,7 +192,7 @@ export const loginInfo = {
         systemType: '014'
     },
     cgy: {
-        title: '成都工业职业技术学院轨道交通虚拟仿真实训中心',
+        title: '成都工业职业技术学院线网车站运营虚拟仿真实训中心',
         loginPath: '/login?project=cgy',
         loginParam: 'CGY',
         titleDistance: '-150px',

From 4f9bd398acdbf138fb2554b92eaa7bfd82ebaf16 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Sat, 6 Mar 2021 14:29:02 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B6=8A=E6=88=98=20?=
 =?UTF-8?q?=E9=9D=9E=E5=AE=89=E5=85=A8=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4aa524c79..c361e2037 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -750,7 +750,7 @@ export default {
 			position: relative;
 		}
 		.text-box{
-			font-size: 40px;
+			font-size: 39px;
 			font-weight: bold;
 			top: 150px;
 			width: 1050px;

From c30c809bf1fce18e5920ad25d82c3b493fa4a91a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 11 Mar 2021 10:58:03 +0800
Subject: [PATCH 5/5] =?UTF-8?q?iscs=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iscsSystem/config/canvas/iscsCanvas.vue   |  1 -
 src/views/iscs/iscsSystem/groupNav.vue        | 27 ++++++++++++++++---
 src/views/iscs/iscsSystem/nav.vue             |  6 ++---
 src/views/iscs/iscsSystem/stationNav.vue      |  9 +++++--
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
index 0070088bb..d2cb6443a 100644
--- a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
+++ b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
@@ -80,7 +80,6 @@ export default {
     methods: {
         async getDetail(mode, system, part) {
             const params = {
-                // lineCode: this.$route.query.lineCode,
                 mapId:this.$route.query.mapId,
                 totalSystem: mode,
                 system: system,
diff --git a/src/views/iscs/iscsSystem/groupNav.vue b/src/views/iscs/iscsSystem/groupNav.vue
index cbd86420a..3e0e39530 100644
--- a/src/views/iscs/iscsSystem/groupNav.vue
+++ b/src/views/iscs/iscsSystem/groupNav.vue
@@ -356,7 +356,14 @@ export default {
                 this.selectChildIndex = 0;
                 if (item.children.length) {
                     this.type = item.children[0].type;
-                    const query = {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, group: this.group, lineCode:this.lineCode };
+                    const query = {
+                        currentSystem:this.currentSystem,
+                        stationName: this.stationList[this.selectStationIndex].name,
+                        stationId: this.stationList[this.selectStationIndex].id,
+                        group: this.group,
+                        lineCode:this.lineCode,
+                        mapId: this.$route.query.mapId
+                    };
                     if (this.projectDevice) {
                         query.projectDevice = this.$route.query.projectDevice;
                         query.type = this.$route.query.type;
@@ -368,7 +375,14 @@ export default {
         selectChildren(item, index, isReplace = false) { // 选择菜单
             this.selectChildIndex = index;
             this.type = item.type;
-            const query = {currentSystem: this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, group: this.group, lineCode:this.lineCode };
+            const query = {
+                currentSystem: this.currentSystem,
+                stationName: this.stationList[this.selectStationIndex].name,
+                stationId: this.stationList[this.selectStationIndex].id,
+                group: this.group,
+                lineCode:this.lineCode,
+                mapId: this.$route.query.mapId
+            };
             if (this.projectDevice) {
                 query.projectDevice = this.$route.query.projectDevice;
                 query.type = this.$route.query.type;
@@ -385,7 +399,14 @@ export default {
             if (!this.type) {
                 this.type = this.$route.params.mode;
             }
-            const query = {currentSystem: this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, group: this.group, lineCode:this.lineCode };
+            const query = {
+                currentSystem: this.currentSystem,
+                stationName: this.stationList[this.selectStationIndex].name,
+                stationId: this.stationList[this.selectStationIndex].id,
+                group: this.group,
+                lineCode:this.lineCode,
+                mapId: this.$route.query.mapId
+            };
             if (this.projectDevice) {
                 query.projectDevice = this.$route.query.projectDevice;
                 query.type = this.$route.query.type;
diff --git a/src/views/iscs/iscsSystem/nav.vue b/src/views/iscs/iscsSystem/nav.vue
index 55f621338..666d6b72e 100644
--- a/src/views/iscs/iscsSystem/nav.vue
+++ b/src/views/iscs/iscsSystem/nav.vue
@@ -334,18 +334,18 @@ export default {
                 this.selectChildIndex = 0;
                 if (item.children.length) {
                     this.type = item.children[0].type;
-                    this.$router.push({ path: `/iscs/system/config/${item.children[0].type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });
+                    this.$router.push({ path: `/iscs/system/config/${item.children[0].type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, mapId: this.$route.query.mapId} });
                 }
             }
         },
         selectChildren(item, index) { // 选择菜单
             this.selectChildIndex = index;
             this.type = item.type;
-            this.$router.push({ path: `/iscs/system/config/${item.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });
+            this.$router.push({ path: `/iscs/system/config/${item.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, mapId: this.$route.query.mapId } });
         },
         selectStation(item, index) { // 选择子菜单
             this.selectStationIndex = index;
-            this.$router.push({ path: `/iscs/system/config/${this.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });
+            this.$router.push({ path: `/iscs/system/config/${this.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, mapId: this.$route.query.mapId } });
         },
         back() {
             this.$router.push({ path: `/design/home` });
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue
index 8369846d0..f84d814ac 100644
--- a/src/views/iscs/iscsSystem/stationNav.vue
+++ b/src/views/iscs/iscsSystem/stationNav.vue
@@ -438,8 +438,13 @@ export default {
             if (station) {
                 stationName = station.name;
             }
-            const query = {stationName: stationName, stationId: this.selectStation, group: this.group, mapId: this.$route.query.mapId, noPreLogout:this.$route.query.noPreLogout };
-
+            const query = {
+                stationName: stationName,
+                stationId: this.selectStation,
+                group: this.group,
+                mapId: this.$route.query.mapId,
+                noPreLogout:this.$route.query.noPreLogout
+            };
             if (isReplace) {
                 this.$router.replace({ path: `/displayIscs/system/stationConfig/${type}`, query: query });
             } else {