Merge branch 'master' of http://60.205.254.193:3000/GCLS/eep_page

src/views/book/courseware/create/components/question/dialogue_article/ArticleSetting.vue

@@ -379,7 +379,7 @@ export default {
 .el-form {
   @include setting-base;
 
-  height: calc(100vh - 150px);
+  // height: calc(100vh - 150px);
   padding-bottom: 50px;
   overflow: auto;
 

src/views/personal_workbench/template_list/preview/CommonPreview.vue

@@ -27,7 +27,7 @@
         <slot name="middle" :courseware="courseware_info"></slot>
 
         <div class="operator">
-          <span v-if="type !== 'manager'" class="link" @click="editTask">开始编辑</span>
+          <span v-if="type !== 'manager' && is_can_edit === 'true'" class="link" @click="editTask">开始编辑</span>
 
           <span class="link" @click="goBackTemplateList">返回模板列表</span>
         </div>
@@ -147,6 +147,7 @@ export default {
         can_check_correct: false, // 可查看批改
       },
       popoverShow: false,
+      is_can_edit: 'false', // 是否可以编辑
     };
   },
   computed: {},
@@ -192,6 +193,7 @@ export default {
     getTemplateInfo(id) {
       GetTemplateInfo({ id }).then((res) => {
         if (res.status === 1) {
+          this.is_can_edit = res.template_info.is_can_edit;
           this.getTemplateChapterStructExpandList(this.id);
           if (res.template_info.type === 0) {
             this.getBookCoursewareInfo(this.id);
@@ -283,6 +285,8 @@ export default {
         this.$router.push({ path: '/personal_workbench/template_list' });
       } else if (this.type === 'org') {
         this.$router.push({ path: '/personal_workbench/template_list_org' });
+      } else if (this.type === 'admin') {
+        this.$router.push({ path: '/personal_workbench/template_list_admin' });
       } else {
         this.$router.push({ path: '/personal_workbench/template_list_manager' });
       }

src/views/personal_workbench/template_list_admin/index.vue

@@ -185,7 +185,7 @@ export default {
       if (!row.id) return;
       this.$router.push({
         path: `/personal_workbench/template_list/preview/${row.id}`,
-        query: { template_type: 'manager' },
+        query: { template_type: 'admin' },
       });
     },
     // 更改模板状态