1 rok pred · 8b7d9af4dc
--- a/dist/index.html
+++ b/dist/index.html
@@ -25,7 +25,11 @@
 
				       height: 100%;
			
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				+<<<<<<< HEAD
			
 
				     }</style><link href=./static/css/app.77b9211801c1e913fd9543788d8473d2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f583576dfec9dfc9a295.js></script><script type=text/javascript src=./static/js/vendor.a5bf03ccc49c8f7897e1.js></script><script type=text/javascript src=./static/js/app.6a59a51b3451e28122f5.js></script></body></html><script>function stopSafari() {
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.86137d31cce6bbfcbe50156560913c05.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.2a339f70df75a328f1c8.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.77b9211801c1e913fd9543788d8473d2.css
+++ b/dist/static/css/app.77b9211801c1e913fd9543788d8473d2.css
--- a/dist/static/css/app.77b9211801c1e913fd9543788d8473d2.css.map
+++ b/dist/static/css/app.77b9211801c1e913fd9543788d8473d2.css.map
--- a/dist/static/css/app.86137d31cce6bbfcbe50156560913c05.css
+++ b/dist/static/css/app.86137d31cce6bbfcbe50156560913c05.css
--- a/dist/static/css/app.86137d31cce6bbfcbe50156560913c05.css.map
+++ b/dist/static/css/app.86137d31cce6bbfcbe50156560913c05.css.map
--- a/dist/static/img/add_check_icon_active.de065e2.png
+++ b/dist/static/img/add_check_icon_active.de065e2.png
--- a/dist/static/img/add_edit_icon.7184d1d.png
+++ b/dist/static/img/add_edit_icon.7184d1d.png
--- a/dist/static/img/all_icon.0948957.png
+++ b/dist/static/img/all_icon.0948957.png
--- a/dist/static/img/all_icon_active.cbb6ba1.png
+++ b/dist/static/img/all_icon_active.cbb6ba1.png
--- a/dist/static/img/all_icon_b.df6028a.png
+++ b/dist/static/img/all_icon_b.df6028a.png
--- a/dist/static/img/bj_icon.444d732.png
+++ b/dist/static/img/bj_icon.444d732.png
--- a/dist/static/img/bj_icon_active.2f19c2c.png
+++ b/dist/static/img/bj_icon_active.2f19c2c.png
--- a/dist/static/img/bj_icon_b.f767774.png
+++ b/dist/static/img/bj_icon_b.f767774.png
--- a/dist/static/img/gr_icon_active.4880043.png
+++ b/dist/static/img/gr_icon_active.4880043.png
--- a/dist/static/img/gr_icon_b.8703adc.png
+++ b/dist/static/img/gr_icon_b.8703adc.png
--- a/dist/static/img/js_icon_b.1d1d718.png
+++ b/dist/static/img/js_icon_b.1d1d718.png
--- a/dist/static/img/jy_icon_active.e1a377f.png
+++ b/dist/static/img/jy_icon_active.e1a377f.png
--- a/dist/static/img/md_icon.78a1668.png
+++ b/dist/static/img/md_icon.78a1668.png
--- a/dist/static/img/md_icon_b.838dfa9.png
+++ b/dist/static/img/md_icon_b.838dfa9.png
--- a/dist/static/img/teacher.1b451c4.jpg
+++ b/dist/static/img/teacher.1b451c4.jpg
--- a/dist/static/img/yy_icon_active.f456dc5.png
+++ b/dist/static/img/yy_icon_active.f456dc5.png
--- a/dist/static/img/yy_icon_b.926d090.png
+++ b/dist/static/img/yy_icon_b.926d090.png
--- a/dist/static/js/app.2a339f70df75a328f1c8.js
+++ b/dist/static/js/app.2a339f70df75a328f1c8.js
--- a/dist/static/js/app.2a339f70df75a328f1c8.js.map
+++ b/dist/static/js/app.2a339f70df75a328f1c8.js.map
--- a/dist/static/js/app.6a59a51b3451e28122f5.js.map
+++ b/dist/static/js/app.6a59a51b3451e28122f5.js.map
--- a/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
+++ b/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
--- a/src/App.vue
+++ b/src/App.vue
@@ -46,7 +46,7 @@
 
				       :style="{ overflow: $route.path == '/liveRoom' ? 'hidden' : '' }"
			
 
				     >
			
 
				       <!-- main 内容 -->
			
 
				-      <keep-alive v-if="$route.meta.keepAlive">
			
 
				+      <keep-alive>
			
 
				         <!-- 这里是会被缓存的视图组件 -->
			
 
				         <router-view
			
 
				           v-if="$route.meta.keepAlive"
			
--- a/src/assets/css/button.css
+++ b/src/assets/css/button.css
@@ -120,6 +120,7 @@
 
				 .pub_btn_template_img::before,
			
 
				 .pub_btn_add_img2::before,
			
 
				 .pub_btn_eval_img::before,
			
 
				+.pub_btn_eval_source_img::before,
			
 
				 .pub_btn_tool_img::before,
			
 
				 .pub_btn_add_task_img::before,
			
 
				 .pub_btn_finish_img::before,
			
@@ -192,6 +193,10 @@
 
				   background-image: url(../icon/new/icon_setting.png);
			
 
				 }
			
 
				 
			
 
				+.pub_btn_eval_source_img::before{
			
 
				+  background-image: url(../icon/new/icon_setting.png);
			
 
				+}
			
 
				+
			
 
				 .r_pub_button_retrun {
			
 
				   color: #0061FF;
			
 
				   font-size: 14px;
			
@@ -243,3 +248,82 @@
 
				   margin-right: 7px;
			
 
				   background-image: url(../icon/new/upload.png);
			
 
				 }
			
 
				+
			
 
				+
			
 
				+.pub_test_btn {
			
 
				+  color: #101010;
			
 
				+  background-color: rgb(240, 242, 245);
			
 
				+  padding: 8px 10px;
			
 
				+  font-size: 16px;
			
 
				+  min-width: 100px;
			
 
				+  font-weight: 500;
			
 
				+  border-radius: 4px;
			
 
				+  box-sizing: border-box;
			
 
				+  border: none;
			
 
				+  cursor: pointer;
			
 
				+  transition: all 0.2s ease-in-out;
			
 
				+  display: flex;
			
 
				+  align-items: center;
			
 
				+  justify-content: left;
			
 
				+  line-height: 1;
			
 
				+}
			
 
				+
			
 
				+/* .pub_test_btn:has(+.pub_test_btn) {
			
 
				+  margin-right: 10px;
			
 
				+} */
			
 
				+.pub_test_btn {
			
 
				+  margin-right: 10px;
			
 
				+}
			
 
				+
			
 
				+.pub_test_btn_text::before,
			
 
				+.pub_test_btn_choose::before,
			
 
				+.pub_test_btn_page::before,
			
 
				+.pub_test_btn_group::before,
			
 
				+.pub_test_btn_file::before {
			
 
				+  content: "";
			
 
				+  width: 18px;
			
 
				+  height: 18px;
			
 
				+  min-width: 14px;
			
 
				+  min-height: 14px;
			
 
				+  background-size: 100% 100%;
			
 
				+  display: block;
			
 
				+  margin-right: 7px;
			
 
				+}
			
 
				+
			
 
				+
			
 
				+.pub_test_btn_text::before {
			
 
				+  background-image: url(../icon/test/type_text_icon.png);
			
 
				+}
			
 
				+.pub_test_btn_choose::before {
			
 
				+  background-image: url(../icon/test/type_check_icon.png);
			
 
				+}
			
 
				+.pub_test_btn_file::before {
			
 
				+  background-image: url(../icon/test/type_file_icon.png);
			
 
				+}
			
 
				+.pub_test_btn_page::before {
			
 
				+  background-image: url(../icon/test/type_page_icon.png);
			
 
				+}
			
 
				+.pub_test_btn_group::before {
			
 
				+  background-image: url(../icon/test/type_group_icon.png);
			
 
				+}
			
 
				+
			
 
				+.test_icon{
			
 
				+  display: inline-block;
			
 
				+  width: 18px;
			
 
				+  height: 18px;
			
 
				+  background-size: 100% 100%;
			
 
				+  cursor: pointer;
			
 
				+  position: relative;
			
 
				+  top: 3px;
			
 
				+  margin-right: 5px;
			
 
				+}
			
 
				+
			
 
				+.test_icon_check{
			
 
				+  background-image: url('../icon/test/type_check_icon.png');
			
 
				+}
			
 
				+.test_icon_gap{
			
 
				+  background-image: url('../icon/test/type_text_icon.png');
			
 
				+}
			
 
				+.test_icon_file{
			
 
				+  background-image: url('../icon/test/type_file_icon.png');
			
 
				+}
			
