From 9db76cbf52394c666525be1b4e7ac0e431586f96 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 15 May 2020 16:26:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=B5=E5=B7=9E?=
 =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=95=99=E5=B8=88=E8=AF=BE=E7=A8=8B=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/exam/index.vue  | 29 ++++++++++++++++++++++++++++-
 src/views/teach/index.vue | 28 +++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue
index 1d5c2dd79..ab555f9e5 100644
--- a/src/views/exam/index.vue
+++ b/src/views/exam/index.vue
@@ -14,6 +14,9 @@
             <el-button size="mini" type="primary" @click="goLesson(scope.row)">
               {{ $t('exam.enterTheExam') }}
             </el-button>
+            <el-button v-if="project.endsWith('gzb') && isTeacher" size="mini" type="danger" @click="handleDelete(scope.row)">
+              删除课程
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -24,6 +27,9 @@
 <script>
 import { getSubSystemDetail } from '@/api/trainingPlatform';
 import { UrlConfig } from '@/scripts/ConstDic';
+import { delPublishLesson } from '@/api/jmap/lesson';
+import { getSessionStorage } from '@/utils/auth';
+import { lessonCreater } from '@/router/index_APP_TARGET';
 import localStore from 'storejs';
 
 export default {
@@ -31,7 +37,9 @@ export default {
     data() {
         return {
             tableData: [],
-            loading: false
+            loading: false,
+            project: '',
+            isTeacher: false
         };
     },
     watch: {
@@ -41,6 +49,9 @@ export default {
     },
     mounted() {
         this.loadInitPage();
+        this.project = getSessionStorage('project');
+        this.isTeacher = this.$store.state.user.roles.includes(lessonCreater);
+        console.log(this.$store.state.user.roles, lessonCreater, this.isTeacher);
     },
     methods: {
         loadInitPage() {
@@ -64,6 +75,22 @@ export default {
         goLesson(row) {
             localStore.set('examDetail' + this.$route.params.subSystem, `${UrlConfig.trainingPlatform.course}/${this.$route.params.subSystem}?lessonId=${row.id}`);
             this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${this.$route.params.subSystem}`, query: {lessonId: row.id}});
+        },
+        handleDelete(row) {
+            this.$confirm('此操作将删除该类型, 是否继续?', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                delPublishLesson(row.id).then(response => {
+                    this.$message.success(this.$t('publish.deleteSuccess'));
+                    this.loadInitPage();
+                    localStore.remove('mapId');
+                }).catch((error) => {
+                    this.loadInitPage();
+                    this.$messageBox(this.$t('error.deleteFailed') + ':' + error.message);
+                });
+            }).catch(() => { });
         }
     }
 };
diff --git a/src/views/teach/index.vue b/src/views/teach/index.vue
index 5961b9963..aaaf49360 100644
--- a/src/views/teach/index.vue
+++ b/src/views/teach/index.vue
@@ -14,6 +14,9 @@
             <el-button size="mini" type="primary" @click="goLesson(scope.row)">
               {{ $t('teach.enterTheCourse') }}
             </el-button>
+            <el-button v-if="project.endsWith('gzb') && isTeacher" size="mini" type="danger" @click="handleDelete(scope.row)">
+              删除课程
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -24,6 +27,9 @@
 <script>
 import { getSubSystemDetail } from '@/api/trainingPlatform';
 import { UrlConfig } from '@/scripts/ConstDic';
+import { delPublishLesson } from '@/api/jmap/lesson';
+import { getSessionStorage } from '@/utils/auth';
+import { lessonCreater } from '@/router/index_APP_TARGET';
 import localStore from 'storejs';
 
 export default {
@@ -31,7 +37,9 @@ export default {
     data() {
         return {
             tableData: [],
-            loading: false
+            loading: false,
+            project: '',
+            isTeacher: false
         };
     },
     watch: {
@@ -41,6 +49,8 @@ export default {
     },
     mounted() {
         this.loadInitPage();
+        this.project = getSessionStorage('project');
+        this.isTeacher = this.$store.state.user.roles.includes(lessonCreater);
     },
     methods: {
         loadInitPage() {
@@ -66,6 +76,22 @@ export default {
         goLesson(row) {
             localStore.set('teachDetail' + this.$route.params.subSystem, `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}?lessonId=${row.id}&mapId=${row.mapId}&prdType=${row.prdType}`);
             this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}`, query: {lessonId: row.id, mapId: row.mapId, prdType: row.prdType}});
+        },
+        handleDelete(row) {
+            this.$confirm('此操作将删除该类型, 是否继续?', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                delPublishLesson(row.id).then(response => {
+                    this.$message.success(this.$t('publish.deleteSuccess'));
+                    this.loadInitPage();
+                    localStore.remove('mapId');
+                }).catch((error) => {
+                    this.loadInitPage();
+                    this.$messageBox(this.$t('error.deleteFailed') + ':' + error.message);
+                });
+            }).catch(() => { });
         }
     }
 };

From 6aeb2d1b8d83c393cf9a1b84afb444e806618567 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 15 May 2020 16:33:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4localStore=20=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/exam/index.vue  | 1 -
 src/views/teach/index.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue
index ab555f9e5..4bd5cb929 100644
--- a/src/views/exam/index.vue
+++ b/src/views/exam/index.vue
@@ -85,7 +85,6 @@ export default {
                 delPublishLesson(row.id).then(response => {
                     this.$message.success(this.$t('publish.deleteSuccess'));
                     this.loadInitPage();
-                    localStore.remove('mapId');
                 }).catch((error) => {
                     this.loadInitPage();
                     this.$messageBox(this.$t('error.deleteFailed') + ':' + error.message);
diff --git a/src/views/teach/index.vue b/src/views/teach/index.vue
index aaaf49360..5a6f0dadb 100644
--- a/src/views/teach/index.vue
+++ b/src/views/teach/index.vue
@@ -86,7 +86,6 @@ export default {
                 delPublishLesson(row.id).then(response => {
                     this.$message.success(this.$t('publish.deleteSuccess'));
                     this.loadInitPage();
-                    localStore.remove('mapId');
                 }).catch((error) => {
                     this.loadInitPage();
                     this.$messageBox(this.$t('error.deleteFailed') + ':' + error.message);