--- a/src/assets/icon/englishVoice/icon_check_addUser.png
+++ b/src/assets/icon/englishVoice/icon_check_addUser.png
--- a/src/assets/icon/englishVoice/icon_check_none.png
+++ b/src/assets/icon/englishVoice/icon_check_none.png
--- a/src/assets/icon/englishVoice/icon_check_qa.png
+++ b/src/assets/icon/englishVoice/icon_check_qa.png
--- a/src/assets/icon/englishVoice/icon_check_sentence.png
+++ b/src/assets/icon/englishVoice/icon_check_sentence.png
--- a/src/assets/icon/englishVoice/icon_check_theme.png
+++ b/src/assets/icon/englishVoice/icon_check_theme.png
--- a/src/assets/icon/englishVoice/icon_check_user.png
+++ b/src/assets/icon/englishVoice/icon_check_user.png
--- a/src/assets/icon/englishVoice/icon_check_word.png
+++ b/src/assets/icon/englishVoice/icon_check_word.png
--- a/src/assets/icon/new/test_hf.png
+++ b/src/assets/icon/new/test_hf.png
--- a/src/assets/icon/new/test_jy.png
+++ b/src/assets/icon/new/test_jy.png
--- a/src/assets/icon/new/test_pl.png
+++ b/src/assets/icon/new/test_pl.png
--- a/src/assets/icon/test/add_check_icon.png
+++ b/src/assets/icon/test/add_check_icon.png
--- a/src/assets/icon/test/add_check_icon_active.png
+++ b/src/assets/icon/test/add_check_icon_active.png
--- a/src/assets/icon/test/add_edit_icon.png
+++ b/src/assets/icon/test/add_edit_icon.png
--- a/src/assets/icon/test/add_edit_icon_active.png
+++ b/src/assets/icon/test/add_edit_icon_active.png
--- a/src/assets/icon/test/all_icon.png
+++ b/src/assets/icon/test/all_icon.png
--- a/src/assets/icon/test/all_icon_active.png
+++ b/src/assets/icon/test/all_icon_active.png
--- a/src/assets/icon/test/all_icon_b.png
+++ b/src/assets/icon/test/all_icon_b.png
--- a/src/assets/icon/test/bj_icon.png
+++ b/src/assets/icon/test/bj_icon.png
--- a/src/assets/icon/test/bj_icon_active.png
+++ b/src/assets/icon/test/bj_icon_active.png
--- a/src/assets/icon/test/bj_icon_b.png
+++ b/src/assets/icon/test/bj_icon_b.png
--- a/src/assets/icon/test/camera_icon.png
+++ b/src/assets/icon/test/camera_icon.png
--- a/src/assets/icon/test/check_icon.png
+++ b/src/assets/icon/test/check_icon.png
--- a/src/assets/icon/test/check_test_icon.png
+++ b/src/assets/icon/test/check_test_icon.png
--- a/src/assets/icon/test/delete.png
+++ b/src/assets/icon/test/delete.png
--- a/src/assets/icon/test/delete_test_icon.png
+++ b/src/assets/icon/test/delete_test_icon.png
--- a/src/assets/icon/test/delete_test_icon2.png
+++ b/src/assets/icon/test/delete_test_icon2.png
--- a/src/assets/icon/test/drag_icon.png
+++ b/src/assets/icon/test/drag_icon.png
--- a/src/assets/icon/test/drag_icon_active.png
+++ b/src/assets/icon/test/drag_icon_active.png
--- a/src/assets/icon/test/edit-icon.png
+++ b/src/assets/icon/test/edit-icon.png
--- a/src/assets/icon/test/edit_icon.png
+++ b/src/assets/icon/test/edit_icon.png
--- a/src/assets/icon/test/edit_test_icon.png
+++ b/src/assets/icon/test/edit_test_icon.png
--- a/src/assets/icon/test/gr_icon.png
+++ b/src/assets/icon/test/gr_icon.png
--- a/src/assets/icon/test/gr_icon_active.png
+++ b/src/assets/icon/test/gr_icon_active.png
--- a/src/assets/icon/test/gr_icon_b.png
+++ b/src/assets/icon/test/gr_icon_b.png
--- a/src/assets/icon/test/js_icon_b.png
+++ b/src/assets/icon/test/js_icon_b.png
--- a/src/assets/icon/test/jy_icon.png
+++ b/src/assets/icon/test/jy_icon.png
--- a/src/assets/icon/test/jy_icon_active.png
+++ b/src/assets/icon/test/jy_icon_active.png
--- a/src/assets/icon/test/md_icon.png
+++ b/src/assets/icon/test/md_icon.png
--- a/src/assets/icon/test/md_icon_active.png
+++ b/src/assets/icon/test/md_icon_active.png
--- a/src/assets/icon/test/md_icon_b.png
+++ b/src/assets/icon/test/md_icon_b.png
--- a/src/assets/icon/test/paste_icon.png
+++ b/src/assets/icon/test/paste_icon.png
--- a/src/assets/icon/test/teacher.jpg
+++ b/src/assets/icon/test/teacher.jpg
--- a/src/assets/icon/test/type_check_icon.png
+++ b/src/assets/icon/test/type_check_icon.png
--- a/src/assets/icon/test/type_file_icon.png
+++ b/src/assets/icon/test/type_file_icon.png
--- a/src/assets/icon/test/type_group_icon.png
+++ b/src/assets/icon/test/type_group_icon.png
--- a/src/assets/icon/test/type_page_icon.png
+++ b/src/assets/icon/test/type_page_icon.png
--- a/src/assets/icon/test/type_text_icon.png
+++ b/src/assets/icon/test/type_text_icon.png
--- a/src/assets/icon/test/yy_icon.png
+++ b/src/assets/icon/test/yy_icon.png
--- a/src/assets/icon/test/yy_icon_active.png
+++ b/src/assets/icon/test/yy_icon_active.png
--- a/src/assets/icon/test/yy_icon_b.png
+++ b/src/assets/icon/test/yy_icon_b.png
--- a/src/assets/icon/test/zong_1.png
+++ b/src/assets/icon/test/zong_1.png
--- a/src/assets/icon/test/zong_2.png
+++ b/src/assets/icon/test/zong_2.png
--- a/src/assets/icon/test/zong_3.png
+++ b/src/assets/icon/test/zong_3.png
--- a/src/assets/icon/thirdToolList/englishVoice.png
+++ b/src/assets/icon/thirdToolList/englishVoice.png
--- a/src/assets/wheel.png
+++ b/src/assets/wheel.png
--- a/src/components/pages/EnglishVoice/component/check.vue
+++ b/src/components/pages/EnglishVoice/component/check.vue
@@ -0,0 +1,202 @@
 
				+<template>
			
 
				+    <div class="check_box">
			
 
				+        <div class="check_div" v-for="(item, index) in checkData" :key="index">
			
 
				+            <div class="check_div_title">
			
 
				+                <div class="check_div_open" :class="{ active: item.open}" @click="openC(index)"></div>
			
 
				+                <div class="check_div_name">{{ item.name }}</div>
			
 
				+            </div>
			
 
				+            <div class="check_div_children" v-show="item.open">
			
 
				+                <div class="check_div_child" v-for="(item2) in item.children" :key="item2.type" @click="addCheck(item2)">
			
 
				+                    <div class="check_icon">
			
 
				+                        <img :src="item2.icon" alt="">
			
 
				+                    </div>
			
 
				+                    <div class="check_div_child_name">{{ item2.name }}</div>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+// import u_arrow from '../../../../assets/icon/new/u_arrow.png'
			
 
				+import icon_check_addUser from '../../../../assets/icon/englishVoice/icon_check_addUser.png'
			
 
				+import icon_check_qa from '../../../../assets/icon/englishVoice/icon_check_qa.png'
			
 
				+import icon_check_sentence from '../../../../assets/icon/englishVoice/icon_check_sentence.png'
			
 
				+import icon_check_theme from '../../../../assets/icon/englishVoice/icon_check_theme.png'
			
 
				+import icon_check_user from '../../../../assets/icon/englishVoice/icon_check_user.png'
			
 
				+import icon_check_word from '../../../../assets/icon/englishVoice/icon_check_word.png'
			
 
				+import minxin from '../minxins/minxin'
			
 
				+export default {
			
 
				+    mixins: [minxin],
			
 
				+    props: {
			
 
				+        checkJson: {
			
 
				+            type: Array,
			
 
				+        },
			
 
				+    },
			
 
				+    data() {
			
 
				+        return {
			
 
				+            checkData:[
			
 
				+                {
			
 
				+                    name:'朗读',
			
 
				+                    open: true,
			
 
				+                    children:[
			
 
				+                        {
			
 
				+                            icon:icon_check_word,
			
 
				+                            name:'单词/词组',
			
 
				+                            type:'word'
			
 
				+                        },
			
 
				+                        {
			
 
				+                            icon:icon_check_sentence,
			
 
				+                            name:'句子/短文',
			
 
				+                            type:'sentence'
			
 
				+                        }
			
 
				+                    ]
			
 
				+                },
			
 
				+                {
			
 
				+                    name:'回答',
			
 
				+                    open: true,
			
 
				+                    children:[
			
 
				+                        {
			
 
				+                            icon:icon_check_qa,
			
 
				+                            name:'题目',
			
 
				+                            type:'QA'
			
 
				+                        }
			
 
				+                    ]
			
 
				+                },
			
 
				+                // {
			
 
				+                //     name:'对话',
			
 
				+                //     open: false,
			
 
				+                //     children:[
			
 
				+                //         {
			
 
				+                //             icon:icon_check_addUser,
			
 
				+                //             name:'创建角色',
			
 
				+                //             type:'createRole'
			
 
				+                //         }
			
 
				+                //     ]
			
 
				+                // },
			
 
				+                // {
			
 
				+                //     name:'主题陈述',
			
 
				+                //     open: false,
			
 
				+                //     children:[
			
 
				+                //         {
			
 
				+                //             icon:icon_check_theme,
			
 
				+                //             name:'新建主题',
			
 
				+                //             type:'theme'
			
 
				+                //         }
			
 
				+                //     ]
			
 
				+                // }
			
 
				+            ],
			
 
				+            checkArray:[]
			
 
				+        }
			
 
				+    },
			
 
				+    methods: {
			
 
				+        openC(index) {
			
 
				+            this.checkData[index].open = !this.checkData[index].open
			
 
				+            this.$forceUpdate()
			
 
				+        },
			
 
				+        addCheck(item){
			
 
				+            if(item.type == 'word'){
			
 
				+                this.checkArray.push({
			
 
				+                    type:'word',
			
 
				+                    title:'',
			
 
				+                    img:'',
			
 
				+                    content:'单词/词组'  
			
 
				+                })
			
 
				+            }else if(item.type == 'sentence'){
			
 
				+                this.checkArray.push({
			
 
				+                    type:'sentence',
			
 
				+                    title:'',
			
 
				+                    img:'',
			
 
				+                    content:'句子/短文'  
			
 
				+                })
			
 
				+            }else if(item.type == 'QA'){
			
 
				+                this.checkArray.push({
			
 
				+                    type:'QA',
			
 
				+                    title:'',
			
 
				+                    img:'',
			
 
				+                    content:'题目'  
			
 
				+                })
			
 
				+            }
			
 
				+            this.$forceUpdate()
			
 
				+            this.$emit('setJson', this.checkArray)
			
 
				+        }
			
 
				+    },
			
 
				+    watch: {
			
 
				+        checkJson: {
			
 
				+        handler: function (newVal, oldVal) {
			
 
				+            this.checkArray = this.depthCopy(newVal);
			
 
				+        },
			
 
				+        deep: true,
			
 
				+        },
			
 
				+    },
			
 
				+    mounted(){
			
 
				+        this.checkArray = this.depthCopy(this.checkJson);
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style scoped>
			
 
				+    .check_box{
			
 
				+        width: 100%;
			
 
				+    }
			
 
				+
			
 
				+    .check_div{
			
 
				+        width: 100%;
			
 
				+    }
			
 
				+    .check_div + .check_div{
			
 
				+        margin-top: 16px;
			
 
				+    }
			
 
				+    .check_div_title{
			
 
				+        width: 100%;
			
 
				+        display: flex;
			
 
				+        align-items: center;
			
 
				+        margin-bottom: 8px;
			
 
				+    }
			
 
				+    .check_div_open{
			
 
				+        width: 11px;
			
 
				+        height: 11px;
			
 
				+        background-image: url('../../../../assets/icon/new/u_arrow.png');
			
 
				+        background-size: 100% 100%;
			
 
				+        margin-right: 7px;
			
 
				+        cursor: pointer;
			
 
				+        transition: all 0.3s;
			
 
				+        transform: rotate(-90deg);
			
 
				+    }
			
 
				+    .check_div_open.active{
			
 
				+        transform: rotate(0deg);
			
 
				+    }
			
 
				+    .check_div_name{
			
 
				+        font-size: 14px;
			
 
				+        color: #000;
			
 
				+        font-weight: bold;
			
 
				+    }
			
 
				+    .check_div_children{}
			
 
				+    .check_div_child{
			
 
				+        cursor: pointer;
			
 
				+        display: flex;
			
 
				+        width: 100%;
			
 
				+        padding: 8px 8px;
			
 
				+        box-sizing: border-box;
			
 
				+        background: rgb(240, 242, 245);
			
 
				+        border-radius: 4px;
			
 
				+        align-items: center;
			
 
				+    }
			
 
				+    .check_div_child+ .check_div_child{
			
 
				+        margin-top: 8px;
			
 
				+    }
			
 
				+    .check_icon{
			
 
				+        display: flex;
			
 
				+        width: 16px;
			
 
				+        height: 16px;
			
 
				+        align-items: center;
			
 
				+        justify-content: center;
			
 
				+        margin-right: 5px;
			
 
				+    }
			
 
				+
			
 
				+    .check_icon > img{
			
 
				+        width: 100%;
			
 
				+        height: 100%;
			
 
				+        object-fit: contain;
			
 
				+    }
			
 
				+    .check_div_child_name{}
			
 
				+</style>
			
--- a/src/components/pages/EnglishVoice/component/order.vue
+++ b/src/components/pages/EnglishVoice/component/order.vue
@@ -0,0 +1,82 @@
 
				+<template>
			
 
				+  <div class="o_box">
			
 
				+    <div class="o_none_box" v-if="!checkArray.length">
			
 
				+      <img src="../../../../assets/icon/englishVoice/icon_check_none.png" alt="">
			
 
				+      <span>暂无内容，请添加题目</span>
			
 
				+    </div>
			
 
				+    <div class="o_check_box" v-else>
			
 
				+      <div class="o_child" v-for="(item, index) in checkArray" :key="index">
			
 
				+        <div class="o_child_title">
			
 
				+          <span class="drag"></span>
			
 
				+          <span class="title">{{item.content}}</span>
			
 
				+          <div class="edit_btn">
			
 
				+            <span class="edit"></span>
			
 
				+            <span class="delete"></span>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import minxin from '../minxins/minxin'
			
 
				+export default {
			
 
				+  mixins: [minxin],
			
 
				+  props: {
			
 
				+    checkJson: {
			
 
				+      type: Array,
			
 
				+    },
			
 
				+    editType:{
			
 
				+      type: Number,
			
 
				+      default: 1
			
 
				+    }
			
 
				+  },
			
 
				+  data() {
			
 
				+    return {
			
 
				+      checkArray: []
			
 
				+    }
			
 
				+  },
			
 
				+  watch: {
			
 
				+    checkJson: {
			
 
				+      handler: function (newVal, oldVal) {
			
 
				+        this.checkArray = this.depthCopy(newVal);
			
 
				+      },
			
 
				+      deep: true,
			
 
				+    },
			
 
				+  },
			
 
				+  mounted(){
			
 
				+    this.checkArray = this.depthCopy(this.checkJson);
			
 
				+  }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style scoped>
			
 
				+.o_box {
			
 
				+  width: 100%;
			
 
				+  height: auto;
			
 
				+}
			
 
				+
			
 
				+.o_none_box{
			
 
				+  width: 100%;
			
 
				+  height: 500px;
			
 
				+  background: #fff;
			
 
				+  display: flex;
			
 
				+  align-items: center;
			
 
				+  justify-content: center;
			
 
				+  flex-direction: column;
			
 
				+}
			
 
				+
			
 
				+.o_none_box > img{
			
 
				+  width: 120px;
			
 
				+  height: 120px;
			
 
				+  object-fit: contain;
			
 
				+}
			
 
				+
			
 
				+.o_none_box > span{
			
 
				+  font-size: 12px;
			
 
				+  color: #00000066;
			
 
				+  margin-top: 15px;
			
 
				+}
			
 
				+
			
 
				+</style>
			
--- a/src/components/pages/EnglishVoice/index.vue
+++ b/src/components/pages/EnglishVoice/index.vue
@@ -0,0 +1,241 @@
 
				+<template>
			
 
				+      <el-dialog title="英语口语" :visible.sync="EnglishVoiceDialog" :append-to-body="true" width="100%"
			
 
				+        :before-close="handleClose" class="dialog_diy">
			
 
				+        <div class="ev_box">
			
 
				+            <div class="ev_info_box">
			
 
				+                <div class="title">设置英语口语信息</div>
			
 
				+                <div class="ev_info_input_box">
			
 
				+                    <div class="box"> 
			
 
				+                        <span class="title bi">标题</span>
			
 
				+                        <el-input v-model="title" placeholder="请输入标题" class="input"/>
			
 
				+                    </div>
			
 
				+                    <div class="box"> 
			
 
				+                        <span class="title">说明</span>
			
 
				+                        <el-input v-model="detail" placeholder="请输入对该问题的描述" class="input"/>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+            <div class="ev_info_box">
			
 
				+                <div class="title">设置英语口语题目</div>
			
 
				+                <div class="ev_create_box">
			
 
				+                    <div class="left">
			
 
				+                        <div class="title">题目类型选择</div>
			
 
				+                        <check :checkJson="checkJson" @setJson="setJson"></check>
			
 
				+                    </div>
			
 
				+                    <div class="center">
			
 
				+                        <div class="title">评测题目</div>
			
 
				+                        <order :checkJson="checkJson" @setJson="setJson" :editType="2"></order>
			
 
				+                    </div>
			
 
				+                    <div class="right">
			
 
				+                        <div class="title">评测大纲</div>
			
 
				+                        <order :checkJson="checkJson" @setJson="setJson" :editType="1"></order>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+        </div>
			
 
				+        <span slot="footer" class="dialog-footer">
			
 
				+            <el-button type="primary" @click="confirm()">确 认</el-button>
			
 
				+            <el-button @click="close()">关 闭</el-button>
			
 
				+        </span>
			
 
				+    </el-dialog>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import order from './component/order'
			
 
				+import check from './component/check'
			
 
				+export default {
			
 
				+    components: {
			
 
				+        check,
			
 
				+        order
			
 
				+    },
			
 
				+    props: {
			
 
				+        EnglishVoiceDialog: {
			
 
				+            type: Boolean,
			
 
				+            default: false
			
 
				+        },
			
 
				+        oid: {
			
 
				+            type: String
			
 
				+        }
			
 
				+    },
			
 
				+    data() {
			
 
				+        return {
			
 
				+            checkJson: [],
			
 
				+            title:'',
			
 
				+            detail:'',
			
 
				+        }
			
 
				+    },
			
 
				+    methods: {
			
 
				+        handleClose(done) {
			
 
				+            this.close();
			
 
				+            done();
			
 
				+        },
			
 
				+        close() {
			
 
				+            this.$emit("update:EnglishVoiceDialog", false);
			
 
				+        },
			
 
				+        confirm() {
			
 
				+            this.close();
			
 
				+        },
			
 
				+        setJson(val){
			
 
				+            debugger
			
 
				+            this.checkJson = val;
			
 
				+            this.$forceUpdate()
			
 
				+        }
			
 
				+    },
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style scoped>
			
 
				+.dialog_diy>>>.el-dialog {
			
 
				+    height: 100%;
			
 
				+    margin: 0vh auto !important;
			
 
				+}
			
 
				+
			
 
				+.dialog_diy>>>.el-dialog__header {
			
 
				+    background: #454545 !important;
			
 
				+    padding: 15px 20px;
			
 
				+}
			
 
				+
			
 
				+.dialog_diy>>>.el-dialog__body {
			
 
				+    height: calc(100% - 124px);
			
 
				+    box-sizing: border-box;
			
 
				+    padding: 0px;
			
 
				+}
			
 
				+
			
 
				+.dialog_diy>>>.el-dialog__title {
			
 
				+    color: #fff;
			
 
				+}
			
 
				+
			
 
				+.dialog_diy>>>.el-dialog__headerbtn {
			
 
				+    top: 19px;
			
 
				+}
			
 
				+
			
 
				+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close {
			
 
				+    color: #fff;
			
 
				+}
			
 
				+
			
 
				+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close:hover {
			
 
				+    color: #fff;
			
 
				+}
			
 
				+
			
 
				+.dialog_diy>>>.el-dialog__body,
			
 
				+.dialog_diy>>>.el-dialog__footer {
			
 
				+    background: rgb(rgb(240, 242, 245));
			
 
				+    overflow: hidden;
			
 
				+}
			
 
				+
			
 
				+.ev_box{
			
 
				+    width: calc(100% - 20px);
			
 
				+    height: calc(100% - 20px);
			
 
				+    overflow: auto;
			
 
				+    background: #fff;
			
 
				+    margin: 10px auto;
			
 
				+    border-radius: 5px;
			
 
				+}
			
 
				+
			
 
				+.ev_info_box{
			
 
				+    
			
 
				+}
			
 
				+.ev_info_box + .ev_info_box{
			
 
				+    margin-top: 14px;
			
 
				+}
			
 
				+.ev_info_box > .title {
			
 
				+    padding: 15px 0 15px 0;
			
 
				+    font-size: 16px;
			
 
				+    font-weight: bold;
			
 
				+    margin: 0 0 0 20px;
			
 
				+    box-sizing: border-box;
			
 
				+    display: flex;
			
 
				+    align-items: center;
			
 
				+    line-height: 20px;
			
 
				+    color: #000;
			
 
				+}
			
 
				+
			
 
				+.ev_info_box > .title::before {
			
 
				+    content: '';
			
 
				+    display: block;
			
 
				+    width: 3px;
			
 
				+    height: 20px;
			
 
				+    background: #0061FF;
			
 
				+    border-radius: 3px;
			
 
				+    margin: 0 5px 0 0;
			
 
				+}
			
 
				+
			
 
				+.ev_info_input_box{
			
 
				+    width: 100%;
			
 
				+    box-sizing: border-box;
			
 
				+    padding: 0 20px;
			
 
				+}
			
 
				+.ev_info_input_box > .box{
			
 
				+    display: flex;
			
 
				+    align-items: center;
			
 
				+}
			
 
				+.ev_info_input_box > .box + .box{
			
 
				+    margin-top: 12px;
			
 
				+}
			
 
				+.ev_info_input_box > .box > .title{
			
 
				+    min-width: fit-content;
			
 
				+    font-size: 14px;
			
 
				+    margin:0 10px;
			
 
				+    position: relative;
			
 
				+}
			
 
				+.ev_info_input_box > .box > .title.bi::before{
			
 
				+    content: '*';
			
 
				+    color: rgb(238, 62, 62);
			
 
				+    display: block;
			
 
				+    font-size: 18px;
			
 
				+    position: absolute;
			
 
				+    left: -10px;
			
 
				+}
			
 
				+.ev_info_input_box > .box > .input{
			
 
				+    width: 100%;
			
 
				+    max-width: 750px;
			
 
				+}
			
 
				+
			
 
				+.ev_create_box{
			
 
				+    width: 100%;
			
 
				+    width: calc(100% - 40px);
			
 
				+    border-radius: 5px;
			
 
				+    border: 1px solid #E7E7E7;
			
 
				+    margin: 0 auto 10px;
			
 
				+    display: flex;
			
 
				+    justify-content: space-between;
			
 
				+    min-height: 500px;
			
 
				+}
			
 
				+.ev_create_box > .left{
			
 
				+    width: 250px;
			
 
				+    border-right: 1px solid #e7e7e7;
			
 
				+    box-sizing: border-box;
			
 
				+    padding: 0 16px;
			
 
				+}
			
 
				+.ev_create_box > .center{
			
 
				+    width: calc(100% - 500px);
			
 
				+}
			
 
				+.ev_create_box > .right{
			
 
				+    width: 250px;
			
 
				+    border-left: 1px solid #e7e7e7;
			
 
				+    box-sizing: border-box;
			
 
				+    padding: 0 16px;
			
 
				+}
			
 
				+
			
 
				+.ev_create_box > .left > .title{
			
 
				+    font-size: 16px;
			
 
				+    font-weight: 700;
			
 
				+    color: #000;
			
 
				+    text-align: center;
			
 
				+    margin: 20px 0;
			
 
				+}
			
 
				+.ev_create_box > .center > .title{
			
 
				+    font-size: 24px;
			
 
				+    font-weight: 700;
			
 
				+    color: #000;
			
 
				+    text-align: center;
			
 
				+    margin: 16px 0;
			
 
				+}
			
 
				+.ev_create_box > .right > .title{
			
 
				+    font-size: 16px;
			
 
				+    font-weight: 700;
			
 
				+    color: #000;
			
 
				+    text-align: center;
			
 
				+    margin: 20px 0;
			
 
				+}
			
 
				+</style>
			
--- a/src/components/pages/EnglishVoice/minxins/minxin.js
+++ b/src/components/pages/EnglishVoice/minxins/minxin.js
@@ -0,0 +1,23 @@
 
				+const minxin = {
			
 
				+  data() {
			
 
				+    return {
			
 
				+      options2: {
			
 
				+        word:"单词/词组",
			
 
				+        sentence:"句子/短文",
			
 
				+        QA:"题目",
			
 
				+        createRole:"创建角色",
			
 
				+        theme:"新建主题",
			
 
				+      },
			
 
				+    };
			
 
				+  },
			
 
				+  computed: {},
			
 
				+  mounted() {},
			
 
				+  activated() {},
			
 
				+  methods: {
			
 
				+    depthCopy(s) {
			
 
				+      return s ? JSON.parse(JSON.stringify(s)) : '';
			
 
				+    }
			
 
				+  }
			
 
				+};
			
 
				+
			
 
				+export default minxin;
			
--- a/src/components/pages/addCourse.vue
+++ b/src/components/pages/addCourse.vue
@@ -357,7 +357,6 @@
 
				                   <div class="wordPic">
			
 
				                     <img src="../../assets/icon/new/template_none.png" alt />
			
 
				                   </div>
			
 
				-
			
 
				                   <div style="
			
 
				                       margin-top: 10px;
			
 
				                       line-height: 19px;
			
@@ -651,7 +650,7 @@
 
				                     <!-- v-if="steps == 3 && (userid == courseUserid || role == '1')" -->
			
 
				                     <button class="c_pub_button_add" @click="openStageBox" v-show="false"
			
 
				                       style="margin: 0 0 0 auto;">阶段顺序</button>
			
 
				-                    <button class="c_pub_button_add pub_btn_paste_img" @click="pasteTask" v-if="steps == 3 && isPasteTask"
			
 
				+                    <button class="c_pub_button_add pub_btn_paste_img" @click="pasteTask()" v-if="steps == 3 && isPasteTask"
			
 
				                       style="margin: 0 0 0 auto;">智能粘贴</button>
			
 
				                     <button class="c_pub_button_confirm pub_btn_template_img" @click="openTemplate"
			
 
				                       :style="{margin: isPasteTask ? '0 0 0 20px' : '0 0 0 auto'}" style="padding:0 12px">选择课程模板</button>
			
@@ -2086,6 +2085,16 @@
 
				                                       </div>
			
 
				                                     </div> -->
			
 
				                                   </div>
			
 
				+                                  <!-- <div class="tool" :class="{ isToolChoose: itemTool.tool.indexOf(70) != -1 }"
			
 
				+                                    @click="addTools(70, itemTaskIndex, toolIndex)">
			
 
				+                                    <div class="whiteBIcon" @click.stop="openTools(itemTaskIndex, 70, toolIndex)">
			
 
				+                                      <img src="../../assets/icon/thirdToolList/englishVoice.png" alt />
			
 
				+                                      <div style="margin: 5px 0">英语口语</div>
			
 
				+                                    </div>
			
 
				+                                    <div class="noCTool"><img src="../../assets/icon/new/isToolC.png" alt="" /></div>
			
 
				+                                    <div class="isCTool" v-if="itemTool.tool.indexOf(70) != -1"><img
			
 
				+                                        src="../../assets/icon/new/isToolC.png" alt="" /></div>
			
 
				+                                  </div> -->
			
 
				                                   <!-- <div class="tool">
			
 
				                                   <div class="whiteBIcon" @click="addTools(28, itemTaskIndex, toolIndex)">
			
 
				                                     <img src="../../assets/icon/secondToolList/translation.png" alt />
			
@@ -2518,9 +2527,14 @@
 
				                                 </div>
			
 
				                                 <div>添加</div>
			
 
				                               </div> -->
			
 
				-                              <button class="c_pub_button_add pub_btn_eval_img" @click="addEList(unitIndex, itemTaskIndex)" style="margin: 20px 35px 0 0">
			
 
				-                                  添加
			
 
				-                              </button>
			
 
				+                              <div class="eva_btn_box">
			
 
				+                                <button class="c_pub_button_add pub_btn_eval_img" @click="addEList(unitIndex, itemTaskIndex)">
			
 
				+                                    添加
			
 
				+                                </button>
			
 
				+                                <button class="c_pub_button_add pub_btn_eval_source_img" @click="openEList(unitIndex, itemTaskIndex)">
			
 
				+                                    资源
			
 
				+                                </button>
			
 
				+                              </div>
			
 
				                             </div>
			
 
				                             <div v-if="evalua" style="
			
 
				                           border: 1px solid #e5e5e5;
			
@@ -3802,7 +3816,7 @@
 
				     </el-dialog>
			
 
				     <el-dialog title="创建作文题目" :visible.sync="englishDialogVisible" :append-to-body="true" width="800px"
			
 
				       :before-close="(done) => { closePan(69) }" class="dialog_diy fullStyle fullStyle1">
			
 
				-      <englishRight :englishList="englishList" :oid="oid" ref="engJson"></englishRight>
			
 
				+      <englishRight :englishList="englishList" :oid="oid" ref="engJson" @setJson="addEnglish"></englishRight>
			
 
				       <span slot="footer" class="dialog-footer">
			
 
				         <el-button @click="englishDialogVisible = false">取 消</el-button>
			
 
				         <el-button type="primary" @click="addEnglish">确 定</el-button>
			
@@ -3815,17 +3829,20 @@
 
				                   <div class="wordPic">
			
 
				                     <img src="../../assets/icon/new/course_template.png" alt />
			
 
				                   </div>
			
 
				-
			
 
				-                  <div style="
			
 
				+                  <el-tooltip effect="dark" :content="aa.title" placement="top">
			
 
				+                    <div style="
			
 
				                       margin-top: 10px;
			
 
				                       line-height: 19px;
			
 
				                       overflow: hidden;
			
 
				                       text-overflow: ellipsis;
			
 
				                       white-space: nowrap;
			
 
				-                      padding: 0 20px;
			
 
				+                      padding: 0 10px;
			
 
				+                      box-sizing: border-box;
			
 
				+                      width: 100%;
			
 
				                     ">
			
 
				                     {{ aa.title }}
			
 
				                   </div>
			
 
				+                  </el-tooltip>
			
 
				         </div>
			
 
				         <div class="wordTeacher" @click="checkctJson({id: 1})" v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'" :class="{wordTeacherA:ctJson.id == 1}">
			
 
				                   <div class="wordPic">
			
@@ -3890,6 +3907,8 @@
 
				         <el-button type="primary" @click="updateChange">确定</el-button>
			
 
				       </span>
			
 
				     </el-dialog>
			
 
				+    <evaBox :oid='oid' :org="org" :dialogVisibleEva.sync="evaBoxDialog" @updateEvaJson="updateEvaJson"></evaBox>
			
 
				+    <EnglishVoice :oid='oid' :org="org" :EnglishVoiceDialog.sync="EnglishVoiceDialog"></EnglishVoice>
			
 
				 </div>
			
 
				 </template>
			
 
				 
			
@@ -3908,6 +3927,8 @@ import weilaiData from "./components/weilai.js";
 
				 import sourceDialog from "./teacherSource/dialog.vue";
			
 
				 import interVideo from "./interVideo/index.vue";
			
 
				 import englishRight from "./components/englishRight.vue";
			
 
				+import evaBox from './evaBox/index.vue'
			
 
				+import EnglishVoice from './EnglishVoice/index.vue'
			
 
				 
			
 
				 export default {
			
 
				   components: {
			
@@ -3920,6 +3941,8 @@ export default {
 
				     sourceDialog,
			
 
				     interVideo,
			
 
				     englishRight,
			
 
				+    evaBox,
			
 
				+    EnglishVoice
			
 
				   },
			
 
				   data() {
			
 
				     return {
			
@@ -4187,6 +4210,10 @@ export default {
 
				                   ],
			
 
				         checkUnitIndex: 0,
			
 
				         isdrag: '',
			
 
				+        evaIndex: '',
			
 
				+        evatIndex: '',
			
 
				+        evaBoxDialog: false,
			
 
				+        EnglishVoiceDialog: false,
			
 
				     };
			
 
				   },
			
 
				   directives: {
			
@@ -4458,7 +4485,7 @@ export default {
 
				       }
			
 
				     },
			
 
				     openAI() {
			
 
				-      window.parent.postMessage({ tools: "64" }, "*");
			
 
				+      top.postMessage({ tools: "64" }, "*");
			
 
				     },
			
 
				     setMan() {
			
 
				       // let teacherJuri = this.teacherJuri2;
			
@@ -4597,7 +4624,7 @@ export default {
 
				           }
			
 
				         });
			
 
				     },
			
 
				-    addEnglish(){
			
 
				+    addEnglish(jsonType){
			
 
				       this.englishList.engTitle = this.$refs['engJson'].engList.engTitle;
			
 
				       this.englishList.englishText = this.$refs['engJson'].engList.englishText;
			
 
				       this.englishList.textJson = this.$refs['engJson'].engList.textJson;
			
@@ -4609,7 +4636,11 @@ export default {
 
				         this.taskCount
			
 
				       ].toolChoose[this.toolIndex].englishList = this.englishList;
			
 
				       this.englishList = {};
			
 
				-      this.englishDialogVisible = false;
			
 
				+      if(jsonType && jsonType == 1){
			
 
				+        this.englishDialogVisible = true;
			
 
				+      }else{
			
 
				+        this.englishDialogVisible = false;
			
 
				+      }
			
 
				       if (
			
 
				         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount]
			
 
				           .toolChoose[this.toolIndex].tool != 69
			
@@ -5164,7 +5195,7 @@ export default {
 
				       }
			
 
				     },
			
 
				     openT() {
			
 
				-      window.parent.postMessage({ tools: "25" }, "*");
			
 
				+      top.postMessage({ tools: "25" }, "*");
			
 
				     },
			
 
				     deleteTask(i) {
			
 
				       var _this = this;
			
@@ -6581,7 +6612,7 @@ export default {
 
				         });
			
 
				     },
			
 
				     goCourse() {
			
 
				-      window.parent.postMessage({ cid: this.courseId, type: "1" }, "*");
			
 
				+      top.postMessage({ cid: this.courseId, type: "1" }, "*");
			
 
				     },
			
 
				     updateWork2() {
			
 
				       let _unitIndex = this.unitIndex;
			
@@ -7001,19 +7032,22 @@ export default {
 
				           ];
			
 
				           this.updateCourseState(1)
			
 
				       }else if(res.id == 2){
			
 
				+        let stageData = []
			
 
				         let iframe = top.document.querySelectorAll("#AIChat iframe")[0];
			
 
				-        if (!iframe) {
			
 
				+        let iframe2 = top.document.querySelectorAll("#AIChat aigpt")[0];
			
 
				+        if (!iframe && !iframe2) {
			
 
				           this.$message.error("请使用AI共创生成");
			
 
				           return;
			
 
				         }
			
 
				-        let copyData = iframe.contentWindow.copyData;
			
 
				-        if (!copyData || !copyData.stageData || !copyData.stageData.length) {
			
 
				+        let copyData = iframe ? iframe.contentWindow.copyData : false;
			
 
				+        let copyData2 = iframe2 ? iframe2.contentWindow.copyData : false;
			
 
				+        if ((!copyData || !copyData.stageData || !copyData.stageData.length) && (!copyData2 || !copyData2.stageData || !copyData2.stageData.length)) {
			
 
				           this.$message.error("请使用AI共创生成");
			
 
				           return;
			
 
				         }
			
 
				-        let stageData = copyData.stageData;
			
 
				+        stageData = copyData ? copyData.stageData : copyData2 ? copyData2.stageData : [''];
			
 
				         for (var i = 0; i < stageData.length; i++) {
			
 
				-          res.push({
			
 
				+          _res.push({
			
 
				             dyName: stageData[i], //单元标题
			
 
				             chapterInfo: [
			
 
				               {
			
@@ -7618,7 +7652,7 @@ export default {
 
				         this.selectJson2 = JSON.parse(JSON.stringify(this.selectJson))
			
 
				         this.dialogVisibleSelect = true;
			
 
				       } else if (i == 3) {
			
 
				-        window.parent.postMessage(
			
 
				+        top.postMessage(
			
 
				           {
			
 
				             tools: "3y",
			
 
				             cid: this.cid,
			
@@ -7629,7 +7663,7 @@ export default {
 
				           "*"
			
 
				         );
			
 
				       } else if (i == 1) {
			
 
				-        window.parent.postMessage(
			
 
				+        top.postMessage(
			
 
				           {
			
 
				             tools: "1y",
			
 
				             cid: this.cid,
			
@@ -7640,7 +7674,7 @@ export default {
 
				           "*"
			
 
				         );
			
 
				       } else if (i == 57) {
			
 
				-        window.parent.postMessage(
			
 
				+        top.postMessage(
			
 
				           {
			
 
				             tools: "57y",
			
 
				             cid: this.cid,
			
@@ -7665,6 +7699,9 @@ export default {
 
				           : {  };
			
 
				         this.$forceUpdate();
			
 
				         this.englishDialogVisible = true;
			
 
				+      }else if(i == 70){
			
 
				+        this.$forceUpdate();
			
 
				+        this.EnglishVoiceDialog = true;
			
 
				       }
			
 
				     },
			
 
				     chapAddTools(i) {
			
@@ -7788,6 +7825,15 @@ export default {
 
				           return;
			
 
				         }
			
 
				       }
			
 
				+      if(i == 70){
			
 
				+        // if (
			
 
				+        //   !this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
			
 
				+        //     .toolChoose[toolIndex].englishList
			
 
				+        // ) {
			
 
				+          this.openTools(itemTaskIndex, 70, toolIndex);
			
 
				+          return;
			
 
				+        // }
			
 
				+      }
			
 
				       // if (i == 48) {
			
 
				       //   if (
			
 
				       //     !this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
			
@@ -8334,18 +8380,27 @@ export default {
 
				       this.testJson = isTestJson;
			
 
				       this.$forceUpdate();
			
 
				     },
			
 
				-    pasteTask() {
			
 
				-      let iframe = top.document.querySelectorAll("#AIChat iframe")[0];
			
 
				-      if (!iframe) {
			
 
				-        this.$message.error("请使用AI共创生成");
			
 
				-        return;
			
 
				-      }
			
 
				-      let copyData = iframe.contentWindow.copyData;
			
 
				-      if (!copyData || !copyData.tasksData || !copyData.tasksData.length) {
			
 
				-        this.$message.error("请使用AI共创生成");
			
 
				-        return;
			
 
				+    pasteTask(taskJson) {
			
 
				+      let stageTasksData = [];
			
 
				+      if(taskJson){
			
 
				+        stageTasksData = taskJson
			
 
				+      }else {
			
 
				+        let iframe = top.document.querySelectorAll("#AIChat iframe")[0];
			
 
				+        let iframe2 = top.document.querySelectorAll("#AIChat aigpt")[0];
			
 
				+        if (!iframe && !iframe2) {
			
 
				+          this.$message.error("请使用AI共创生成");
			
 
				+          return;
			
 
				+        }
			
 
				+        let copyData = iframe ? iframe.contentWindow.copyData : false;
			
 
				+        let copyData2 = iframe2 ? iframe2.contentWindow.copyData : false;
			
 
				+        if ((!copyData || !copyData.tasksData || !copyData.tasksData.length) && (!copyData2 || !copyData2.tasksData || !copyData2.tasksData.length)) {
			
 
				+          this.$message.error("请使用AI共创生成");
			
 
				+          return;
			
 
				+        }
			
 
				+        stageTasksData = copyData ? copyData.tasksData : copyData2 ? copyData2.tasksData : [{taskName:'',taskDecs:''}];
			
 
				       }
			
 
				-      let stageTasksData = copyData.tasksData;
			
 
				+      
			
 
				+      
			
 
				       let taskA = [];
			
 
				       let tasks = stageTasksData;
			
 
				       for (var j = 0; j < tasks.length; j++) {
			
@@ -8376,18 +8431,26 @@ export default {
 
				       this.unitJson[this.unitIndex].chapterInfo[0].taskJson = taskA;
			
 
				       this.$forceUpdate();
			
 
				     },
			
 
				-    pasteStage() {
			
 
				-      let iframe = top.document.querySelectorAll("#AIChat iframe")[0];
			
 
				-      if (!iframe) {
			
 
				-        this.$message.error("请使用AI共创生成");
			
 
				-        return;
			
 
				-      }
			
 
				-      let copyData = iframe.contentWindow.copyData;
			
 
				-      if (!copyData || !copyData.stageData || !copyData.stageData.length) {
			
 
				-        this.$message.error("请使用AI共创生成");
			
 
				-        return;
			
 
				+    pasteStage(stageJson) {
			
 
				+      let stageData = [];
			
 
				+      if(stageJson){
			
 
				+        stageData = stageJson
			
 
				+      }else{
			
 
				+        let iframe = top.document.querySelectorAll("#AIChat iframe")[0];
			
 
				+        let iframe2 = top.document.querySelectorAll("#AIChat aigpt")[0];
			
 
				+        if (!iframe && !iframe2) {
			
 
				+          this.$message.error("请使用AI共创生成");
			
 
				+          return;
			
 
				+        }
			
 
				+        let copyData = iframe ? iframe.contentWindow.copyData : false;
			
 
				+        let copyData2 = iframe2 ? iframe2.contentWindow.copyData : false;
			
 
				+        if ((!copyData || !copyData.stageData || !copyData.stageData.length) && (!copyData2 || !copyData2.stageData || !copyData2.stageData.length)) {
			
 
				+          this.$message.error("请使用AI共创生成");
			
 
				+          return;
			
 
				+        }
			
 
				+        stageData = copyData ? copyData.stageData : copyData2 ? copyData2.stageData : [''];
			
 
				       }
			
 
				-      let stageData = copyData.stageData;
			
 
				+   
			
 
				       let stage = [];
			
 
				       for (var i = 0; i < stageData.length; i++) {
			
 
				         stage.push({
			
@@ -8434,6 +8497,15 @@ export default {
 
				         });
			
 
				       }
			
 
				       let _this = this;
			
 
				+      if(stageJson){
			
 
				+        if(!_this.cid){
			
 
				+          _this.unitJson = stage;
			
 
				+        }else{
			
 
				+          _this.unitIndex = 0;
			
 
				+          _this.unitJson = stage;
			
 
				+          _this.updateWork();
			
 
				+        }
			
 
				+      }else{
			
 
				       _this
			
 
				         .$confirm("确定选择智能粘贴模板吗？修改课程时无法重置课程模板。", "提示", {
			
 
				           confirmButtonText: "确定",
			
@@ -8449,6 +8521,8 @@ export default {
 
				         .catch(() => {
			
 
				           return;
			
 
				         });
			
 
				+      }
			
 
				+
			
 
				     },
			
 
				     openStageBox() {
			
 
				       this.unitJson3 = JSON.parse(JSON.stringify(this.unitJson))
			
@@ -9282,6 +9356,14 @@ export default {
 
				         ]);
			
 
				       this.$forceUpdate();
			
 
				     },
			
 
				+    openEList(index, tIndex){
			
 
				+      this.evaIndex = index
			
 
				+      this.evatIndex = tIndex
			
 
				+      this.evaBoxDialog = true
			
 
				+    },
			
 
				+    updateEvaJson(array){
			
 
				+      this.unitJson[this.evaIndex].chapterInfo[0].taskJson[this.evatIndex].eList = array
			
 
				+    },
			
 
				     forceUpdate() {
			
 
				       this.$forceUpdate();
			
 
				     },
			
@@ -9921,19 +10003,27 @@ export default {
 
				     },
			
 
				     getPaste() {
			
 
				       let iframe = top.document.querySelectorAll("#AIChat iframe")[0];
			
 
				-      if (!iframe) {
			
 
				+      let iframe2 = top.document.querySelectorAll("#AIChat aigpt")[0];
			
 
				+      if (!iframe && !iframe2) {
			
 
				         return;
			
 
				       }
			
 
				-      let copyData = iframe.contentWindow.copyData;
			
 
				+      let copyData =  iframe ? iframe.contentWindow.copyData : false;
			
 
				+      let copyData2 =  iframe2 ? iframe2.contentWindow.copyData : false;
			
 
				       if (copyData && copyData.stageData && copyData.stageData.length) {
			
 
				         this.isPasteStage = true
			
 
				       }
			
 
				+      if (copyData2 && copyData2.stageData && copyData2.stageData.length) {
			
 
				+        this.isPasteStage = true
			
 
				+      }
			
 
				       if (copyData && copyData.selectData.length) {
			
 
				         this.isPasteChoice = true
			
 
				       }
			
 
				       if (copyData && copyData.tasksData && copyData.tasksData.length) {
			
 
				         this.isPasteTask = true
			
 
				       }
			
 
				+      if (copyData2 && copyData2.tasksData && copyData2.tasksData.length) {
			
 
				+        this.isPasteTask = true
			
 
				+      }
			
 
				     },
			
 
				     searchImage() {
			
 
				       var _this = this;
			
@@ -10285,6 +10375,13 @@ export default {
 
				     setTimeout(() => {
			
 
				       this.selectCourseDetail();
			
 
				     }, 500);
			
 
				+    let _this = this
			
 
				+    window.pasteStage = function(json){
			
 
				+      _this.pasteStage(json)
			
 
				+    }
			
 
				+    window.pasteTask = function(json){
			
 
				+      _this.pasteTask(json)
			
 
				+    }
			
 
				   },
			
 
				 };
			
 
				 </script>
			
@@ -14342,4 +14439,9 @@ ol {
 
				   left: 0;
			
 
				   margin: 15px 0 0;
			
 
				 }
			
 
				+
			
 
				+.eva_btn_box{
			
 
				+  margin: 20px 0px 0 0;
			
 
				+  display: flex;
			
 
				+}
			
 
				 </style>
			
--- a/src/components/pages/components/classReport.vue
+++ b/src/components/pages/components/classReport.vue
@@ -70,8 +70,10 @@
 
				       :before-close="handleClose"
			
 
				       class="dialog_diy"
			
 
				     >
			
 
				-      <div>
			
 
				+      <div v-if="!isLoading1">
			
 
				+        <div v-if="studentJuri.length == 0">暂无数据</div>
			
 
				         <el-table
			
 
				+          v-else
			
 
				           :data="studentJuri"
			
 
				           border
			
 
				           v-loading="isLoading1"
			
@@ -97,6 +99,7 @@
 
				           </el-table-column>
			
 
				         </el-table>
			
 
				       </div>
			
 
				+      <div v-else>正在加载数据中...</div>
			
 
				       <span slot="footer" class="dialog-footer">
			
 
				         <el-button @click="dialogVisible = false">取 消</el-button>
			
 
				         <el-button type="primary" @click="getCStudentReport">确定</el-button>
			
--- a/src/components/pages/components/classStudentComponents/worksDetail3.vue
+++ b/src/components/pages/components/classStudentComponents/worksDetail3.vue
@@ -111,7 +111,7 @@
 
				                       <el-button
			
 
				                         type="primary"
			
 
				                         size="small"
			
 
				-                        @click="openFile(worksDetail[sIndex].wpptInfo[0])"
			
 
				+                        @click="openFile2(worksDetail[sIndex].wpptInfo[0])"
			
 
				                         >查看文档
			
 
				                       </el-button>
			
 
				                     </div>
			
@@ -2248,6 +2248,45 @@ export default {
 
				       this.pptImgUrl = f;
			
 
				       this.dialogVisible6 = true;
			
 
				     },
			
 
				+    openFile2(f) {
			
 
				+      this.pptImgUrl = f.wpptInfo;
			
 
				+      var fileA = [
			
 
				+        "DOC",
			
 
				+        "DOCX",
			
 
				+        "DOCM",
			
 
				+        "DOTM",
			
 
				+        "DOTX",
			
 
				+        "PPTX",
			
 
				+        "PPSX",
			
 
				+        "PPT",
			
 
				+        "PPS",
			
 
				+        "PPTM",
			
 
				+        "POTM",
			
 
				+        "PPAM",
			
 
				+        "POTX",
			
 
				+        "PPSM",
			
 
				+        "XLSX",
			
 
				+        "XLS",
			
 
				+      ];
			
 
				+      if (
			
 
				+        fileA.indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleUpperCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = false; //word 文件
			
 
				+      } else if (
			
 
				+        "pdf".indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleLowerCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = true; //pdf
			
 
				+      }
			
 
				+      this.dialogVisible6 = true;
			
 
				+    },
			
 
				     //获取班级列表
			
 
				     getClass() {
			
 
				       let params = {
			
--- a/src/components/pages/components/englishRight.vue
+++ b/src/components/pages/components/englishRight.vue
@@ -39,7 +39,25 @@
 
				               :key="eIndex"
			
 
				               :label="e.title"
			
 
				               :value="e.id"
			
 
				+              class="optionCss"
			
 
				             >
			
 
				+              <span
			
 
				+                style="
			
 
				+                  max-width: 160px;
			
 
				+                  white-space: nowrap;
			
 
				+                  overflow: hidden;
			
 
				+                  text-overflow: ellipsis;
			
 
				+                  word-break: break-word;
			
 
				+                "
			
 
				+                >{{ e.title }}</span
			
 
				+              >
			
 
				+              <span style="position: absolute; right: 20px; top: 3px"
			
 
				+                ><img
			
 
				+                  style="width: 17px; height: 17px; cursor: pointer"
			
 
				+                  @click.stop="deleteTemplate(e.id)"
			
 
				+                  src="../../../assets/icon/deleteN.png"
			
 
				+                  alt=""
			
 
				+              /></span>
			
 
				             </el-option>
			
 
				           </el-select>
			
 
				           <el-tooltip
			
@@ -48,10 +66,7 @@
 
				             placement="top"
			
 
				             v-if="engList.textJson.startJson.length > 0"
			
 
				           >
			
 
				-            <div
			
 
				-              class="addeEva"
			
 
				-              @click="setEvaTitle"
			
 
				-            >
			
 
				+            <div class="addeEva" @click="setEvaTitle">
			
 
				               <img src="../../../assets/icon/addEva.png" alt="" />
			
 
				             </div>
			
 
				           </el-tooltip>
			
@@ -80,9 +95,11 @@
 
				               <el-input v-model="item.detile"></el-input>
			
 
				             </div>
			
 
				           </div>
			
 
				-
			
 
				-          <div class="addeEvaItem" @click="addStartItem">
			
 
				-            <img src="../../../assets/icon/addEva.png" alt="" />
			
 
				+          <div class="bottomCss">
			
 
				+            <el-button type="primary" @click="setJson">保 存</el-button>
			
 
				+            <div class="addeEvaItem" @click="addStartItem">
			
 
				+              <img src="../../../assets/icon/addEva.png" alt="" />
			
 
				+            </div>
			
 
				           </div>
			
 
				         </div>
			
 
				       </div>
			
@@ -125,12 +142,16 @@ export default {
 
				       engEvaId: "",
			
 
				       englishTitle: "",
			
 
				       engEvadialogVisible: false,
			
 
				+      jsonType: 1,
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				     handleClose(done) {
			
 
				       done();
			
 
				     },
			
 
				+    setJson() {
			
 
				+      this.$emit("setJson", this.jsonType);
			
 
				+    },
			
 
				     selectEnglishEva() {
			
 
				       this.englistEva = [];
			
 
				       let params = {
			
@@ -205,9 +226,10 @@ export default {
 
				             this.engList.textJson = tJson;
			
 
				           } else {
			
 
				             this.engList.textJson.score = tJson.score;
			
 
				-            for (var i = 0; i < tJson.startJson.length; i++) {
			
 
				-              this.engList.textJson.startJson.push(tJson.startJson[i]);
			
 
				-            }
			
 
				+            // for (var i = 0; i < tJson.startJson.length; i++) {
			
 
				+            // this.engList.textJson.startJson.push(tJson.startJson[i]);
			
 
				+            this.engList.textJson = tJson;
			
 
				+            // }
			
 
				           }
			
 
				           this.engEvaId = "";
			
 
				         })
			
@@ -215,6 +237,28 @@ export default {
 
				           console.error(err);
			
 
				         });
			
 
				     },
			
 
				+    deleteTemplate(id) {
			
 
				+      this.$confirm("是否确定删除该模板？", "提示", {
			
 
				+        confirmButtonText: "确定",
			
 
				+        cancelButtonText: "取消",
			
 
				+        type: "warning",
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          let params = {
			
 
				+            id: id,
			
 
				+          };
			
 
				+          this.ajax
			
 
				+            .get(this.$store.state.api + "deleteEnglishEvaById", params)
			
 
				+            .then((res) => {
			
 
				+              this.$message.success("删除成功");
			
 
				+              this.selectEnglishEva();
			
 
				+            })
			
 
				+            .catch((err) => {
			
 
				+              console.error(err);
			
 
				+            });
			
 
				+        })
			
 
				+        .catch(() => {});
			
 
				+    },
			
 
				   },
			
 
				   watch: {
			
 
				     englishList: {
			
@@ -315,7 +359,7 @@ export default {
 
				   width: 50px;
			
 
				   height: 30px;
			
 
				   border: 1px dashed #dbdbdb;
			
 
				-  margin-top: 5px;
			
 
				+  margin: 0 0 0 10px;
			
 
				   border-radius: 10px;
			
 
				   float: right;
			
 
				   cursor: pointer;
			
@@ -357,4 +401,20 @@ export default {
 
				   height: 30px;
			
 
				   cursor: pointer;
			
 
				 }
			
 
				+
			
 
				+.optionCss {
			
 
				+  display: flex;
			
 
				+  flex-direction: row;
			
 
				+  flex-wrap: nowrap;
			
 
				+  align-items: baseline;
			
 
				+  justify-content: space-between;
			
 
				+  position: relative;
			
 
				+}
			
 
				+.bottomCss {
			
 
				+  display: flex;
			
 
				+  flex-direction: row;
			
 
				+  flex-wrap: nowrap;
			
 
				+  justify-content: flex-end;
			
 
				+  align-items: center;
			
 
				+}
			
 
				 </style>
			
--- a/src/components/pages/components/stReport.vue
+++ b/src/components/pages/components/stReport.vue
@@ -85,7 +85,9 @@
 
				       class="dialog_diy"
			
 
				     >
			
 
				       <div v-if="!isLoading1">
			
 
				+        <div v-if="mbCourse.length == 0">暂无数据</div>
			
 
				         <div
			
 
				+          v-else
			
 
				           class="evaBox"
			
 
				           v-for="(item, index) in mbCourse"
			
 
				           :key="index"
			
@@ -124,7 +126,7 @@
 
				 
			
 
				 <script>
			
 
				 export default {
			
 
				-  props: ["ooid", "ccid","checkid"],
			
 
				+  props: ["ooid", "ccid", "checkid"],
			
 
				   data() {
			
 
				     return {
			
 
				       sName: "",
			
@@ -146,8 +148,8 @@ export default {
 
				       immediate: true,
			
 
				       deep: true,
			
 
				       handler(newValue, oldValue) {
			
 
				-        if(this.checkid){
			
 
				-          this.classChoose = this.checkid
			
 
				+        if (this.checkid) {
			
 
				+          this.classChoose = this.checkid;
			
 
				         }
			
 
				         this.getClass();
			
 
				         this.getSData();
			
@@ -262,8 +264,8 @@ export default {
 
				     },
			
 
				   },
			
 
				   created() {
			
 
				-    if(this.checkid){
			
 
				-      this.classChoose = this.checkid
			
 
				+    if (this.checkid) {
			
 
				+      this.classChoose = this.checkid;
			
 
				     }
			
 
				     this.getClass();
			
 
				     this.getSData();
			
--- a/src/components/pages/components/studentWorksDetail.vue
+++ b/src/components/pages/components/studentWorksDetail.vue
@@ -340,7 +340,7 @@
 
				                             <el-button
			
 
				                               type="primary"
			
 
				                               size="small"
			
 
				-                              @click="openFile(worksDetail[sIndex].wpptInfo[0])"
			
 
				+                              @click="openFile2(worksDetail[sIndex].wpptInfo[0])"
			
 
				                             >
			
 
				                               查看文档</el-button
			
 
				                             >
			
@@ -3203,6 +3203,45 @@ export default {
 
				       this.pptImgUrl = f;
			
 
				       this.dialogVisible6 = true;
			
 
				     },
			
 
				+    openFile2(f) {
			
 
				+      this.pptImgUrl = f.wpptInfo;
			
 
				+      var fileA = [
			
 
				+        "DOC",
			
 
				+        "DOCX",
			
 
				+        "DOCM",
			
 
				+        "DOTM",
			
 
				+        "DOTX",
			
 
				+        "PPTX",
			
 
				+        "PPSX",
			
 
				+        "PPT",
			
 
				+        "PPS",
			
 
				+        "PPTM",
			
 
				+        "POTM",
			
 
				+        "PPAM",
			
 
				+        "POTX",
			
 
				+        "PPSM",
			
 
				+        "XLSX",
			
 
				+        "XLS",
			
 
				+      ];
			
 
				+      if (
			
 
				+        fileA.indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleUpperCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = false; //word 文件
			
 
				+      } else if (
			
 
				+        "pdf".indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleLowerCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = true; //pdf
			
 
				+      }
			
 
				+      this.dialogVisible6 = true;
			
 
				+    },
			
 
				     searchWork1() {
			
 
				       this.page = 1;
			
 
				       this.chooseTask = "";
			
--- a/src/components/pages/components/worksDetail2.vue
+++ b/src/components/pages/components/worksDetail2.vue
@@ -338,7 +338,9 @@
 
				                             <el-button
			
 
				                               type="primary"
			
 
				                               size="small"
			
 
				-                              @click="openFile(worksDetail[sIndex].wpptInfo[0])"
			
 
				+                              @click="
			
 
				+                                openFile2(worksDetail[sIndex].wpptInfo[0])
			
 
				+                              "
			
 
				                             >
			
 
				                               查看文档</el-button
			
 
				                             >
			
@@ -1396,14 +1398,11 @@
 
				                           </div>
			
 
				                         </div>
			
 
				                         <div class="allRightBox">
			
 
				-                          <span>全部题的正确率：</span
			
 
				-                          >
			
 
				+                          <span>全部题的正确率：</span>
			
 
				                           <span>{{ checkJson[sIndex].allRight + "%" }}</span>
			
 
				                         </div>
			
 
				                       </div>
			
 
				-                      <div v-if="
			
 
				-                            worksDetail[sIndex].eList.length
			
 
				-                          ">
			
 
				+                      <div v-if="worksDetail[sIndex].eList.length">
			
 
				                         <div class="ech" style="margin-left: 23px">
			
 
				                           <img src="../../../assets/icon/pj/score.png" alt="" />
			
 
				                         </div>
			
@@ -1799,7 +1798,7 @@ export default {
 
				   watch: {
			
 
				     typeCheck(newValue, oldValue) {
			
 
				       this.loading = true;
			
 
				-      this.isLoading = true
			
 
				+      this.isLoading = true;
			
 
				       this.tableData = [];
			
 
				       if (newValue) {
			
 
				         this.getWorks1();
			
@@ -1917,7 +1916,7 @@ export default {
 
				           var wordInfo = res.data[12]; //文档作业
			
 
				           var workEvaList = res.data[13];
			
 
				           var workJson = {};
			
 
				-          let checkJson = {}
			
 
				+          let checkJson = {};
			
 
				 
			
 
				           for (var k = 0; k < res.data[0].length; k++) {
			
 
				             this.allWorks = res.data[0][k];
			
@@ -1977,7 +1976,7 @@ export default {
 
				               };
			
 
				               checkJson[stagetask] = {
			
 
				                 stagetask: stagetask,
			
 
				-              }
			
 
				+              };
			
 
				             }
			
 
				             workJson[stagetask].time = res.data[0][k].time;
			
 
				             // for (var i = 0; i < askInfo.length; i++) {
			
@@ -2132,14 +2131,18 @@ export default {
 
				                       isCount += 0;
			
 
				                     }
			
 
				                     for (var q = 0; q < t.radio[p].length; q++) {
			
 
				-                      checkJson[stagetask][p].checkPerson[parseInt(t.radio[p][q])]
			
 
				+                      checkJson[stagetask][p].checkPerson[
			
 
				+                        parseInt(t.radio[p][q])
			
 
				+                      ]
			
 
				                         ? checkJson[stagetask][p].checkPerson[
			
 
				                             parseInt(t.radio[p][q])
			
 
				                           ].push(res.data[0][k].sName)
			
 
				                         : (checkJson[stagetask][p].checkPerson[
			
 
				                             parseInt(t.radio[p][q])
			
 
				                           ] = [res.data[0][k].sName]);
			
 
				-                          checkJson[stagetask][p].checkCount[parseInt(t.radio[p][q])]
			
 
				+                      checkJson[stagetask][p].checkCount[
			
 
				+                        parseInt(t.radio[p][q])
			
 
				+                      ]
			
 
				                         ? checkJson[stagetask][p].checkCount[
			
 
				                             parseInt(t.radio[p][q])
			
 
				                           ]++
			
@@ -2163,7 +2166,7 @@ export default {
 
				                         : (checkJson[stagetask][p].checkPerson[
			
 
				                             parseInt(t.radio[p])
			
 
				                           ] = [res.data[0][k].sName]);
			
 
				-                          checkJson[stagetask][p].checkCount[parseInt(t.radio[p])]
			
 
				+                      checkJson[stagetask][p].checkCount[parseInt(t.radio[p])]
			
 
				                         ? checkJson[stagetask][p].checkCount[
			
 
				                             parseInt(t.radio[p])
			
 
				                           ]++
			
@@ -2393,10 +2396,10 @@ export default {
 
				           //   );
			
 
				           // });
			
 
				           let result = [];
			
 
				-          let checkJsonArray = []
			
 
				+          let checkJsonArray = [];
			
 
				           for (var wi = 0; wi < Object.keys(workJson).length; wi++) {
			
 
				             result.push(workJson[Object.keys(workJson)[wi]]);
			
 
				-            checkJsonArray.push(checkJson[Object.keys(checkJson)[wi]])
			
 
				+            checkJsonArray.push(checkJson[Object.keys(checkJson)[wi]]);
			
 
				           }
			
 
				           var resultNewArray = result.sort(function (x, y) {
			
 
				             // 以stagetask字段为排序依据
			
@@ -2426,7 +2429,7 @@ export default {
 
				           });
			
 
				           result = resultNewArray;
			
 
				           checkJsonArray = checkJsonNewArray;
			
 
				-          this.checkJson = checkJsonArray
			
 
				+          this.checkJson = checkJsonArray;
			
 
				           for (var l = 0; l < b.length; l++) {
			
 
				             if (workEvaList.length > 0) {
			
 
				               for (var p = 0; p < workEvaList.length; p++) {
			
@@ -2652,6 +2655,45 @@ export default {
 
				       }
			
 
				       this.dialogVisible6 = true;
			
 
				     },
			
 
				+    openFile2(f) {
			
 
				+      this.pptImgUrl = f.wpptInfo;
			
 
				+      var fileA = [
			
 
				+        "DOC",
			
 
				+        "DOCX",
			
 
				+        "DOCM",
			
 
				+        "DOTM",
			
 
				+        "DOTX",
			
 
				+        "PPTX",
			
 
				+        "PPSX",
			
 
				+        "PPT",
			
 
				+        "PPS",
			
 
				+        "PPTM",
			
 
				+        "POTM",
			
 
				+        "PPAM",
			
 
				+        "POTX",
			
 
				+        "PPSM",
			
 
				+        "XLSX",
			
 
				+        "XLS",
			
 
				+      ];
			
 
				+      if (
			
 
				+        fileA.indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleUpperCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = false; //word 文件
			
 
				+      } else if (
			
 
				+        "pdf".indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleLowerCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = true; //pdf
			
 
				+      }
			
 
				+      this.dialogVisible6 = true;
			
 
				+    },
			
 
				     //获取班级列表
			
 
				     getClass() {
			
 
				       let params = {
			
@@ -3570,7 +3612,7 @@ export default {
 
				   },
			
 
				   created() {
			
 
				     this.page = 1;
			
 
				-    this.isLoading = true
			
 
				+    this.isLoading = true;
			
 
				     this.getCourseDetail();
			
 
				     this.getClass();
			
 
				     this.getGroup();
			
--- a/src/components/pages/components/worksDetail2GM.vue
+++ b/src/components/pages/components/worksDetail2GM.vue
@@ -185,7 +185,7 @@
 
				                             </div>
			
 
				                           </div>
			
 
				                           <div v-if="worksDetail[sIndex].wpptInfo.length > 0">
			
 
				-                            <el-button class="btnClassGM" type="primary" size="small" @click="openFile(worksDetail[sIndex].wpptInfo[0])">
			
 
				+                            <el-button class="btnClassGM" type="primary" size="small" @click="openFile2(worksDetail[sIndex].wpptInfo[0])">
			
 
				                               查看文档</el-button>
			
 
				                           </div>
			
 
				                         </div>
			
@@ -1082,6 +1082,45 @@ export default {
 
				       this.pptImgUrl = f;
			
 
				       this.dialogVisible6 = true;
			
 
				     },
			
 
				+    openFile2(f) {
			
 
				+      this.pptImgUrl = f.wpptInfo;
			
 
				+      var fileA = [
			
 
				+        "DOC",
			
 
				+        "DOCX",
			
 
				+        "DOCM",
			
 
				+        "DOTM",
			
 
				+        "DOTX",
			
 
				+        "PPTX",
			
 
				+        "PPSX",
			
 
				+        "PPT",
			
 
				+        "PPS",
			
 
				+        "PPTM",
			
 
				+        "POTM",
			
 
				+        "PPAM",
			
 
				+        "POTX",
			
 
				+        "PPSM",
			
 
				+        "XLSX",
			
 
				+        "XLS",
			
 
				+      ];
			
 
				+      if (
			
 
				+        fileA.indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleUpperCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = false; //word 文件
			
 
				+      } else if (
			
 
				+        "pdf".indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleLowerCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = true; //pdf
			
 
				+      }
			
 
				+      this.dialogVisible6 = true;
			
 
				+    },
			
 
				     //获取班级列表
			
 
				     getClass() {
			
 
				       this.isLoading = true;
			
--- a/src/components/pages/components/worksDetail3.vue
+++ b/src/components/pages/components/worksDetail3.vue
@@ -111,7 +111,7 @@
 
				                       <el-button
			
 
				                         type="primary"
			
 
				                         size="small"
			
 
				-                        @click="openFile(worksDetail[sIndex].wpptInfo[0])"
			
 
				+                        @click="openFile2(worksDetail[sIndex].wpptInfo[0])"
			
 
				                         >查看文档
			
 
				                       </el-button>
			
 
				                     </div>
			
@@ -2250,6 +2250,45 @@ export default {
 
				       this.pptImgUrl = f;
			
 
				       this.dialogVisible6 = true;
			
 
				     },
			
 
				+    openFile2(f) {
			
 
				+      this.pptImgUrl = f.wpptInfo;
			
 
				+      var fileA = [
			
 
				+        "DOC",
			
 
				+        "DOCX",
			
 
				+        "DOCM",
			
 
				+        "DOTM",
			
 
				+        "DOTX",
			
 
				+        "PPTX",
			
 
				+        "PPSX",
			
 
				+        "PPT",
			
 
				+        "PPS",
			
 
				+        "PPTM",
			
 
				+        "POTM",
			
 
				+        "PPAM",
			
 
				+        "POTX",
			
 
				+        "PPSM",
			
 
				+        "XLSX",
			
 
				+        "XLS",
			
 
				+      ];
			
 
				+      if (
			
 
				+        fileA.indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleUpperCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = false; //word 文件
			
 
				+      } else if (
			
 
				+        "pdf".indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleLowerCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = true; //pdf
			
 
				+      }
			
 
				+      this.dialogVisible6 = true;
			
 
				+    },
			
 
				     //获取班级列表
			
 
				     getClass() {
			
 
				       let params = {
			
--- a/src/components/pages/components/worksDetail3GM.vue
+++ b/src/components/pages/components/worksDetail3GM.vue
@@ -66,7 +66,7 @@
 
				                       </div>
			
 
				                     </div>
			
 
				                     <div v-if="worksDetail[sIndex].wpptInfo.length > 0">
			
 
				-                      <el-button class="btnClassGM" type="primary" size="small" @click="openFile(worksDetail[sIndex].wpptInfo[0])">查看文档
			
 
				+                      <el-button class="btnClassGM" type="primary" size="small" @click="openFile2(worksDetail[sIndex].wpptInfo[0])">查看文档
			
 
				                       </el-button>
			
 
				                     </div>
			
 
				                   </div>
			
@@ -932,6 +932,45 @@ export default {
 
				       this.pptImgUrl = f;
			
 
				       this.dialogVisible6 = true;
			
 
				     },
			
 
				+    openFile2(f) {
			
 
				+      this.pptImgUrl = f.wpptInfo;
			
 
				+      var fileA = [
			
 
				+        "DOC",
			
 
				+        "DOCX",
			
 
				+        "DOCM",
			
 
				+        "DOTM",
			
 
				+        "DOTX",
			
 
				+        "PPTX",
			
 
				+        "PPSX",
			
 
				+        "PPT",
			
 
				+        "PPS",
			
 
				+        "PPTM",
			
 
				+        "POTM",
			
 
				+        "PPAM",
			
 
				+        "POTX",
			
 
				+        "PPSM",
			
 
				+        "XLSX",
			
 
				+        "XLS",
			
 
				+      ];
			
 
				+      if (
			
 
				+        fileA.indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleUpperCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = false; //word 文件
			
 
				+      } else if (
			
 
				+        "pdf".indexOf(
			
 
				+          this.pptImgUrl
			
 
				+            .split(".")
			
 
				+            [this.pptImgUrl.split(".").length - 1].toLocaleLowerCase()
			
 
				+        ) != -1
			
 
				+      ) {
			
 
				+        this.showPDF = true; //pdf
			
 
				+      }
			
 
				+      this.dialogVisible6 = true;
			
 
				+    },
			
 
				     //获取班级列表
			
 
				     getClass() {
			
 
				       this.isLoading = true;
			
--- a/src/components/pages/course.vue
+++ b/src/components/pages/course.vue
@@ -566,13 +566,13 @@ export default {
 
				       //     "&userid=" +
			
 
				       //     this.userid
			
 
				       // );
			
 
				-      window.parent.postMessage({ cid: cid, screenType: "2" }, "*");
			
 
				+      top.postMessage({ cid: cid, screenType: "2" }, "*");
			
 
				     },
			
 
				     get(item) {
			
 
				-      window.parent.postMessage({ cid: item.courseId, screenType: "3" }, "*");
			
 
				+      top.postMessage({ cid: item.courseId, screenType: "3" }, "*");
			
 
				     },
			
 
				     getNT(cid) {
			
 
				-      window.parent.postMessage({ cid: cid, screenType: "3NT" }, "*");
			
 
				+      top.postMessage({ cid: cid, screenType: "3NT" }, "*");
			
 
				     },
			
 
				     handle_remove(file, fileList) {
			
 
				       var _tmp = this.fileList;
			
@@ -1151,6 +1151,14 @@ export default {
 
				     // this.selectType();
			
 
				     this.selectAllType();
			
 
				     this.getCourse();
			
 
				+    let _this = this
			
 
				+    window.goToCourse3 = function(){
			
 
				+      _this.goToCourse3()
			
 
				+    }
			
 
				+
			
 
				+    window.goToCourse = function(){
			
 
				+      _this.goToCourse()
			
 
				+    }
			
 
				   },
			
 
				 };
			
 
				 </script>
			
--- a/src/components/pages/course/index.vue
+++ b/src/components/pages/course/index.vue
@@ -0,0 +1,1319 @@
 
				+<template>
			
 
				+  <div class="pb_content">
			
 
				+    <div class="pb_content_body" style="width: 100%;margin: 0;">
			
 
				+      <!-- <div class="student_head">
			
 
				+        <el-carousel trigger="click" style="width: 100%; height: 100%">
			
 
				+          <el-carousel-item v-for="item in bannerList" :key="item.id">
			
 
				+            <img class="imgS" :src="item.poster" alt="" />
			
 
				+          </el-carousel-item>
			
 
				+        </el-carousel>
			
 
				+      </div> -->
			
 
				+      <div class="reBox">
			
 
				+        <div class="reTop">
			
 
				+          <div>课程</div>
			
 
				+          <div>
			
 
				+            <div class="search" @click="search">
			
 
				+              <img src="../../../assets/icon/search.png" alt="" />
			
 
				+            </div>
			
 
				+            <input class="sInput" type="text" placeholder="请输入关键字" v-model="sCourse" @keyup.enter="search"/>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+        <div class="pType_box all_choose"  v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'">
			
 
				+          <span>类型</span>
			
 
				+          <el-radio-group v-model="pTypeCheckName" style="display: flex; align-items: center">
			
 
				+            <div class="all_choose" style="width: 100px" v-for="(item, index) in CourseType3" :key="index">
			
 
				+              <el-radio :label="item.name" @click.native.prevent="CourseType2Click(item.name)">{{
			
 
				+                item.name
			
 
				+              }}</el-radio>
			
 
				+            </div>
			
 
				+          </el-radio-group>
			
 
				+        </div>
			
 
				+        <div class="choose">
			
 
				+          <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index"
			
 
				+            :style="{ margin: !CourseTypeJson[item.id].length && 0 }">
			
 
				+            <span v-if="CourseTypeJson[item.id].length &&
			
 
				+                                (oid == '69893dca-1d47-11ed-8c78-005056b86db5'
			
 
				+                                  ? pTypeCheck.indexOf(item.id) != -1
			
 
				+                                  : true)"><span>{{ item.name }}</span></span>
			
 
				+            <div class="typeCss" v-if="CourseTypeJson[item.id].length  &&
			
 
				+                                (oid == '69893dca-1d47-11ed-8c78-005056b86db5'
			
 
				+                                  ? pTypeCheck.indexOf(item.id) != -1
			
 
				+                                  : true)">
			
 
				+              <div class="cName" @click="getCourse(item.name, '', item.id, 1)"
			
 
				+                :class="typeE.indexOf(item.id) != -1 ? 'isCType' : ''">
			
 
				+                全部
			
 
				+              </div>
			
 
				+              <div v-for="(item1, index1) in CourseTypeJson[item.id]" :key="index + '-' + index1" :label="item1.id"
			
 
				+                @click="getCourse(item.name, item.id, item1.id, 2)">
			
 
				+                <div class="cName" :class="
			
 
				+                  typea == item1.id || typeb == item1.id || typed == item1.id
			
 
				+                    ? 'isCType'
			
 
				+                    : ''
			
 
				+                ">
			
 
				+                  {{ item1.name }}
			
 
				+                </div>
			
 
				+              </div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+          <div class="all_choose" v-if="role == '1'">
			
 
				+            <span><span>所有者</span></span>
			
 
				+            <div class="typeCss">
			
 
				+              <div class="cName" :class="groupA == '4' ? 'isCType' : ''" @click="groupA = '4'; search();">
			
 
				+                全部
			
 
				+              </div>
			
 
				+              <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2'; search();">
			
 
				+                我创建的
			
 
				+              </div>
			
 
				+              <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
			
 
				+                我协同的
			
 
				+              </div>
			
 
				+              <!-- <div class="cName" :class="groupA == '1' ? 'isCType' : ''" @click="groupA = '1'; search();">
			
 
				+                他人培训
			
 
				+              </div> -->
			
 
				+            </div>
			
 
				+          </div>
			
 
				+          <div class="all_choose" v-else>
			
 
				+            <span><span>所有者</span></span>
			
 
				+            <div class="typeCss">
			
 
				+              <div class="cName" :class="groupA == '0' ? 'isCType' : ''" @click="groupA = '0'; search();">
			
 
				+                全部
			
 
				+              </div>
			
 
				+              <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2'; search();">
			
 
				+                我创建的
			
 
				+              </div>
			
 
				+              <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
			
 
				+                我协同的
			
 
				+              </div>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <div class="body_student" v-loading="loading">
			
 
				+        <!-- <div class="typeCheck">
			
 
				+          <el-switch v-model="typeCheck"></el-switch><span>分类显示</span>
			
 
				+        </div> -->
			
 
				+        <div>
			
 
				+          <div class="main_box">
			
 
				+            <div style="display:flex;flex-wrap:wrap" v-if="!typeCheck">
			
 
				+              <div class="box_course" v-for="(item, index) in zoneClass" :key="index"  @click="
			
 
				+                  gotoCourse(item)
			
 
				+                ">
			
 
				+                <div class="wheel">
			
 
				+                  <img :src="
			
 
				+                    item.cover
			
 
				+                      ? JSON.parse(item.cover)[0].url
			
 
				+                      : require('../../../assets/wheel.png')
			
 
				+                  " alt="" />
			
 
				+                </div>
			
 
				+                <div class="middle_white">
			
 
				+                  <div class="textOverflow">{{ item.title }}</div>
			
 
				+                  <div class="nameAndLength">
			
 
				+                    <el-tooltip class="typeN" effect="light" :content="item.typename" placement="top">
			
 
				+                      <div>{{ item.typename }}</div>
			
 
				+                    </el-tooltip>
			
 
				+
			
 
				+                    <div style="min-width: fit-content;">{{ JSON.parse(item.chapters).length }}阶段</div>
			
 
				+                  </div>
			
 
				+                  <div class="school_box">
			
 
				+                    <el-tooltip effect="light" :content="item.school" placement="top">
			
 
				+                      <div class="school">
			
 
				+                        {{ item.school }}
			
 
				+                      </div>
			
 
				+                    </el-tooltip>
			
 
				+                    <div style="color: #b4b4b4">{{ item.utime }}</div>
			
 
				+                  </div>
			
 
				+                </div>
			
 
				+                <div class="now_study" @click="
			
 
				+                  goTo(
			
 
				+                    '/courseDetail?courseId=' +
			
 
				+                    item.courseId +
			
 
				+                    '&userid=' +
			
 
				+                    userid +
			
 
				+                    '&oid=' +
			
 
				+                    oid +
			
 
				+                    '&org=' +
			
 
				+                    org +
			
 
				+                    '&cid=' +
			
 
				+                    classId +
			
 
				+                    '&tType=' +
			
 
				+                    tType +
			
 
				+                    '&screenType=' +
			
 
				+                    screenType
			
 
				+                  )
			
 
				+                ">
			
 
				+                  立即学习
			
 
				+                </div>
			
 
				+              </div>
			
 
				+            </div>
			
 
				+            <div v-else>
			
 
				+              <div class="FirstTypeBox" v-for="(type, tindex) in CourseType2" :key="tindex">
			
 
				+                <div class="title">{{ type.name }}</div>
			
 
				+                <div style="display: flex;flex-flow: wrap;margin-top: 20px;">
			
 
				+                  <div class="box_course" v-for="(item, index) in type.course" :key="tindex + '-' + index" @click="gotoCourse(item)">
			
 
				+                    <div class="wheel">
			
 
				+                      <img :src="
			
 
				+                        item.cover
			
 
				+                          ? JSON.parse(item.cover)[0].url
			
 
				+                          : require('../../../assets/wheel.png')
			
 
				+                      " alt="" />
			
 
				+                    </div>
			
 
				+                    <div class="middle_white">
			
 
				+                      <div class="textOverflow">{{ item.title }}</div>
			
 
				+                      <div class="nameAndLength">
			
 
				+                        <el-tooltip class="typeN" effect="light" :content="item.typename" placement="top">
			
 
				+                          <div>{{ item.typename }}</div>
			
 
				+                        </el-tooltip>
			
 
				+
			
 
				+                        <div style="min-width: fit-content;">{{ JSON.parse(item.chapters).length }}阶段</div>
			
 
				+                      </div>
			
 
				+                      <div class="school_box">
			
 
				+                        <el-tooltip effect="light" :content="item.school" placement="top">
			
 
				+                          <div class="school">
			
 
				+                            {{ item.school }}
			
 
				+                          </div>
			
 
				+                        </el-tooltip>
			
 
				+                        <div style="color: #b4b4b4">{{ item.utime }}</div>
			
 
				+                      </div>
			
 
				+                    </div>
			
 
				+                    <div class="now_study" @click="
			
 
				+                      goTo(
			
 
				+                        '/courseDetail?courseId=' +
			
 
				+                        item.courseId +
			
 
				+                        '&userid=' +
			
 
				+                        userid +
			
 
				+                        '&oid=' +
			
 
				+                        oid +
			
 
				+                        '&org=' +
			
 
				+                        org +
			
 
				+                        '&cid=' +
			
 
				+                        classId +
			
 
				+                        '&tType=' +
			
 
				+                        tType +
			
 
				+                        '&screenType=' +
			
 
				+                        screenType
			
 
				+                      )
			
 
				+                    ">
			
 
				+                      立即学习
			
 
				+                    </div>
			
 
				+                  </div>
			
 
				+                </div>
			
 
				+              </div>
			
 
				+            </div>
			
 
				+            <div class="course_empty" v-if="zoneClass.length == 0">
			
 
				+              暂无课程
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+        <div class="student_page" style="margin: 15px 0 0" v-if="zoneClass.length > 0 && !typeCheck">
			
 
				+          <el-pagination background layout="prev, pager, next" :page-size="pageSize" :total="total" v-if="page"
			
 
				+            @current-change="handleCurrentChange">
			
 
				+          </el-pagination>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+  </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+  data() {
			
 
				+    return {
			
 
				+      zoneList: [],
			
 
				+      zoneClass: [],
			
 
				+      page: 1,
			
 
				+      total: 0,
			
 
				+      pageSize: 20, //每页显示记录数(10)。必须设置为正确的值，以便生成href
			
 
				+      isListAjax: false,
			
 
				+      zoneListId: "",
			
 
				+      bannerList: [],
			
 
				+      userid: this.$route.query.userid,
			
 
				+      oid: this.$route.query.oid,
			
 
				+      classId: this.$route.query.cid,
			
 
				+      tType: this.$route.query.tType,
			
 
				+      org: this.$route.query.org,
			
 
				+      role: this.$route.query.role,
			
 
				+      screenType: 4, //this.$route.query.screenType
			
 
				+      CourseType: [],
			
 
				+      CourseType2: [],
			
 
				+      CourseTypeJson: {},
			
 
				+      courseTypeId: {},
			
 
				+      sCourse: "",
			
 
				+      isCType: "",
			
 
				+      typea: "",
			
 
				+      typeb: "",
			
 
				+      typed: "",
			
 
				+      typeE: [],
			
 
				+      loading: "",
			
 
				+      typeCheck: false,
			
 
				+      CourseType3: [],
			
 
				+      pTypeCheck:[],
			
 
				+      pTypeCheckName: [],
			
 
				+      groupA: "0",
			
 
				+    };
			
 
				+  },
			
 
				+  watch: {
			
 
				+    typeCheck(newValue, oldValue) {
			
 
				+      this.loading = true
			
 
				+      if (newValue) {
			
 
				+        this.selectAll()
			
 
				+      } else {
			
 
				+        this.page = 1
			
 
				+        this.selectAll2()
			
 
				+      }
			
 
				+    }
			
 
				+  },
			
 
				+  methods: {
			
 
				+    search(){
			
 
				+      if(this.typeCheck){
			
 
				+        this.selectAll()
			
 
				+      }else{
			
 
				+        this.page = 1
			
 
				+        this.selectAll2()
			
 
				+      }
			
 
				+      this.$forceUpdate();
			
 
				+    },
			
 
				+    goTo(path) {
			
 
				+      this.$router.push(path);
			
 
				+    },
			
 
				+    //获取专区下的课程
			
 
				+    getZoneClass(zid) {
			
 
				+      this.isListAjax = true;
			
 
				+      // const loading = this.openLoading(document.querySelector(".main_box"));
			
 
				+      let params = {
			
 
				+        bid: zid,
			
 
				+        oid: this.oid,
			
 
				+        page: this.page,
			
 
				+      };
			
 
				+      this.ajax
			
 
				+        .get(this.$store.state.api + "getZoneClassStudent", params)
			
 
				+        .then((res) => {
			
 
				+          // loading.close();
			
 
				+          this.isListAjax = false;
			
 
				+          this.zoneClass = res.data[0];
			
 
				+          this.total = res.data[0].length ? res.data[0][0].num : 0;
			
 
				+        })
			
 
				+        .catch((err) => {
			
 
				+          console.error(err);
			
 
				+        });
			
 
				+    },
			
 
				+    getCourse(typeName, ftypeId, typeid, type) {
			
 
				+      this.page = 1;
			
 
				+      this.zoneClass = [];
			
 
				+      if (typeid == "34628934-d02f-11ec-8c78-005056b86db5" || ftypeId == '34628934-d02f-11ec-8c78-005056b86db5' || typeid == "34628934-d02f-11ec-8c78-005056b86ac5" || ftypeId == "34628934-d02f-11ec-8c78-005056b86ac5") {
			
 
				+        if (type == 1) {
			
 
				+          if (this.typeE.indexOf(typeid) != -1) {
			
 
				+             if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              return
			
 
				+            }else{
			
 
				+              this.typeE.splice(this.typeE.indexOf(typeid), 1);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeE.push(typeid);
			
 
				+            if (this.typea != "") {
			
 
				+              this.typea = "";
			
 
				+            }
			
 
				+          }
			
 
				+        } else {
			
 
				+          if (this.typea == typeid) {
			
 
				+            this.typea = "";
			
 
				+            if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              this.typeE.push(ftypeId);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typea = typeid;
			
 
				+            if (this.typeE.indexOf(ftypeId) != -1) {
			
 
				+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
			
 
				+            }
			
 
				+          }
			
 
				+        }
			
 
				+      } else if (typeName == "专栏") {
			
 
				+        if (type == 1) {
			
 
				+          if (this.typeE.indexOf(typeid) != -1) {
			
 
				+             if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              return
			
 
				+            }else{
			
 
				+              this.typeE.splice(this.typeE.indexOf(typeid), 1);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeE.push(typeid);
			
 
				+            if (this.typeb != "") {
			
 
				+              this.typeb = "";
			
 
				+            }
			
 
				+          }
			
 
				+        } else {
			
 
				+          if (this.typeb == typeid) {
			
 
				+            this.typeb = "";
			
 
				+            if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              this.typeE.push(ftypeId);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeb = typeid;
			
 
				+            if (this.typeE.indexOf(ftypeId) != -1) {
			
 
				+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
			
 
				+            }
			
 
				+          }
			
 
				+        }
			
 
				+      } else if (typeName == "栏目") {
			
 
				+        if (type == 1) {
			
 
				+          if (this.typeE.indexOf(typeid) != -1) {
			
 
				+             if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              return
			
 
				+            }else{
			
 
				+              this.typeE.splice(this.typeE.indexOf(typeid), 1);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeE.push(typeid);
			
 
				+            if (this.typeb != "") {
			
 
				+              this.typeb = "";
			
 
				+            }
			
 
				+          }
			
 
				+        } else {
			
 
				+          if (this.typeb == typeid) {
			
 
				+            this.typeb = "";
			
 
				+            if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              this.typeE.push(ftypeId);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeb = typeid;
			
 
				+            if (this.typeE.indexOf(ftypeId) != -1) {
			
 
				+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
			
 
				+            }
			
 
				+          }
			
 
				+        }
			
 
				+      } else if (typeName == "主题") {
			
 
				+        if (type == 1) {
			
 
				+          if (this.typeE.indexOf(typeid) != -1) {
			
 
				+             if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              return
			
 
				+            }else{
			
 
				+              this.typeE.splice(this.typeE.indexOf(typeid), 1);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeE.push(typeid);
			
 
				+            if (this.typeb != "") {
			
 
				+              this.typeb = "";
			
 
				+            }
			
 
				+          }
			
 
				+        } else {
			
 
				+          if (this.typeb == typeid) {
			
 
				+            this.typeb = "";
			
 
				+            if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              this.typeE.push(ftypeId);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeb = typeid;
			
 
				+            if (this.typeE.indexOf(ftypeId) != -1) {
			
 
				+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
			
 
				+            }
			
 
				+          }
			
 
				+        }
			
 
				+      } else if (typeName == "学院") {
			
 
				+        if (type == 1) {
			
 
				+          if (this.typeE.indexOf(typeid) != -1) {
			
 
				+             if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              return
			
 
				+            }else{
			
 
				+              this.typeE.splice(this.typeE.indexOf(typeid), 1);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeE.push(typeid);
			
 
				+            if (this.typeb != "") {
			
 
				+              this.typeb = "";
			
 
				+            }
			
 
				+          }
			
 
				+        } else {
			
 
				+          if (this.typeb == typeid) {
			
 
				+            this.typeb = "";
			
 
				+            if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              this.typeE.push(ftypeId);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeb = typeid;
			
 
				+            if (this.typeE.indexOf(ftypeId) != -1) {
			
 
				+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
			
 
				+            }
			
 
				+          }
			
 
				+        }
			
 
				+      } else if (typeid == "34629907-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629907-d02f-11ec-8c78-005056b86db5' || typeid == "34629907-d02f-11ec-8c78-005056b86ac5" || ftypeId == "34629907-d02f-11ec-8c78-005056b86ac5") {
			
 
				+        if (type == 1) {
			
 
				+          if (this.typeE.indexOf(typeid) != -1) {
			
 
				+             if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              return
			
 
				+            }else{
			
 
				+              this.typeE.splice(this.typeE.indexOf(typeid), 1);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typeE.push(typeid);
			
 
				+            if (this.typed != "") {
			
 
				+              this.typed = "";
			
 
				+            }
			
 
				+          }
			
 
				+        } else {
			
 
				+          if (this.typed == typeid) {
			
 
				+            this.typed = "";
			
 
				+            if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
			
 
				+              this.typeE.push(ftypeId);
			
 
				+            }
			
 
				+          } else {
			
 
				+            this.typed = typeid;
			
 
				+            if (this.typeE.indexOf(ftypeId) != -1) {
			
 
				+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
			
 
				+            }
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+      this.loading = true;
			
 
				+      if (this.typeCheck) {
			
 
				+        this.selectAll();
			
 
				+      } else {
			
 
				+        this.selectAll2();
			
 
				+      }
			
 
				+    },
			
 
				+    CourseType2Click(val){
			
 
				+      this.pTypeCheck = [];
			
 
				+      this.typeE = []
			
 
				+      if(val === this.pTypeCheckName){
			
 
				+        this.pTypeCheckName = ''
			
 
				+      }else{
			
 
				+        this.pTypeCheckName = val
			
 
				+        for (var i = 0; i < this.CourseType3.length; i++) {
			
 
				+          let typeA = this.CourseType3[i];
			
 
				+          if (val.indexOf(typeA.name) != -1) {
			
 
				+            this.pTypeCheck.push(...typeA.id);
			
 
				+            this.typeE = [...typeA.id]
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+      
			
 
				+      this.typea = ""
			
 
				+      this.typeb = ""
			
 
				+      this.typed = ""
			
 
				+      this.loading = true;
			
 
				+      if (this.typeCheck) {
			
 
				+        this.selectAll();
			
 
				+      } else {
			
 
				+        this.selectAll2();
			
 
				+      }
			
 
				+    },
			
 
				+    arrayToArray(arrayo, arrayt) {
			
 
				+      let array1 = arrayo;
			
 
				+      let array2 = arrayt;
			
 
				+
			
 
				+      let commonElements = [];
			
 
				+
			
 
				+      for (let i = 0; i < array1.length; i++) {
			
 
				+        for (let j = 0; j < array2.length; j++) {
			
 
				+          if (array1[i] === array2[j]) {
			
 
				+            commonElements.push(array1[i]);
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+      return commonElements;
			
 
				+    },
			
 
				+    selectAll() {
			
 
				+      this.zoneListId = 0;
			
 
				+      this.isListAjax = true;
			
 
				+
			
 
				+      let params = {
			
 
				+        uid: this.userid,
			
 
				+        oid: this.oid,
			
 
				+        typea: this.typea != undefined ? this.typea : "",
			
 
				+        typeb: this.typeb != undefined ? this.typeb : "",
			
 
				+        typec: "",
			
 
				+        typed: this.typed != undefined ? this.typed : "",
			
 
				+        typeE: this.typeE.join(","),
			
 
				+        // typeE: "",
			
 
				+        cu: "",
			
 
				+        cn: this.sCourse,
			
 
				+        classid: this.classId,
			
 
				+        org: this.org,
			
 
				+        page: this.page,
			
 
				+      };
			
 
				+      this.ajax
			
 
				+        .get(this.$store.state.api + "selectTypeCourse2Mode", params)
			
 
				+        .then((res) => {
			
 
				+          this.loading = false;
			
 
				+          this.isListAjax = false;
			
 
				+          this.zoneClass = res.data[0];
			
 
				+          // this.total = res.data[0].length ? res.data[0][0].num : 0;
			
 
				+          let CourseType2 = JSON.parse(JSON.stringify(this.CourseType[0]))
			
 
				+          if(this.oid == "69893dca-1d47-11ed-8c78-005056b86db5"){
			
 
				+            if(this.pTypeCheckName.length){
			
 
				+              CourseType2 = this.CourseType3.filter(el => {
			
 
				+                return el.name == this.pTypeCheckName
			
 
				+              })
			
 
				+            }else{
			
 
				+              CourseType2 = JSON.parse(JSON.stringify(this.CourseType3))
			
 
				+            }
			
 
				+          }
			
 
				+          for (var i = 0; i < CourseType2.length; i++) {
			
 
				+            CourseType2[i].course = []
			
 
				+            for (var j = 0; j < res.data[0].length; j++) {
			
 
				+              // if (res.data[0][j].pid && res.data[0][j].pid.indexOf(CourseType2[i].id) != -1) {
			
 
				+              //   CourseType2[i].course.push(res.data[0][j])
			
 
				+              // }
			
 
				+              let pid = CourseType2[i].id
			
 
				+              if(typeof pid != "object") pid = pid.split(",")
			
 
				+              if(res.data[0][j].pid && this.arrayToArray(pid,res.data[0][j].pid.split(",")).length){
			
 
				+                CourseType2[i].course.push(res.data[0][j])
			
 
				+              }
			
 
				+            }
			
 
				+          }
			
 
				+          let noTypeCourse = []
			
 
				+          for (var j = 0; j < res.data[0].length; j++) {
			
 
				+            if (!res.data[0][j].pid) {
			
 
				+              noTypeCourse.push(res.data[0][j])
			
 
				+            }
			
 
				+          }
			
 
				+          if (noTypeCourse.length > 0 && !this.pTypeCheckName.length) {
			
 
				+            CourseType2.push({
			
 
				+              course: noTypeCourse,
			
 
				+              name: '其他'
			
 
				+            })
			
 
				+          }
			
 
				+          CourseType2 = CourseType2.filter(item => {
			
 
				+            return item.course.length > 0;
			
 
				+          })
			
 
				+          this.CourseType2 = CourseType2
			
 
				+          // this.selectType({
			
 
				+          //   data: [res.data[1], res.data[2], res.data[3], res.data[4]],
			
 
				+          // });
			
 
				+          this.getBanner({
			
 
				+            data: [res.data[6], res.data[5], res.data[7]],
			
 
				+          });
			
 
				+        })
			
 
				+        .catch((err) => {
			
 
				+          console.error(err);
			
 
				+        });
			
 
				+    },
			
 
				+    selectAll2() {
			
 
				+      this.zoneListId = 0;
			
 
				+      this.isListAjax = true;
			
 
				+
			
 
				+      let params = {
			
 
				+        type: this.groupA,
			
 
				+        uid: this.userid,
			
 
				+        oid: this.oid,
			
 
				+        typea: this.typea != undefined ? this.typea : "",
			
 
				+        typeb: this.typeb != undefined ? this.typeb : "",
			
 
				+        typec: "",
			
 
				+        typed: this.typed != undefined ? this.typed : "",
			
 
				+        typeE: this.typeE.join(","),
			
 
				+        // typeE: "",
			
 
				+        cu: "",
			
 
				+        cn: this.sCourse,
			
 
				+        classid: this.classId,
			
 
				+        org: this.org,
			
 
				+        page: this.page,
			
 
				+        pageSize:this.pageSize
			
 
				+      };
			
 
				+      this.ajax
			
 
				+        .get(this.$store.state.api + "selectCourseNew2", params)
			
 
				+        .then((res) => {
			
 
				+          this.loading = false;
			
 
				+          this.isListAjax = false;
			
 
				+          this.zoneClass = res.data[0];
			
 
				+          this.total = res.data[0].length ? res.data[0][0].num : 0;
			
 
				+          let CourseType2 = []
			
 
				+          // this.selectType({
			
 
				+          //   data: [res.data[1], res.data[2], res.data[3], res.data[4]],
			
 
				+          // });
			
 
				+          this.getBanner({
			
 
				+            data: [res.data[6], res.data[5], res.data[7]],
			
 
				+          });
			
 
				+        })
			
 
				+        .catch((err) => {
			
 
				+          console.error(err);
			
 
				+        });
			
 
				+    },
			
 
				+    checkZone(id) {
			
 
				+      this.page = 1;
			
 
				+      this.zoneListId = id;
			
 
				+      this.getZoneClass(id);
			
 
				+    },
			
 
				+    // handleCurrentChange(val) {
			
 
				+    //   this.page = val;
			
 
				+    //   this.getZoneClass(this.zoneListId);
			
 
				+    // },
			
 
				+    handleCurrentChange(val) {
			
 
				+      this.loading = true;
			
 
				+      this.page = val;
			
 
				+      this.selectAll2();
			
 
				+    },
			
 
				+    //获取banner
			
 
				+    getBanner(res) {
			
 
				+      // var a = false;
			
 
				+      // if (this.org == "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d") {
			
 
				+      //   a = true;
			
 
				+      // }
			
 
				+      // let params = {
			
 
				+      //   oid: this.org,
			
 
				+      // };
			
 
				+      // this.ajax
			
 
				+      //   .get(this.$store.state.api + "selectBannerByOid", params)
			
 
				+      //   .then((res) => {
			
 
				+      if (res.data[0].length > 0) {
			
 
				+        this.bannerList = res.data[0];
			
 
				+      } else {
			
 
				+        this.getBannerByOid({
			
 
				+          data: [res.data[1], res.data[2]],
			
 
				+        });
			
 
				+      }
			
 
				+      // })
			
 
				+      // .catch((err) => {
			
 
				+      //   console.error(err);
			
 
				+      // });
			
 
				+    },
			
 
				+    getBannerByOid(res) {
			
 
				+      // let params = {
			
 
				+      //   oid: this.oid,
			
 
				+      // };
			
 
				+      // this.ajax
			
 
				+      //   .get(this.$store.state.api + "selectBannerByOid", params)
			
 
				+      //   .then((res) => {
			
 
				+      if (res.data[0].length > 0) {
			
 
				+        this.bannerList = res.data[0];
			
 
				+      } else {
			
 
				+        this.getOldBanner({
			
 
				+          data: [res.data[1]],
			
 
				+        });
			
 
				+      }
			
 
				+      // })
			
 
				+      // .catch((err) => {
			
 
				+      //   console.error(err);
			
 
				+      // });
			
 
				+    },
			
 
				+    getOldBanner(res) {
			
 
				+      // this.ajax
			
 
				+      //   .get(this.$store.state.api + "getBanner", "")
			
 
				+      //   .then((res) => {
			
 
				+      this.bannerList = res.data[0];
			
 
				+      // })
			
 
				+      // .catch((err) => {
			
 
				+      //   console.error(err);
			
 
				+      // });
			
 
				+    },
			
 
				+    selectAllType() {
			
 
				+      let params = {
			
 
				+        org: this.org && this.org != "" ? this.org : "",
			
 
				+        oid: this.oid && this.oid != "" ? this.oid : "",
			
 
				+      };
			
 
				+      this.ajax
			
 
				+        .get(this.$store.state.api + "selectAllType", params)
			
 
				+        .then((res) => {
			
 
				+          if(this.oid == "69893dca-1d47-11ed-8c78-005056b86db5"){
			
 
				+            res.data[0] = [...res.data[0],...res.data[4]]
			
 
				+          }
			
 
				+          this.CourseTypeJson = {};
			
 
				+          this.CourseType = res.data;
			
 
				+          this.CourseType3 = [
			
 
				+            { name: "智见课程", id: [] },
			
 
				+            { name: "智行课程", id: [] },
			
 
				+            { name: "智创课程", id: [] },
			
 
				+          ];
			
 
				+
			
 
				+          for (var cti = 0; cti < res.data[0].length; cti++) {
			
 
				+            if (
			
 
				+              res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" ||
			
 
				+              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"
			
 
				+            ) {
			
 
				+              this.CourseType3[0].id.push(res.data[0][cti].id);
			
 
				+            }else if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5" ||
			
 
				+              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
			
 
				+              this.CourseType3[1].id.push(res.data[0][cti].id);
			
 
				+            } else if (res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5") {
			
 
				+              this.CourseType3[2].id.push(res.data[0][cti].id);
			
 
				+            }
			
 
				+            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5"){
			
 
				+              res.data[0][cti].name = "年级";
			
 
				+            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
			
 
				+              res.data[0][cti].name = "学科";
			
 
				+            }else if(res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5"){
			
 
				+              res.data[0][cti].name = "主题";
			
 
				+            }
			
 
				+          }
			
 
				+          for (var i = 0; i < res.data[0].length; i++) {
			
 
				+            if (!this.cid) {
			
 
				+              this.courseTypeId[res.data[0][i].id] = "";
			
 
				+            }
			
 
				+            if (!this.CourseTypeJson[res.data[0][i].id]) {
			
 
				+              this.CourseTypeJson[res.data[0][i].id] = [];
			
 
				+            }
			
 
				+            if (this.oid == "69893dca-1d47-11ed-8c78-005056b86db5") {
			
 
				+              if (res.data[0][i].name == "栏目") {
			
 
				+                this.CourseType[0][i].name = "主题";
			
 
				+              }
			
 
				+            }
			
 
				+
			
 
				+            if (res.data[2].length == 0 && res.data[3].length == 0) {
			
 
				+              for (var j = 0; j < res.data[1].length; j++) {
			
 
				+                if (res.data[0][i].id == res.data[1][j].pid) {
			
 
				+                  if (!this.CourseTypeJson[res.data[0][i].id]) {
			
 
				+                    this.CourseTypeJson[res.data[0][i].id] = [];
			
 
				+                  }
			
 
				+                  this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
			
 
				+                }
			
 
				+              }
			
 
				+            } else {
			
 
				+              if (res.data[2].length > 0) {
			
 
				+                for (var j = 0; j < res.data[2].length; j++) {
			
 
				+                  if (res.data[0][i].id == res.data[2][j].pid) {
			
 
				+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[2][j]); // 去除公共分类
			
 
				+                  }
			
 
				+                }
			
 
				+              }
			
 
				+              if (res.data[3].length > 0) {
			
 
				+                for (var j = 0; j < res.data[3].length; j++) {
			
 
				+                  if (res.data[0][i].id == res.data[3][j].pid) {
			
 
				+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[3][j]); // 去除公共分类
			
 
				+                  }
			
 
				+                }
			
 
				+              }
			
 
				+            }
			
 
				+          }
			
 
				+          if (this.typeCheck) {
			
 
				+            this.selectAll();
			
 
				+          } else {
			
 
				+            this.selectAll2();
			
 
				+          }
			
 
				+          this.$forceUpdate();
			
 
				+        })
			
 
				+        .catch((err) => {
			
 
				+          console.error(err);
			
 
				+        });
			
 
				+    },
			
 
				+    selectType(res) {
			
 
				+      // this.ajax
			
 
				+      //   .get(this.$store.state.api + "selectType")
			
 
				+      //   .then((res) => {
			
 
				+      this.CourseTypeJson = {};
			
 
				+      this.CourseType = res.data;
			
 
				+      for (var i = 0; i < res.data[0].length; i++) {
			
 
				+        if (!this.cid) {
			
 
				+          this.courseTypeId[res.data[0][i].id] = "";
			
 
				+        }
			
 
				+        if (this.oid == "69893dca-1d47-11ed-8c78-005056b86db5") {
			
 
				+          if (res.data[0][i].name == "栏目") {
			
 
				+            this.CourseType[0][i].name = "主题";
			
 
				+          }
			
 
				+        }
			
 
				+        for (var j = 0; j < res.data[1].length; j++) {
			
 
				+          if (res.data[0][i].id == res.data[1][j].pid) {
			
 
				+            if (!this.CourseTypeJson[res.data[0][i].id]) {
			
 
				+              this.CourseTypeJson[res.data[0][i].id] = [];
			
 
				+            }
			
 
				+            this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+      this.selectTypeByOid({ data: [res.data[0], res.data[2]] });
			
 
				+      this.selectTypeByOrg({ data: [res.data[0], res.data[3]] });
			
 
				+      // })
			
 
				+      // .catch((err) => {
			
 
				+      //   console.error(err);
			
 
				+      // });
			
 
				+    },
			
 
				+    selectTypeByOid(res) {
			
 
				+      // let params = {
			
 
				+      //   oid: this.oid,
			
 
				+      // };
			
 
				+      // this.ajax
			
 
				+      //   .get(this.$store.state.api + "selectTypeByOid", params)
			
 
				+      //   .then((res) => {
			
 
				+      for (var i = 0; i < res.data[0].length; i++) {
			
 
				+        for (var j = 0; j < res.data[1].length; j++) {
			
 
				+          if (res.data[0][i].id == res.data[1][j].pid) {
			
 
				+            if (!this.CourseTypeJson[res.data[0][i].id]) {
			
 
				+              this.CourseTypeJson[res.data[0][i].id] = [];
			
 
				+            }
			
 
				+            this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]);
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+      this.$forceUpdate();
			
 
				+      // })
			
 
				+      // .catch((err) => {
			
 
				+      //   console.error(err);
			
 
				+      // });
			
 
				+    },
			
 
				+    selectTypeByOrg(res) {
			
 
				+      // let params = {
			
 
				+      //   oid: this.org,
			
 
				+      // };
			
 
				+      // this.ajax
			
 
				+      //   .get(this.$store.state.api + "selectTypeByOrg", params)
			
 
				+      //   .then((res) => {
			
 
				+      for (var i = 0; i < res.data[0].length; i++) {
			
 
				+        for (var j = 0; j < res.data[1].length; j++) {
			
 
				+          if (res.data[0][i].id == res.data[1][j].pid) {
			
 
				+            if (!this.CourseTypeJson[res.data[0][i].id]) {
			
 
				+              this.CourseTypeJson[res.data[0][i].id] = [];
			
 
				+            }
			
 
				+            this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]);
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+      this.$forceUpdate();
			
 
				+      // })
			
 
				+      // .catch((err) => {
			
 
				+      //   console.error(err);
			
 
				+      // });
			
 
				+    },
			
 
				+    gotoCourse(item) {
			
 
				+      top.postMessage({ cid: item.courseId, screenType: "3" }, "*");
			
 
				+    },
			
 
				+  },
			
 
				+  beforeDestroy() {
			
 
				+    clearInterval(this.timer);
			
 
				+    this.timer = null;
			
 
				+  },
			
 
				+  created() {
			
 
				+    if (this.role == "1") {
			
 
				+      this.groupA = "4";
			
 
				+    }
			
 
				+    let typea = this.$route.query.typea
			
 
				+    let typeb = this.$route.query.typeb
			
 
				+    let typed = this.$route.query.typed
			
 
				+    if(typea || typeb || typed){
			
 
				+      this.typea = typea ? typea : ''
			
 
				+      this.typeb = typeb ? typeb : ''
			
 
				+      this.typed = typed ? typed : ''
			
 
				+    }
			
 
				+    this.loading = true;
			
 
				+    // this.selectType();
			
 
				+    this.selectAllType();
			
 
				+    // this.getBanner();
			
 
				+    this.timer = setInterval(() => {
			
 
				+      this.selectAllType();
			
 
				+      // this.getBanner();
			
 
				+    }, 60000);
			
 
				+    document.scrollingElement.scrollTop = 0;
			
 
				+  },
			
 
				+};
			
 
				+</script>
			
 
				+
			
 
				+<style scoped>
			
 
				+/* @media screen and (max-width: 1024px) {
			
 
				+  .box_course {
			
 
				+    margin: 0px 5px 20px 5px !important;
			
 
				+  }
			
 
				+} */
			
 
				+@media screen and (max-width: 1380px) {
			
 
				+  .box_course {
			
 
				+    width: calc(100% / 4 - (15px * 3) / 4) !important;
			
 
				+  }
			
 
				+
			
 
				+  .box_course:nth-child(5n) {
			
 
				+    margin-right: 15px !important;
			
 
				+  }
			
 
				+
			
 
				+  .box_course:nth-child(4n) {
			
 
				+    margin-right: 0 !important;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+@media screen and (max-width: 1080px) {
			
 
				+  .box_course {
			
 
				+    width: calc(100% / 3 - (15px * 2) / 3) !important;
			
 
				+  }
			
 
				+
			
 
				+  .box_course:nth-child(5n) {
			
 
				+    margin-right: 15px !important;
			
 
				+  }
			
 
				+
			
 
				+  .box_course:nth-child(4n) {
			
 
				+    margin-right: 15px !important;
			
 
				+  }
			
 
				+
			
 
				+  .box_course:nth-child(3n) {
			
 
				+    margin-right: 0 !important;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+
			
 
				+.student_head .imgS {
			
 
				+  width: 100%;
			
 
				+  height: 100%;
			
 
				+  cursor: pointer;
			
 
				+  object-fit: cover;
			
 
				+}
			
 
				+
			
 
				+.top {
			
 
				+  padding: 20px 30px 20px 1%;
			
 
				+  box-sizing: border-box;
			
 
				+  display: flex;
			
 
				+  align-items: center;
			
 
				+}
			
 
				+
			
 
				+.top div {
			
 
				+  cursor: pointer;
			
 
				+  box-sizing: border-box;
			
 
				+  height: 35px;
			
 
				+  line-height: 35px;
			
 
				+  margin: 0 10px 0 0;
			
 
				+  padding-bottom: 5px;
			
 
				+  width: 80px;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+
			
 
				+.top .active {
			
 
				+  border-bottom: 3px solid #0e71e6;
			
 
				+}
			
 
				+
			
 
				+.isactive {
			
 
				+  border-bottom: 3px solid #0e71e6;
			
 
				+}
			
 
				+
			
 
				+.box_fk {
			
 
				+  width: 8px;
			
 
				+  height: 21px;
			
 
				+  background: #0e71e6;
			
 
				+  margin-right: 5px;
			
 
				+}
			
 
				+
			
 
				+.wheel {
			
 
				+  width: 100%;
			
 
				+  height: 140px;
			
 
				+}
			
 
				+
			
 
				+.man {
			
 
				+  width: 16px;
			
 
				+  height: 16px;
			
 
				+}
			
 
				+
			
 
				+.wheel>img,
			
 
				+.man>img {
			
 
				+  width: 100%;
			
 
				+  height: 100%;
			
 
				+  object-fit: cover;
			
 
				+}
			
 
				+
			
 
				+.box_course {
			
 
				+  display: flex;
			
 
				+  flex-direction: column;
			
 
				+  flex-wrap: nowrap;
			
 
				+  /* margin: 0px 1% 20px; */
			
 
				+  margin: 0 15px 20px 0;
			
 
				+  width: calc(100% / 5 - (15px * 4) / 5);
			
 
				+  /* height: 260px; */
			
 
				+  /*border: 1px solid #cecece; */
			
 
				+  border-radius: 10px;
			
 
				+  overflow: hidden;
			
 
				+  box-shadow: 0px 1px 3px 0px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%),
			
 
				+    0px 2px 1px -1px rgb(0 0 0 / 12%);
			
 
				+  justify-content: space-between;
			
 
				+  cursor: pointer;
			
 
				+}
			
 
				+
			
 
				+.box_course:nth-child(5n) {
			
 
				+  margin-right: 0;
			
 
				+}
			
 
				+
			
 
				+.middle_white {
			
 
				+  font-size: 14px;
			
 
				+  margin: 5px 10px 10px;
			
 
				+}
			
 
				+
			
 
				+.people {
			
 
				+  display: flex;
			
 
				+  align-items: center;
			
 
				+}
			
 
				+
			
 
				+.people>div:nth-child(2) {
			
 
				+  margin-left: 10px;
			
 
				+}
			
 
				+
			
 
				+.now_study {
			
 
				+  width: 100%;
			
 
				+  height: 40px;
			
 
				+  color: #fff;
			
 
				+  background: #4a9eed;
			
 
				+  text-align: center;
			
 
				+  line-height: 40px;
			
 
				+  font-size: 13px;
			
 
				+  cursor: pointer;
			
 
				+  display: none;
			
 
				+}
			
 
				+
			
 
				+.now_study:hover {
			
 
				+  background: #205cc6;
			
 
				+}
			
 
				+
			
 
				+.main_box {
			
 
				+  padding: 0 2px;
			
 
				+  box-sizing: border-box;
			
 
				+  width: 100%;
			
 
				+  /* display: flex; */
			
 
				+  /* flex-direction: row; */
			
 
				+  /* flex-wrap: wrap; */
			
 
				+  /* justify-content: flex-start; */
			
 
				+  margin: 0 auto;
			
 
				+}
			
 
				+
			
 
				+.right_bottom_flex {
			
 
				+  width: 219px;
			
 
				+  height: 144px;
			
 
				+  margin: auto 0;
			
 
				+}
			
 
				+
			
 
				+.right_bottom_flex>img {
			
 
				+  width: 100%;
			
 
				+  height: 100%;
			
 
				+}
			
 
				+
			
 
				+.body_student {
			
 
				+  margin: 0 auto;
			
 
				+  width: 100%;
			
 
				+  height: 100%;
			
 
				+}
			
 
				+
			
 
				+.student_head {
			
 
				+  width: 100%;
			
 
				+  /* height: 30%; */
			
 
				+}
			
 
				+
			
 
				+.textOverflow {
			
 
				+  padding: 0 5px 0 0px;
			
 
				+  width: 95%;
			
 
				+  overflow: hidden;
			
 
				+  white-space: nowrap;
			
 
				+  text-overflow: ellipsis;
			
 
				+  font-weight: bold;
			
 
				+  font-size: 16px;
			
 
				+}
			
 
				+
			
 
				+.student_page {
			
 
				+  margin-top: 10px;
			
 
				+}
			
 
				+
			
 
				+.course_empty {
			
 
				+  width: 100%;
			
 
				+  height: 200px;
			
 
				+  display: flex;
			
 
				+  align-items: center;
			
 
				+  justify-content: center;
			
 
				+}
			
 
				+
			
 
				+.choose {
			
 
				+  display: flex;
			
 
				+  flex-direction: column;
			
 
				+  flex-wrap: nowrap;
			
 
				+  height: 100%;
			
 
				+  justify-content: space-evenly;
			
 
				+  align-items: flex-start;
			
 
				+  padding: 10px 0;
			
 
				+}
			
 
				+
			
 
				+.all_choose {
			
 
				+  display: flex;
			
 
				+  flex-direction: row;
			
 
				+  align-items: baseline;
			
 
				+  /* margin: 2px 0; */
			
 
				+  width: 100%;
			
 
				+}
			
 
				+.all_choose>span {
			
 
				+  display: flex;
			
 
				+  margin-right: 5px;
			
 
				+}
			
 
				+
			
 
				+.all_choose>span>span {
			
 
				+  min-width: 65px;
			
 
				+  max-width: 65px;
			
 
				+  display: block;
			
 
				+  text-align-last: justify;
			
 
				+}
			
 
				+.all_choose>span::after {
			
 
				+    content: '：';
			
 
				+}
			
 
				+.all_choose>span:nth-child(1) {
			
 
				+  font-weight: bold;
			
 
				+}
			
 
				+
			
 
				+.all_choose>>>.el-checkbox-group {
			
 
				+  display: flex;
			
 
				+  flex-direction: row;
			
 
				+  width: 820px;
			
 
				+  flex-wrap: wrap;
			
 
				+  align-content: center;
			
 
				+  justify-content: flex-start;
			
 
				+  align-items: center;
			
 
				+  margin-top: 3px;
			
 
				+}
			
 
				+
			
 
				+.all_choose>.el-checkbox-group>>>.el-checkbox {
			
 
				+  margin-bottom: 10px;
			
 
				+  display: flex;
			
 
				+  flex-direction: row;
			
 
				+  align-items: center;
			
 
				+}
			
 
				+
			
 
				+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label {
			
 
				+  min-width: 80px;
			
 
				+  overflow: hidden;
			
 
				+  width: 80px;
			
 
				+  text-overflow: ellipsis;
			
 
				+  white-space: nowrap;
			
 
				+}
			
 
				+
			
 
				+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label:hover {
			
 
				+  width: auto;
			
 
				+}
			
 
				+
			
 
				+.cName {
			
 
				+  cursor: pointer;
			
 
				+  margin: 0 10px 10px 0;
			
 
				+  color: #b9b6b9;
			
 
				+  min-width: 80px;
			
 
				+  width: 80px;
			
 
				+  white-space: nowrap;
			
 
				+  overflow: hidden;
			
 
				+  text-overflow: ellipsis;
			
 
				+}
			
 
				+
			
 
				+.reBox {
			
 
				+  /* position: relative; */
			
 
				+  /* top: -25px; */
			
 
				+  /* z-index: 999; */
			
 
				+  /* left: auto; */
			
 
				+  /* right: auto; */
			
 
				+  background: #fff;
			
 
				+  width: 100%;
			
 
				+  border-radius: 5px;
			
 
				+  padding-left: 20px;
			
 
				+  margin: 0px auto 20px;
			
 
				+  box-sizing: border-box;
			
 
				+}
			
 
				+
			
 
				+
			
 
				+.reTop {
			
 
				+  padding: 20px 0 0 0;
			
 
				+  border-bottom: 1px solid #eee;
			
 
				+  width: 98%;
			
 
				+  display: flex;
			
 
				+  flex-direction: row;
			
 
				+  flex-wrap: nowrap;
			
 
				+  align-items: center;
			
 
				+  justify-content: space-between;
			
 
				+}
			
 
				+
			
 
				+.reTop>div:nth-child(1) {
			
 
				+  font-weight: bold;
			
 
				+  width: 40px;
			
 
				+  border-bottom: 1px solid #205cc6;
			
 
				+  padding-bottom: 20px;
			
 
				+  color: #205cc6;
			
 
				+  font-size: 20px;
			
 
				+}
			
 
				+
			
 
				+.reTop>div:nth-child(2) {
			
 
				+  display: flex;
			
 
				+  flex-direction: row;
			
 
				+  align-items: center;
			
 
				+  border: 1px solid #ccced3;
			
 
				+  width: 300px;
			
 
				+  border-radius: 8px;
			
 
				+  padding: 5px 0;
			
 
				+  margin-bottom: 10px;
			
 
				+}
			
 
				+
			
 
				+.search {
			
 
				+  width: 20px;
			
 
				+  padding: 0 5px;
			
 
				+  display: flex;
			
 
				+}
			
 
				+
			
 
				+.search>img {
			
 
				+  width: 100%;
			
 
				+  height: 100%;
			
 
				+}
			
 
				+
			
 
				+.sInput {
			
 
				+  border: none;
			
 
				+  width: 85%;
			
 
				+}
			
 
				+
			
 
				+.sInput:focus-visible {
			
 
				+  outline: none;
			
 
				+}
			
 
				+
			
 
				+.nameAndLength {
			
 
				+  display: flex;
			
 
				+  flex-direction: row;
			
 
				+  flex-wrap: nowrap;
			
 
				+  align-items: center;
			
 
				+  justify-content: space-between;
			
 
				+  margin: 5px 0;
			
 
				+}
			
 
				+
			
 
				+.typeN {
			
 
				+  width: 200px;
			
 
				+  white-space: nowrap;
			
 
				+  overflow: hidden;
			
 
				+  text-overflow: ellipsis;
			
 
				+}
			
 
				+
			
 
				+.isCType {
			
 
				+  color: #6282c2;
			
 
				+}
			
 
				+
			
 
				+.typeCss {
			
 
				+  display: flex;
			
 
				+  flex-direction: row;
			
 
				+  flex-wrap: wrap;
			
 
				+  justify-content: flex-start;
			
 
				+  align-items: center;
			
 
				+}
			
 
				+
			
 
				+.school {
			
 
				+  white-space: nowrap;
			
 
				+  overflow: hidden;
			
 
				+  text-overflow: ellipsis;
			
 
				+  max-width: 50%;
			
 
				+  box-sizing: border-box;
			
 
				+}
			
 
				+
			
 
				+.school_box {
			
 
				+  display: flex;
			
 
				+  align-items: center;
			
 
				+  justify-content: space-between;
			
 
				+}
			
 
				+
			
 
				+
			
 
				+.FirstTypeBox {}
			
 
				+
			
 
				+.FirstTypeBox+.FirstTypeBox {
			
 
				+  margin-top: 20px;
			
 
				+}
			
 
				+
			
 
				+.FirstTypeBox>.title {
			
 
				+  font-size: 24px;
			
 
				+  font-weight: 700;
			
 
				+}
			
 
				+
			
 
				+.typeCheck {
			
 
				+  display: flex;
			
 
				+  align-items: center;
			
 
				+  justify-content: flex-end;
			
 
				+  margin-bottom: 10px;
			
 
				+}
			
 
				+
			
 
				+.typeCheck>span {
			
 
				+  margin-left: 10px;
			
 
				+}
			
 
				+
			
 
				+.pType_box {
			
 
				+  margin-top: 10px;
			
 
				+}
			
 
				+.pType_box >>> .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
			
 
				+  -webkit-box-shadow: none !important;
			
 
				+  box-shadow: none !important;
			
 
				+}
			
 
				+
			
 
				+.pb_content {
			
 
				+  height: calc(100% - 40px);
			
 
				+    padding: 0 0 0;
			
 
				+    box-sizing: border-box;
			
 
				+    overflow: auto;
			
 
				+    margin-top: 10px;
			
 
				+}
			
 
				+</style>
			
--- a/src/components/pages/dataBoardNew/course/chartList/subjuect.vue
+++ b/src/components/pages/dataBoardNew/course/chartList/subjuect.vue
@@ -38,6 +38,20 @@ export default {
 
				         credits: {
			
 
				             enabled: false//不显示LOGO
			
 
				         },
			
 
				+        tooltip: {
			
 
				+          formatter: function() {
			
 
				+            // 自定义弹窗内容的回调函数
			
 
				+            var point = this.point;
			
 
				+            if(point.from){
			
 
				+              var tooltipText = '<b>' + point.from + '</b> - <b>' + point.to + '</b>: ' + point.weight;
			
 
				+              return tooltipText;
			
 
				+            }else{
			
 
				+              var tooltipText = '<b>' + point.name + '</b>: ' + point.sum;
			
 
				+              return tooltipText;
			
 
				+            }
			
 
				+
			
 
				+          }
			
 
				+        },
			
 
				         series: [{
			
 
				           keys: ['from', 'to', 'weight'],
			
 
				           data: [
			
@@ -90,7 +104,7 @@ export default {
 
				             // ['Japan', 'Brazil', 1]
			
 
				           ],
			
 
				           type: 'dependencywheel',
			
 
				-          name: 'Dependency wheel series',
			
 
				+          name: '',
			
 
				           dataLabels: {
			
 
				             color: '#333',
			
 
				             textPath: {