Начало Каталог Помощ
Вход
CocoRoboLabs
/
pbl-teacher-table
3
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

zengyicheng преди 1 година
родител
29ce733eae d98a0bfcf1
ревизия
1a45119013
променени са 22 файла, в които са добавени 2472 реда и са изтрити 110 реда
Обединен изглед Покажи статистика за разликите
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.38566eae9561f6ef2df4e50e166037b6.css
  3. 0 0
      dist/static/css/app.38566eae9561f6ef2df4e50e166037b6.css.map
  4. 0 0
      dist/static/css/app.b3dc1ffedf99e58b877061a7d3296c2f.css
  5. 0 0
      dist/static/css/app.b3dc1ffedf99e58b877061a7d3296c2f.css.map
  6. 0 0
      dist/static/js/app.a5fb0048c308bd1dc202.js
  7. 0 0
      dist/static/js/app.a6af34389b508c781821.js
  8. 0 0
      dist/static/js/app.a6af34389b508c781821.js.map
  9. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  10. 4 0
      src/App.vue
  11. BIN
      src/assets/icon/new/c_down.png
  12. BIN
      src/assets/icon/new/c_up.png
  13. BIN
      src/assets/icon/new/cover_update.png
  14. 308 46
      src/components/pages/addCourse.vue
  15. 213 27
      src/components/pages/easy/addCourse.vue
  16. 5 3
      src/components/pages/synergyCourse/course.vue
  17. 204 18
      src/components/pages/task/addCourse.vue
  18. 151 0
      src/components/pages/test/add/addTest.vue
  19. 369 0
      src/components/pages/test/add/setInfo/index.vue
  20. 1165 0
      src/components/pages/test/index.vue
  21. 36 15
      src/components/tools/sunburst.vue
  22. 16 0
      src/router/index.js

+ 1 - 1
dist/index.html
Целия файл 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       height: 100%;
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.b3dc1ffedf99e58b877061a7d3296c2f.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.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.a5fb0048c308bd1dc202.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.38566eae9561f6ef2df4e50e166037b6.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.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.a6af34389b508c781821.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/css/app.38566eae9561f6ef2df4e50e166037b6.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/css/app.38566eae9561f6ef2df4e50e166037b6.css.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/css/app.b3dc1ffedf99e58b877061a7d3296c2f.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/css/app.b3dc1ffedf99e58b877061a7d3296c2f.css.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/app.a5fb0048c308bd1dc202.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/app.a6af34389b508c781821.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/app.a6af34389b508c781821.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 4 - 0
src/App.vue
Целия файл 

@@ -105,6 +105,7 @@ export default {
 
         "/studioCourse",
 
         "/studioCourse",
 
         "/teacherSource",
 
         "/teacherSource",
 
         "/grade",
 
         "/grade",
 
+        "/test",
 
         // "/eventCenter",
 
         // "/eventCenter",
 
         // "/addRace",
 
         // "/addRace",
 
         // "/anliDetail",
 
         // "/anliDetail",
 
@@ -478,4 +479,7 @@ html::-webkit-scrollbar-thumb {
 
   display: flex;
 
   display: flex;
 
   align-items: center;
 
   align-items: center;
 
 }
 
 }
 
+.el-cascader-node__label{
 
+  max-width: 150px;
 
+}
 
 </style>
 
 </style>

BIN
src/assets/icon/new/c_down.png
Целия файл


BIN
src/assets/icon/new/c_up.png
Целия файл


BIN
src/assets/icon/new/cover_update.png
Целия файл


+ 308 - 46
src/components/pages/addCourse.vue
Целия файл 

@@ -148,16 +148,18 @@
 
                     </div> -->
 
                     </div> -->
 
                       <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">上传封面</div>
 
                       <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">上传封面</div>
 
                       <div style="width: 100%;">
 
                       <div style="width: 100%;">
 
-                        <div class="uploadFm" @click="choosePicVisible = true" v-if="cover.length == 0">
 
-                          <img src="../../assets/icon/addPoster.png" alt="" />
 
-                          <div>点击添加封面</div>
 
+                        <div class="uploadFm" @click="choosePicVisible = true" :class="{uploadFm2:cover.length}">
 
+                          <img src="../../assets/icon/addPoster.png" alt="" v-if="cover.length == 0"/>
 
+                          <img :src="cover[0].url" alt="" class="cover_p" v-else/>
 
+                          <div v-if="cover.length == 0">点击添加封面</div>
 
+                          <div class="cover_mask"><img src="../../assets/icon/new/cover_update.png" /><span style="margin-top:5px;">修改封面</span></div>
 
                         </div>
 
                         </div>
 
-                        <el-upload :class="{ disUoloadSty: noneBtnImg }" class="upCss" action="#" list-type="picture"
 
+                        <!-- <el-upload :class="{ disUoloadSty: noneBtnImg }" class="upCss" action="#" list-type="picture"
 
                           v-loading="uploadLoading1" :http-request="beforeUpload1" ref="upload1"
 
                           v-loading="uploadLoading1" :http-request="beforeUpload1" ref="upload1"
 
                           :on-preview="handlePictureCardPreview" :on-remove="handle_remove1" :show-file-list="true"
 
                           :on-preview="handlePictureCardPreview" :on-remove="handle_remove1" :show-file-list="true"
 
                           :file-list="cover" accept="image/*" :limit="1" :on-exceed="onExceed" v-else>
 
                           :file-list="cover" accept="image/*" :limit="1" :on-exceed="onExceed" v-else>
 
                           <i class="el-icon-plus"></i>
 
                           <i class="el-icon-plus"></i>
 
-                        </el-upload>
 
+                        </el-upload> -->
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                   </div>
 
                   </div>
 
@@ -493,7 +495,10 @@
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                     <div v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
                     <div v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
-                      .taskJson" :key="tIndex">
 
+                      .taskJson" :key="tIndex" :class="{
 
+                          dragOverTop: newIndex === tIndex && typeIndex == 'task-'+tIndex && oldIndex > tIndex,
 
+                          dragOverBottom: newIndex === tIndex && typeIndex == 'task-'+tIndex && oldIndex < tIndex,
 
+                        }">
 
                       <div @dragstart="dragTaskStart(t, tIndex)" @dragover.prevent="dragTaskOver(tIndex)"
 
                       <div @dragstart="dragTaskStart(t, tIndex)" @dragover.prevent="dragTaskOver(tIndex)"
 
                           @dragend="dragTaskEnd()" draggable @click="goToTask(tIndex)" class="navTask" :class="{
 
                           @dragend="dragTaskEnd()" draggable @click="goToTask(tIndex)" class="navTask" :class="{
 
                         isNavTask:
 
                         isNavTask:
 
@@ -705,7 +710,7 @@
 
                               itemTask.chapterData.length == 0
 
                               itemTask.chapterData.length == 0
 
                               "><img src="../../assets/icon/new/c_none.png" alt /><span>请添加学习内容</span></div>
 
                               "><img src="../../assets/icon/new/c_none.png" alt /><span>请添加学习内容</span></div>
 
                             <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
                             <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
-                              <div @dragstart="dragStart(item1, index1, itemTaskIndex)" @dragover.prevent="dragOver(index1)"
 
+                              <div @dragstart="dragStart(item1, index1, itemTaskIndex)" @dragover.prevent="dragOver(index1, itemTaskIndex)"
 
                                 @dragend="dragEnd()" draggable class="chapter_upload"
 
                                 @dragend="dragEnd()" draggable class="chapter_upload"
 
                                 v-for="(item1, index1) in itemTask.chapterData" :key="item1.id" @click="
 
                                 v-for="(item1, index1) in itemTask.chapterData" :key="item1.id" @click="
 
                                   getChapterData(
 
                                   getChapterData(
 
@@ -715,7 +720,10 @@
 
                                     index1,
 
                                     index1,
 
                                     item1.type
 
                                     item1.type
 
                                   )
 
                                   )
 
-                                  ">
 
+                                  " :class="{
 
+                                dragOverTop2: newIndex === index1 && typeIndex == 'chapter-'+itemTaskIndex+'-'+index1 && oldIndex > index1,
 
+                                dragOverBottom2: newIndex === index1 && typeIndex == 'chapter-'+itemTaskIndex+'-'+index1 && oldIndex < index1,
 
+                              }">
 
                                 <div class="chapter_upload_drag"></div>
 
                                 <div class="chapter_upload_drag"></div>
 
                                 <div class="chapter_upload_o" style="
 
                                 <div class="chapter_upload_o" style="
 
                               position: relative;
 
                               position: relative;
 
@@ -918,7 +926,7 @@
 
                               itemTask.chapterData.length == 0
 
                               itemTask.chapterData.length == 0
 
                               "><img src="../../assets/icon/new/c_none.png" alt /></div>
 
                               "><img src="../../assets/icon/new/c_none.png" alt /></div>
 
                             <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
                             <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
-                              <div @dragstart="dragStart(item1, index1, index)" @dragover.prevent="dragOver(index1)"
 
+                              <div @dragstart="dragStart(item1, index1, index)" @dragover.prevent="dragOver(index1, itemTaskIndex)"
 
                                 @dragend="dragEnd()" draggable class="chapter_upload"
 
                                 @dragend="dragEnd()" draggable class="chapter_upload"
 
                                 v-for="(item1, index1) in itemTask.chapterData" :key="item1.id" @click="
 
                                 v-for="(item1, index1) in itemTask.chapterData" :key="item1.id" @click="
 
                                   getChapterData(
 
                                   getChapterData(
 
@@ -928,7 +936,10 @@
 
                                     index1,
 
                                     index1,
 
                                     item1.type
 
                                     item1.type
 
                                   )
 
                                   )
 
-                                  ">
 
+                                  " :class="{
 
+                                dragOverTop2: newIndex === index1 && typeIndex == 'chapter-'+itemTaskIndex+'-'+index1 && oldIndex > index1,
 
+                                dragOverBottom2: newIndex === index1 && typeIndex == 'chapter-'+itemTaskIndex+'-'+index1 && oldIndex < index1,
 
+                              }">
 
                                 <div class="chapter_upload_drag"></div>
 
                                 <div class="chapter_upload_drag"></div>
 
                                 <div class="chapter_upload_t" style="width: 100%"></div>
 
                                 <div class="chapter_upload_t" style="width: 100%"></div>
 
                                 <div class="chapter_upload_o" style="
 
                                 <div class="chapter_upload_o" style="
 
@@ -1253,15 +1264,33 @@
 
                               其他
 
                               其他
 
                             </div> -->
 
                             </div> -->
 
                                 </div>
 
                                 </div>
 
-                                <div v-if="itemTool.isFold3" class="show_toolD show"
 
-                                  @click="fold3(itemTaskIndex, toolIndex)"
 
-                                  :style="{ right: itemTask.toolChoose.length > 1 ? '45px' : '0px' }"><img
 
-                                    src="../../assets/icon/new/icon-slide.png" />收起工具栏</div>
 
-                                <div v-else class="show_toolD" @click="fold3(itemTaskIndex, toolIndex)"
 
-                                  :style="{ right: itemTask.toolChoose.length > 1 ? '45px' : '0px' }"><img
 
-                                    src="../../assets/icon/new/icon-slide.png" />展开工具栏</div>
 
-                                <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
 
-                                  v-if="itemTask.toolChoose.length > 1" style="position: absolute; right: 0"></div>
 
+                                <div class="chapter_upload_ud2" style="z-index: 99;margin:0 0 0 auto" v-if="itemTask.toolChoose.length > 1">
 
+                                  <div class="chapter_upload_up2" @click.stop="
 
+                                      upTool(
 
+                                        $event,
 
+                                        unitIndex,
 
+                                        itemTaskIndex, 
+                                        toolIndex
 
+                                      )
 
+                                  ">上移</div>
 
+                                  <div class="chapter_upload_down2" @click.stop="
 
+                                      downTool(
 
+                                        $event,
 
+                                        unitIndex,
 
+                                        itemTaskIndex, 
+                                        toolIndex
 
+                                      )
 
+                                  ">下移</div>
 
+                              </div>
 
+                              <div v-if="itemTool.isFold3" class="show_toolD show"
 
+                                @click="fold3(itemTaskIndex, toolIndex)"
 
+                                :style="{ margin: itemTask.toolChoose.length > 1 ? '0px 35px 0px 10px' : '0 0 0 auto' }"><img
 
+                                  src="../../assets/icon/new/icon-slide.png" />收起工具栏</div>
 
+                              <div v-else class="show_toolD" @click="fold3(itemTaskIndex, toolIndex)"
 
+                                :style="{ margin: itemTask.toolChoose.length > 1 ? '0px 35px 0px 10px' : '0 0 0 auto' }"><img
 
+                                  src="../../assets/icon/new/icon-slide.png" />展开工具栏</div>
 
+                              <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
 
+                                v-if="itemTask.toolChoose.length > 1" style="position: absolute; right: 0;top:-5px;"></div>
 
                               </div>
 
                               </div>
 
 
 
                               <div style="min-height: 163px" v-show="itemTool.isFold3">
 
                               <div style="min-height: 163px" v-show="itemTool.isFold3">
 
@@ -2372,7 +2401,7 @@
 
                             </div>
 
                             </div>
 
                           </div>
 
                           </div>
 
                           <div class="mbCss">
 
                           <div class="mbCss">
 
-                            <div class="pjCss">
 
+                            <div class="pjCss" :style="{width:itemTask.isEvaFold?'calc(100% - 55%)':'calc(100% - 120px)'}">
 
                               <div v-if="itemTask.eList && itemTask.eList.length" class="elist_input">
 
                               <div v-if="itemTask.eList && itemTask.eList.length" class="elist_input">
 
                                 <div v-for="(eItem, eIndex) in itemTask.eList" :key="eIndex" class="elist_input_box">
 
                                 <div v-for="(eItem, eIndex) in itemTask.eList" :key="eIndex" class="elist_input_box">
 
                                   <span>评价名称：</span>
 
                                   <span>评价名称：</span>
 
@@ -2414,9 +2443,8 @@
 
                             </div>
 
                             </div>
 
                             <div v-if="evalua" style="
 
                             <div v-if="evalua" style="
 
                           border: 1px solid #e5e5e5;
 
                           border: 1px solid #e5e5e5;
 
-                          width: 55%;
 
                           box-shadow: 3px 1px 15px 3px #e0e0e0;
 
                           box-shadow: 3px 1px 15px 3px #e0e0e0;
 
-                        " class="evaCss">
 
+                        " :style="{width:itemTask.isEvaFold?'55%':'116px'}" class="evaCss">
 
                               <!-- <div class="e_add_top">
 
                               <!-- <div class="e_add_top">
 
                               <div class="e_add_title">
 
                               <div class="e_add_title">
 
                                 <span>当前使用目标管理</span>
 
                                 <span>当前使用目标管理</span>
 
@@ -2432,14 +2460,20 @@
 
                               <div class="e_add_content" style="width: 100%">
 
                               <div class="e_add_content" style="width: 100%">
 
                                 <div class="e_add_list_pbox" style="width: 100%">
 
                                 <div class="e_add_list_pbox" style="width: 100%">
 
                                   <div class="e_add_list_pbox_title">
 
                                   <div class="e_add_list_pbox_title">
 
-                                    <span class="type_title">切换模式</span>
 
-                                    <div class="type_content">
 
-                                      <span :class="{ active: typeMode == 1 }" @click="OtherMb(1)">目标树</span>
 
-                                      <span :class="{ active: typeMode == 2 }" @click="OtherMb(2)">目标罗盘</span>
 
+                                    <span class="type_title" v-if="itemTask.isEvaFold">切换模式</span>
 
+                                    <div class="type_content" v-if="itemTask.isEvaFold">
 
+                                      <span :class="{ active: typeMode == 1 }" @click="OtherMb(1, itemTaskIndex)">目标树</span>
 
+                                      <span :class="{ active: typeMode == 2 }" @click="OtherMb(2, itemTaskIndex)">目标罗盘</span>
 
                                       <!-- <span :class="{ active: typeMode == 3 }" @click="OtherMb(3)">目标看板</span> -->
 
                                       <!-- <span :class="{ active: typeMode == 3 }" @click="OtherMb(3)">目标看板</span> -->
 
                                     </div>
 
                                     </div>
 
+                                    <div v-if="itemTask.isEvaFold"
 
+                                      class="show_taskD show" style="margin:0 0 0 auto" @click="foldEva(itemTaskIndex)"><img
 
+                                        src="../../assets/icon/new/icon-slide.png" />收起目标</div>
 
+                                    <div v-else style="margin:0 0 0 auto" class="show_taskD"
 
+                                      @click="foldEva(itemTaskIndex)"><img src="../../assets/icon/new/icon-slide.png" />展开目标
 
+                                    </div>
 
                                   </div>
 
                                   </div>
 
-                                  <div class="e_add_list_pbox_content">
 
+                                  <div class="e_add_list_pbox_content" v-if="itemTask.isEvaFold" style="min-height: 200px;">
 
                                     <Mind :showBar="false" :mindData="data" style="width: 100%" :jsmindId="unitIndex + '-' + itemTaskIndex + 'mind'
 
                                     <Mind :showBar="false" :mindData="data" style="width: 100%" :jsmindId="unitIndex + '-' + itemTaskIndex + 'mind'
 
                                       " v-if="typeMode == 1"></Mind>
 
                                       " v-if="typeMode == 1"></Mind>
 
                                     <Sunburst :Josn="eJson" :num="eJSONNum" style="width: 100%" v-if="typeMode == 2">
 
                                     <Sunburst :Josn="eJson" :num="eJSONNum" style="width: 100%" v-if="typeMode == 2">
 
@@ -2676,8 +2710,10 @@
 
         <div class="check_class_left">
 
         <div class="check_class_left">
 
           <div class="check_class_all_box">
 
           <div class="check_class_all_box">
 
             <div class="check_class_left_title">选择班级</div>
 
             <div class="check_class_left_title">选择班级</div>
 
-            <div style="display:flex;align-items:center;"><el-checkbox v-model="checkAll"
 
-                @change="handleCheckAllChange" class="all_check">全选</el-checkbox></div>
 
+            <div style="display:flex;align-items:center;"></div>
 
+          </div>
 
+          <div class="class_item" style="position:absolute; margin:0" v-if="grade2.length">            
+            <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
 
           </div>
 
           </div>
 
           <el-checkbox-group v-model="checkboxList2" class="check_class_item" @change="InviteChange" v-if="grade2.length">
 
           <el-checkbox-group v-model="checkboxList2" class="check_class_item" @change="InviteChange" v-if="grade2.length">
 
             <div v-for="item in grade2" :key="item.id" class="class_item">
 
             <div v-for="item in grade2" :key="item.id" class="class_item">
 
@@ -3568,7 +3604,7 @@
 
               position: relative;
 
               position: relative;
 
             ">
 
             ">
 
             <div class="e_box">
 
             <div class="e_box">
 
-              <div class="e_card" v-for="(item, index) in evaJuri" :key="index">
 
+              <!-- <div class="e_card" v-for="(item, index) in evaJuri" :key="index">
 
                 <div class="e_card_picture">
 
                 <div class="e_card_picture">
 
                   <img src="../../assets/e_picture.png" />
 
                   <img src="../../assets/e_picture.png" />
 
                 </div>
 
                 </div>
 
@@ -3578,10 +3614,48 @@
 
                 <div class="e_card_btn">
 
                 <div class="e_card_btn">
 
                   <span @click="checkEva(item.id, 2)">导入</span>
 
                   <span @click="checkEva(item.id, 2)">导入</span>
 
                 </div>
 
                 </div>
 
-              </div>
 
-              <div class="addEva" @click="openT">
 
+              </div> -->
 
+              <!-- <div class="addEva" @click="openT">
 
                 <img src="../../assets/icon/addEva.png" alt="" />
 
                 <img src="../../assets/icon/addEva.png" alt="" />
 
-              </div>
 
+              </div> -->
 
+              <div style="display:flex;justify-content: flex-end;margin-bottom: 10px;"><el-button @click="openT" type="primary" size="small">添加目标</el-button></div>
 
+              <el-table
 
+                v-if="evaJuri.length"
 
+                ref="table"
 
+                :data="evaJuri"
 
+                border
 
+                :fit="true"
 
+                style="width: 100%"
 
+                :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }"
 
+                :row-class-name="tableRowClassName"
 
+              >
 
+                <el-table-column
 
+                  label="目标名称"
 
+                  min-width="15"
 
+                  align="center"
 
+                  prop="title"
 
+                >
 
+                </el-table-column>
 
+                <el-table-column
 
+                  prop="username"
 
+                  label="负责人"
 
+                  min-width="15"
 
+                  align="center"
 
+                >
 
+                </el-table-column>
 
+                <el-table-column label="操作" width="250px">
 
+                  <template slot-scope="scope">
 
+                    <div class="btnBox">
 
+                      <el-button
 
+                        type="primary"
 
+                        size="small"
 
+                        @click="checkEva(scope.row.id, 2)"
 
+                        >导入</el-button
 
+                      >
 
+                    </div>
 
+                  </template>
 
+                </el-table-column>
 
+              </el-table>
 
               <div v-if="evaJuri.length === 0" style="margin: 0 auto; color: #6e6e6e">
 
               <div v-if="evaJuri.length === 0" style="margin: 0 auto; color: #6e6e6e">
 
                 暂无数据
 
                 暂无数据
 
               </div>
 
               </div>
 
@@ -3932,6 +4006,7 @@ export default {
 
       oldData: null,
 
       oldData: null,
 
       newIndex: "",
 
       newIndex: "",
 
       englishList:{},
 
       englishList:{},
 
+      typeIndex: "",
 
     };
 
     };
 
   },
 
   },
 
   directives: {
 
   directives: {
 
@@ -4195,6 +4270,13 @@ export default {
 
     },
 
     },
 
   },
 
   },
 
   methods: {
 
   methods: {
 
+    tableRowClassName({ row, rowIndex }) {
 
+      if ((rowIndex + 1) % 2 === 0) {
 
+        return "even_row";
 
+      } else {
 
+        return "";
 
+      }
 
+    },
 
     openAI() {
 
     openAI() {
 
       window.parent.postMessage({ tools: "64" }, "*");
 
       window.parent.postMessage({ tools: "64" }, "*");
 
     },
 
     },
 
@@ -5792,6 +5874,18 @@ export default {
 
       }
 
       }
 
       this.$forceUpdate();
 
       this.$forceUpdate();
 
     },
 
     },
 
+    foldEva(i) {
 
+      if (this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isEvaFold) {
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isEvaFold = false;
 
+      } else {
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isEvaFold = true;
 
+        setTimeout(() => {
 
+          this.checkEva(this.checkId);
 
+        }, 0);
 
+
 
+      }
 
+      this.$forceUpdate();
 
+    },
 
     foldC(i) {
 
     foldC(i) {
 
       if (this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isFoldchapter) {
 
       if (this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isFoldchapter) {
 
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isFoldchapter = false;
 
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isFoldchapter = false;
 
@@ -5990,6 +6084,60 @@ export default {
 
       this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[ic] = a;
 
       this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[ic] = a;
 
       this.$forceUpdate();
 
       this.$forceUpdate();
 
     },
 
     },
 
+    upTool(e, i, j, tooli){
 
+      e.stopPropagation();
 
+      if (tooli == 0) {
 
+        return;
 
+      }
 
+      this.$confirm(
 
+        "切换工具顺序将删除此工具的提交成果，是否继续此操作?",
 
+        "提示",
 
+        {
 
+          confirmButtonText: "确定",
 
+          cancelButtonText: "取消",
 
+          type: "warning",
 
+        }
 
+      )
 
+        .then(() => {
 
+          var a =
 
+          JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli - 1]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli - 1] =
 
+            JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli] = a;
 
+          this.$forceUpdate()
 
+        })
 
+        .catch(() => {
 
+          return;
 
+        });
 
+    },
 
+    downTool(e, i, j, tooli){
 
+      e.stopPropagation();
 
+      if ( tooli ==
 
+        this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose.length -
 
+        1) {
 
+        return;
 
+      }
 
+      this.$confirm(
 
+        "切换工具顺序将删除此工具的提交成果，是否继续此操作?",
 
+        "提示",
 
+        {
 
+          confirmButtonText: "确定",
 
+          cancelButtonText: "取消",
 
+          type: "warning",
 
+        }
 
+      )
 
+        .then(() => {
 
+          var a =
 
+          JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli + 1]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli + 1] =
 
+            JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli] = a;
 
+          this.$forceUpdate()
 
+        })
 
+        .catch(() => {
 
+          return;
 
+        });
 
+    },
 
     addWork() {
 
     addWork() {
 
       let cPan = 1;
 
       let cPan = 1;
 
       for (var i = 0; i < this.unitJson.length; i++) {
 
       for (var i = 0; i < this.unitJson.length; i++) {
 
@@ -8395,7 +8543,10 @@ export default {
 
           console.error(err);
 
           console.error(err);
 
         });
 
         });
 
     },
 
     },
 
-    OtherMb(type) {
 
+    OtherMb(type, task) {
 
+      if(task === 0 || task){
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[task].isEvaFold = true;
 
+      }
 
       this.typeMode = type;
 
       this.typeMode = type;
 
       setTimeout(() => {
 
       setTimeout(() => {
 
         this.checkEva(this.checkId);
 
         this.checkEva(this.checkId);
 
@@ -9165,10 +9316,13 @@ export default {
 
       this.toolIndexType = `gj${i}${j}`
 
       this.toolIndexType = `gj${i}${j}`
 
       let target = document.querySelector(`#gj${i}${j}`);
 
       let target = document.querySelector(`#gj${i}${j}`);
 
       if (target) {
 
       if (target) {
 
-        target.scrollIntoView(true);
 
-        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolChoose[j].isFold3 = true
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isFold = 0;
 
         setTimeout(() => {
 
         setTimeout(() => {
 
-          this.$refs.unitBox.scrollTop = this.$refs.unitBox.scrollTop - 100;
 
+          target.scrollIntoView(true);
 
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolChoose[j].isFold3 = true
 
+          setTimeout(() => {
 
+            this.$refs.unitBox.scrollTop = this.$refs.unitBox.scrollTop - 100;
 
+          }, 0);
 
         }, 0);
 
         }, 0);
 
       }
 
       }
 
     },
 
     },
 
@@ -9179,7 +9333,8 @@ export default {
 
       this.oldIndex = i;
 
       this.oldIndex = i;
 
       this.oldData = val;
 
       this.oldData = val;
 
     },
 
     },
 
-    dragOver(i) {
 
+    dragOver(i, j) {
 
+      this.typeIndex = "chapter-" + j + '-' + i
 
       this.newIndex = i;
 
       this.newIndex = i;
 
     },
 
     },
 
     dragEnd() {
 
     dragEnd() {
 
@@ -9191,6 +9346,7 @@ export default {
 
       // 在列表中目标位置增加新的节点
 
       // 在列表中目标位置增加新的节点
 
       newItems.splice(this.newIndex, 0, this.oldData);
 
       newItems.splice(this.newIndex, 0, this.oldData);
 
       this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].chapterData = [...newItems];
 
       this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].chapterData = [...newItems];
 
+      this.typeIndex = "";
 
       this.newIndex = "";
 
       this.newIndex = "";
 
       this.$forceUpdate()
 
       this.$forceUpdate()
 
     },
 
     },
 
@@ -9199,10 +9355,13 @@ export default {
 
       this.oldData = val;
 
       this.oldData = val;
 
     },
 
     },
 
     dragTaskOver(i) {
 
     dragTaskOver(i) {
 
+      this.typeIndex = "task-" + i
 
       this.newIndex = i;
 
       this.newIndex = i;
 
     },
 
     },
 
     dragTaskEnd() {
 
     dragTaskEnd() {
 
       if(this.newIndex == this.oldIndex){
 
       if(this.newIndex == this.oldIndex){
 
+        this.newIndex = "";
 
+        this.typeIndex = "";
 
         return;
 
         return;
 
       }
 
       }
 
       this.$confirm(
 
       this.$confirm(
 
@@ -9221,11 +9380,13 @@ export default {
 
           // 在列表中目标位置增加新的节点
 
           // 在列表中目标位置增加新的节点
 
           newItems.splice(this.newIndex, 0, this.oldData);
 
           newItems.splice(this.newIndex, 0, this.oldData);
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson = [...newItems];
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson = [...newItems];
 
+          this.typeIndex = "";
 
           this.newIndex = "";
 
           this.newIndex = "";
 
           this.$forceUpdate()
 
           this.$forceUpdate()
 
         })
 
         })
 
         .catch(() => {
 
         .catch(() => {
 
           this.newIndex = "";
 
           this.newIndex = "";
 
+          this.typeIndex = "";
 
           return;
 
           return;
 
         });
 
         });
 
     },
 
     },
 
@@ -9281,9 +9442,14 @@ export default {
 
 
 
   .evaCss {
 
   .evaCss {
 
     width: 100% !important;
 
     width: 100% !important;
 
+    margin-top: 10px;
 
   }
 
   }
 
 }
 
 }
 
 
 
+.el-table >>> .even_row {
 
+  background-color: #f1f1f1 !important;
 
+}
 
+
 
 .dialog_diy>>>.el-dialog__header {
 
 .dialog_diy>>>.el-dialog__header {
 
   background: #3c3c3c !important;
 
   background: #3c3c3c !important;
 
   padding: 15px 20px;
 
   padding: 15px 20px;
 
@@ -9757,9 +9923,9 @@ export default {
 
   font-size: 14px;
 
   font-size: 14px;
 
   cursor: pointer;
 
   cursor: pointer;
 
   color: #717C8D;
 
   color: #717C8D;
 
-  position: absolute;
 
+  /* position: absolute;
 
   right: 45px;
 
   right: 45px;
 
-  top: 5px;
 
+  top: 5px; */
 
 }
 
 }
 
 
 
 .show_toolD>img {
 
 .show_toolD>img {
 
@@ -10492,6 +10658,48 @@ export default {
 
   margin-bottom: 5px;
 
   margin-bottom: 5px;
 
 }
 
 }
 
 
 
+.chapter_upload_ud2 {
 
+  display: flex;
 
+  flex-direction: row;
 
+  justify-content: center;
 
+  margin: 0 10px 0 0;
 
+}
 
+
 
+.chapter_upload_ud2>.chapter_upload_up2 {
 
+  margin-bottom: 0;
 
+  margin-right: 10px;
 
+}
 
+
 
+
 
+.chapter_upload_down2,
 
+.chapter_upload_up2 {
 
+  cursor: pointer;
 
+  margin: 0 auto;
 
+  border-radius: 5px;
 
+  display: flex;
 
+  justify-content: center;
 
+  align-items: center;
 
+  color: #717C8D;
 
+  font-size: 14px;
 
+}
 
+.chapter_upload_up2{
 
+  margin-right:10px;
 
+}
 
+.chapter_upload_up2::before,
 
+.chapter_upload_down2::before {
 
+  content: '';
 
+  background-image: url('../../assets/icon/new/c_up.png');
 
+  width: 14px;
 
+  height: 14px;
 
+  background-size: 100% 100%;
 
+  display: block;
 
+  margin-right: 5px;
 
+}
 
+
 
+.chapter_upload_up2::before {
 
+  background-image: url('../../assets/icon/new/c_down.png') !important;
 
+}
 
+
 
 
 
 .addWordStyle {
 
 .addWordStyle {
 
   display: flex;
 
   display: flex;
 
@@ -11349,7 +11557,7 @@ ol {
 
   background: #fff;
 
   background: #fff;
 
   width: 100%;
 
   width: 100%;
 
   height: 60px;
 
   height: 60px;
 
-  z-index: 9999;
 
+  z-index: 999;
 
 }
 
 }
 
 
 
 .fold {
 
 .fold {
 
@@ -11484,8 +11692,8 @@ ol {
 
 .elist_input .elist_input_box input {
 
 .elist_input .elist_input_box input {
 
   font: inherit;
 
   font: inherit;
 
   color: currentColor;
 
   color: currentColor;
 
-  /* width: 200px; */
 
-  max-width: 200px;
 
+  width: 100%;
 
+  max-width: calc(100% - 385px);
 
   padding: 8px 14px;
 
   padding: 8px 14px;
 
   display: block;
 
   display: block;
 
   min-width: 0;
 
   min-width: 0;
 
@@ -11840,11 +12048,12 @@ ol {
 
 }
 
 }
 
 
 
 .e_box {
 
 .e_box {
 
-  display: flex;
 
+  /* display: flex; */
 
   flex-wrap: wrap;
 
   flex-wrap: wrap;
 
   max-height: 500px;
 
   max-height: 500px;
 
   align-items: flex-start;
 
   align-items: flex-start;
 
   overflow: auto;
 
   overflow: auto;
 
+  width:100%;
 
 }
 
 }
 
 
 
 .e_card {
 
 .e_card {
 
@@ -11938,6 +12147,37 @@ ol {
 
   align-items: center;
 
   align-items: center;
 
   font-size: 14px;
 
   font-size: 14px;
 
   color: #6e6e6e;
 
   color: #6e6e6e;
 
+  position:relative;
 
+}
 
+
 
+.cover_p{
 
+  width: 100% !important;
 
+  height: 100%;
 
+  object-fit: cover;
 
+}
 
+
 
+.uploadFm2:hover .cover_mask{
 
+  display: flex !important;
 
+}
 
+
 
+.cover_mask{
 
+  display:none;
 
+  width:100%;
 
+  height:100%;
 
+  position:absolute;
 
+  background:#00000054;
 
+  align-items: center;
 
+  justify-content: center;
 
+  flex-direction: column;
 
+}
 
+
 
+.cover_mask > img{
 
+  width: 30px;
 
+}
 
+
 
+.cover_mask > span{
 
+  color: #fff;
 
+  font-size: 12px;
 
 }
 
 }
 
 
 
 .uploadFm>img {
 
 .uploadFm>img {
 
@@ -12464,6 +12704,27 @@ ol {
 
   background-image: url(../../assets/icon/new/icon_arrow_a.png) !important;
 
   background-image: url(../../assets/icon/new/icon_arrow_a.png) !important;
 
 }
 
 }
 
 
 
+.dragOverTop {
 
+  border-top: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+  margin-top: 10px;
 
+}
 
+
 
+.dragOverBottom {
 
+  border-bottom: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+  margin-top: 10px;
 
+}
 
+
 
+.dragOverTop2 {
 
+  border-top: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+}
 
+
 
+.dragOverBottom2 {
 
+  border-bottom: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+}
 
 .isNavTask {
 
 .isNavTask {
 
   /* background: #3681FC; */
 
   /* background: #3681FC; */
 
   background: #EEF3FB;
 
   background: #EEF3FB;
 
@@ -12995,7 +13256,6 @@ ol {
 
 .check_class_left_title {
 
 .check_class_left_title {
 
   font-size: 16px;
 
   font-size: 16px;
 
   font-weight: 700;
 
   font-weight: 700;
 
-  margin-bottom: 10px;
 
 }
 
 }
 
 
 
 .check_class_item {
 
 .check_class_item {
 
@@ -13007,7 +13267,9 @@ ol {
 
   align-items: flex-start;
 
   align-items: flex-start;
 
   align-content: flex-start;
 
   align-content: flex-start;
 
 }
 
 }
 
-
 
+.class_item:first-child {
 
+  margin: 0 15px 15px 67px;
 
+}
 
 .class_item {
 
 .class_item {
 
   margin: 0 15px 15px 0;
 
   margin: 0 15px 15px 0;

+ 213 - 27
src/components/pages/easy/addCourse.vue
Целия файл 

@@ -94,16 +94,18 @@
 
                     </div> -->
 
                     </div> -->
 
                       <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">上传封面</div>
 
                       <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">上传封面</div>
 
                       <div style="width: 100%;">
 
                       <div style="width: 100%;">
 
-                        <div class="uploadFm" @click="choosePicVisible = true" v-if="cover.length == 0">
 
-                          <img src="../../../assets/icon/addPoster.png" alt="" />
 
-                          <div>点击添加封面</div>
 
+                        <div class="uploadFm" @click="choosePicVisible = true" :class="{uploadFm2:cover.length}">
 
+                          <img src="../../../assets/icon/addPoster.png" alt="" v-if="cover.length == 0"/>
 
+                          <img :src="cover[0].url" alt="" class="cover_p" v-else/>
 
+                          <div v-if="cover.length == 0">点击添加封面</div>
 
+                          <div class="cover_mask"><img src="../../../assets/icon/new/cover_update.png" /><span style="margin-top:5px;">修改封面</span></div>
 
                         </div>
 
                         </div>
 
-                        <el-upload :class="{ disUoloadSty: noneBtnImg }" class="upCss" action="#" list-type="picture"
 
+                        <!-- <el-upload :class="{ disUoloadSty: noneBtnImg }" class="upCss" action="#" list-type="picture"
 
                           v-loading="uploadLoading1" :http-request="beforeUpload1" ref="upload1"
 
                           v-loading="uploadLoading1" :http-request="beforeUpload1" ref="upload1"
 
                           :on-preview="handlePictureCardPreview" :on-remove="handle_remove1" :show-file-list="true"
 
                           :on-preview="handlePictureCardPreview" :on-remove="handle_remove1" :show-file-list="true"
 
                           :file-list="cover" accept="image/*" :limit="1" :on-exceed="onExceed" v-else>
 
                           :file-list="cover" accept="image/*" :limit="1" :on-exceed="onExceed" v-else>
 
                           <i class="el-icon-plus"></i>
 
                           <i class="el-icon-plus"></i>
 
-                        </el-upload>
 
+                        </el-upload> -->
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                   </div>
 
                   </div>
 
@@ -166,13 +168,15 @@
 
                   <div class="stepsBottom2">
 
                   <div class="stepsBottom2">
 
                     <div class="navBottom" :style="{ height: heightPx }">
 
                     <div class="navBottom" :style="{ height: heightPx }">
 
                       <div v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
                       <div v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
-                        .taskJson" :key="tIndex">
 
+                        .taskJson" :key="tIndex" :class="{
 
+                          dragOverTop: newIndex === tIndex && typeIndex == 'task-'+tIndex && oldIndex > tIndex,
 
+                          dragOverBottom: newIndex === tIndex && typeIndex == 'task-'+tIndex && oldIndex < tIndex,
 
+                        }">
 
                         <div @dragstart="dragTaskStart(t, tIndex)" @dragover.prevent="dragTaskOver(tIndex)"
 
                         <div @dragstart="dragTaskStart(t, tIndex)" @dragover.prevent="dragTaskOver(tIndex)"
 
                           @dragend="dragTaskEnd()" draggable @click="goToTask(tIndex)" class="navTask" :class="{
 
                           @dragend="dragTaskEnd()" draggable @click="goToTask(tIndex)" class="navTask" :class="{
 
                             isNavTask:
 
                             isNavTask:
 
                               isClickColor > 0 && isClickColor == tIndex + 1,
 
                               isClickColor > 0 && isClickColor == tIndex + 1,
 
                             isNavOpen: t.toolOpen,
 
                             isNavOpen: t.toolOpen,
 
-                            // dragOver: newIndex === tIndex
 
                           }">
 
                           }">
 
                           <div style="left: 8px;" class="chapter_upload_drag"></div>
 
                           <div style="left: 8px;" class="chapter_upload_drag"></div>
 
                           <div class="nt_taskBox">
 
                           <div class="nt_taskBox">
 
@@ -232,17 +236,20 @@
 
                             item.taskJson[0].chapterData.length == 0
 
                             item.taskJson[0].chapterData.length == 0
 
                             "><img src="../../../assets/icon/new/c_none.png" alt /><span>请添加学习内容</span></div>
 
                             "><img src="../../../assets/icon/new/c_none.png" alt /><span>请添加学习内容</span></div>
 
                           <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
                           <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
-                            <div @dragstart="dragStart(item1, index1, 0)" @dragover.prevent="dragOver(index1)"
 
+                            <div @dragstart="dragStart(item1, index1, 0)" @dragover.prevent="dragOver(index1, 0)"
 
                               @dragend="dragEnd()" draggable class="chapter_upload" v-for="(item1, index1) in item.taskJson[0]
 
                               @dragend="dragEnd()" draggable class="chapter_upload" v-for="(item1, index1) in item.taskJson[0]
 
                                 .chapterData" :key="item1.id" @click="
 
                                 .chapterData" :key="item1.id" @click="
 
-    getChapterData(
 
-      $event,
 
-      unitIndex,
 
-      index,
 
-      index1,
 
-      item1.type
 
-    )
 
-    ">
 
+                              getChapterData(
 
+                                $event,
 
+                                unitIndex,
 
+                                index,
 
+                                index1,
 
+                                item1.type
 
+                              )
 
+                              " :class="{
 
+                                dragOverTop2: newIndex === index1 && typeIndex == 'chapter-'+'0'+'-'+index1 && oldIndex > index1,
 
+                                dragOverBottom2: newIndex === index1 && typeIndex == 'chapter-'+'0'+'-'+index1 && oldIndex < index1,
 
+                              }">
 
                               <div class="chapter_upload_drag"></div>
 
                               <div class="chapter_upload_drag"></div>
 
                               <div class="chapter_upload_t" style="width: 100%"></div>
 
                               <div class="chapter_upload_t" style="width: 100%"></div>
 
                               <div class="chapter_upload_o" style="
 
                               <div class="chapter_upload_o" style="
 
@@ -560,15 +567,33 @@
 
                                   其他
 
                                   其他
 
                                 </div> -->
 
                                 </div> -->
 
                               </div>
 
                               </div>
 
+                              <div class="chapter_upload_ud2" style="z-index: 99;margin:0 0 0 auto" v-if="itemTask.toolChoose.length > 1">
 
+                                  <div class="chapter_upload_up2" @click.stop="
 
+                                      upTool(
 
+                                        $event,
 
+                                        unitIndex,
 
+                                        itemTaskIndex, 
+                                        toolIndex
 
+                                      )
 
+                                  ">上移</div>
 
+                                  <div class="chapter_upload_down2" @click.stop="
 
+                                      downTool(
 
+                                        $event,
 
+                                        unitIndex,
 
+                                        itemTaskIndex, 
+                                        toolIndex
 
+                                      )
 
+                                  ">下移</div>
 
+                              </div>
 
                               <div v-if="itemTool.isFold3" class="show_toolD show"
 
                               <div v-if="itemTool.isFold3" class="show_toolD show"
 
                                 @click="fold3(itemTaskIndex, toolIndex)"
 
                                 @click="fold3(itemTaskIndex, toolIndex)"
 
-                                :style="{ right: itemTask.toolChoose.length > 1 ? '45px' : '0px' }"><img
 
+                                :style="{ margin: itemTask.toolChoose.length > 1 ? '0px 35px 0px 10px' : '0 0 0 auto' }"><img
 
                                   src="../../../assets/icon/new/icon-slide.png" />收起工具栏</div>
 
                                   src="../../../assets/icon/new/icon-slide.png" />收起工具栏</div>
 
                               <div v-else class="show_toolD" @click="fold3(itemTaskIndex, toolIndex)"
 
                               <div v-else class="show_toolD" @click="fold3(itemTaskIndex, toolIndex)"
 
-                                :style="{ right: itemTask.toolChoose.length > 1 ? '45px' : '0px' }"><img
 
+                                :style="{ margin: itemTask.toolChoose.length > 1 ? '0px 35px 0px 10px' : '0 0 0 auto' }"><img
 
                                   src="../../../assets/icon/new/icon-slide.png" />展开工具栏</div>
 
                                   src="../../../assets/icon/new/icon-slide.png" />展开工具栏</div>
 
                               <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
 
                               <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
 
-                                v-if="itemTask.toolChoose.length > 1" style="position: absolute; right: 0"></div>
 
+                                v-if="itemTask.toolChoose.length > 1" style="position: absolute; right: 0;top:-5px;"></div>
 
                             </div>
 
                             </div>
 
                             <div style="min-height: 163px" v-show="itemTool.isFold3">
 
                             <div style="min-height: 163px" v-show="itemTool.isFold3">
 
                               <div class="toolSort" v-if="itemTool.toolType == 0">
 
                               <div class="toolSort" v-if="itemTool.toolType == 0">
 
@@ -3621,8 +3646,11 @@
 
         <div class="check_class_left">
 
         <div class="check_class_left">
 
           <div class="check_class_all_box">
 
           <div class="check_class_all_box">
 
             <div class="check_class_left_title">选择班级</div>
 
             <div class="check_class_left_title">选择班级</div>
 
-            <div style="display:flex;align-items:center;"><el-checkbox v-model="checkAll"
 
-                @change="handleCheckAllChange" class="all_check">全选</el-checkbox></div>
 
+            <!-- <div style="display:flex;align-items:center;"><el-checkbox v-model="checkAll"
 
+                @change="handleCheckAllChange" class="all_check">全选</el-checkbox></div> -->
 
+          </div>
 
+          <div class="class_item" style="position:absolute; margin:0" v-if="grade2.length">            
+            <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
 
           </div>
 
           </div>
 
           <el-checkbox-group v-model="checkboxList2" class="check_class_item" @change="InviteChange" v-if="grade2.length">
 
           <el-checkbox-group v-model="checkboxList2" class="check_class_item" @change="InviteChange" v-if="grade2.length">
 
             <div v-for="item in grade2" :key="item.id" class="class_item">
 
             <div v-for="item in grade2" :key="item.id" class="class_item">
 
@@ -4824,6 +4852,7 @@ export default {
 
       oldIndex: 0,
 
       oldIndex: 0,
 
       oldData: null,
 
       oldData: null,
 
       newIndex: "",
 
       newIndex: "",
 
+      typeIndex: "",
 
     };
 
     };
 
   },
 
   },
 
   directives: {
 
   directives: {
 
@@ -6662,6 +6691,60 @@ export default {
 
       this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[ic] = a;
 
       this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[ic] = a;
 
       this.$forceUpdate();
 
       this.$forceUpdate();
 
     },
 
     },
 
+    upTool(e, i, j, tooli){
 
+      e.stopPropagation();
 
+      if (tooli == 0) {
 
+        return;
 
+      }
 
+      this.$confirm(
 
+        "切换工具顺序将删除此工具的提交成果，是否继续此操作?",
 
+        "提示",
 
+        {
 
+          confirmButtonText: "确定",
 
+          cancelButtonText: "取消",
 
+          type: "warning",
 
+        }
 
+      )
 
+        .then(() => {
 
+          var a =
 
+          JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli - 1]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli - 1] =
 
+            JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli] = a;
 
+          this.$forceUpdate()
 
+        })
 
+        .catch(() => {
 
+          return;
 
+        });
 
+    },
 
+    downTool(e, i, j, tooli){
 
+      e.stopPropagation();
 
+      if ( tooli ==
 
+        this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose.length -
 
+        1) {
 
+        return;
 
+      }
 
+      this.$confirm(
 
+        "切换工具顺序将删除此工具的提交成果，是否继续此操作?",
 
+        "提示",
 
+        {
 
+          confirmButtonText: "确定",
 
+          cancelButtonText: "取消",
 
+          type: "warning",
 
+        }
 
+      )
 
+        .then(() => {
 
+          var a =
 
+          JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli + 1]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli + 1] =
 
+            JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli] = a;
 
+          this.$forceUpdate()
 
+        })
 
+        .catch(() => {
 
+          return;
 
+        });
 
+    },
 
     addWork() {
 
     addWork() {
 
       let cPan = 1;
 
       let cPan = 1;
 
       for (var i = 0; i < this.unitJson.length; i++) {
 
       for (var i = 0; i < this.unitJson.length; i++) {
 
@@ -9791,7 +9874,8 @@ export default {
 
       this.oldIndex = i;
 
       this.oldIndex = i;
 
       this.oldData = val;
 
       this.oldData = val;
 
     },
 
     },
 
-    dragOver(i) {
 
+    dragOver(i, j) {
 
+      this.typeIndex = "chapter-" + j + '-' + i
 
       this.newIndex = i;
 
       this.newIndex = i;
 
     },
 
     },
 
     dragEnd() {
 
     dragEnd() {
 
@@ -9802,6 +9886,7 @@ export default {
 
       newItems.splice(this.newIndex, 0, this.oldData);
 
       newItems.splice(this.newIndex, 0, this.oldData);
 
       this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].chapterData = [...newItems];
 
       this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].chapterData = [...newItems];
 
       this.newIndex = "";
 
       this.newIndex = "";
 
+      this.typeIndex = "";
 
       this.$forceUpdate()
 
       this.$forceUpdate()
 
     },
 
     },
 
     dragTaskStart(val, i) {
 
     dragTaskStart(val, i) {
 
@@ -9809,10 +9894,13 @@ export default {
 
       this.oldData = val;
 
       this.oldData = val;
 
     },
 
     },
 
     dragTaskOver(i) {
 
     dragTaskOver(i) {
 
+      this.typeIndex = "task-" + i
 
       this.newIndex = i;
 
       this.newIndex = i;
 
     },
 
     },
 
     dragTaskEnd() {
 
     dragTaskEnd() {
 
       if (this.newIndex == this.oldIndex) {
 
       if (this.newIndex == this.oldIndex) {
 
+        this.typeIndex = "";
 
+          this.newIndex = "";
 
         return;
 
         return;
 
       }
 
       }
 
       this.$confirm(
 
       this.$confirm(
 
@@ -9839,10 +9927,12 @@ export default {
 
             newItems[0].chapterData = chapterData
 
             newItems[0].chapterData = chapterData
 
           }
 
           }
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson = [...newItems];
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson = [...newItems];
 
+          this.typeIndex = "";
 
           this.newIndex = "";
 
           this.newIndex = "";
 
           this.$forceUpdate()
 
           this.$forceUpdate()
 
         })
 
         })
 
         .catch(() => {
 
         .catch(() => {
 
+          this.typeIndex = "";
 
           this.newIndex = "";
 
           this.newIndex = "";
 
           return;
 
           return;
 
         });
 
         });
 
@@ -10368,9 +10458,9 @@ export default {
 
   font-size: 14px;
 
   font-size: 14px;
 
   cursor: pointer;
 
   cursor: pointer;
 
   color: #717C8D;
 
   color: #717C8D;
 
-  position: absolute;
 
+  /* position: absolute;
 
   right: 45px;
 
   right: 45px;
 
-  top: 5px;
 
+  top: 5px; */
 
 }
 
 }
 
 
 
 .show_toolD>img {
 
 .show_toolD>img {
 
@@ -11104,6 +11194,50 @@ export default {
 
   margin-bottom: 5px;
 
   margin-bottom: 5px;
 
 }
 
 }
 
 
 
+
 
+.chapter_upload_ud2 {
 
+  display: flex;
 
+  flex-direction: row;
 
+  justify-content: center;
 
+  margin: 0 10px 0 0;
 
+}
 
+
 
+.chapter_upload_ud2>.chapter_upload_up2 {
 
+  margin-bottom: 0;
 
+  margin-right: 10px;
 
+}
 
+
 
+
 
+.chapter_upload_down2,
 
+.chapter_upload_up2 {
 
+  cursor: pointer;
 
+  margin: 0 auto;
 
+  border-radius: 5px;
 
+  display: flex;
 
+  justify-content: center;
 
+  align-items: center;
 
+  color: #717C8D;
 
+  font-size: 14px;
 
+}
 
+.chapter_upload_up2{
 
+  margin-right:10px;
 
+}
 
+.chapter_upload_up2::before,
 
+.chapter_upload_down2::before {
 
+  content: '';
 
+  background-image: url('../../../assets/icon/new/c_up.png');
 
+  width: 14px;
 
+  height: 14px;
 
+  background-size: 100% 100%;
 
+  display: block;
 
+  margin-right: 5px;
 
+}
 
+
 
+.chapter_upload_up2::before {
 
+  background-image: url('../../../assets/icon/new/c_down.png') !important;
 
+}
 
+
 
+
 
 .addWordStyle {
 
 .addWordStyle {
 
   display: flex;
 
   display: flex;
 
   flex-direction: row;
 
   flex-direction: row;
 
@@ -11893,7 +12027,7 @@ ol {
 
   position: absolute;
 
   position: absolute;
 
   right: 15px;
 
   right: 15px;
 
   bottom: 35px;
 
   bottom: 35px;
 
-  z-index: 9999;
 
+  z-index: 999;
 
 }
 
 }
 
 
 
 .fold {
 
 .fold {
 
@@ -12452,6 +12586,37 @@ ol {
 
   align-items: center;
 
   align-items: center;
 
   font-size: 14px;
 
   font-size: 14px;
 
   color: #6e6e6e;
 
   color: #6e6e6e;
 
+  position:relative;
 
+}
 
+
 
+.cover_p{
 
+  width: 100% !important;
 
+  height: 100%;
 
+  object-fit: cover;
 
+}
 
+
 
+.uploadFm2:hover .cover_mask{
 
+  display: flex !important;
 
+}
 
+
 
+.cover_mask{
 
+  display:none;
 
+  width:100%;
 
+  height:100%;
 
+  position:absolute;
 
+  background:#00000054;
 
+  align-items: center;
 
+  justify-content: center;
 
+  flex-direction: column;
 
+}
 
+
 
+.cover_mask > img{
 
+  width: 30px;
 
+}
 
+
 
+.cover_mask > span{
 
+  color: #fff;
 
+  font-size: 12px;
 
 }
 
 }
 
 
 
 .uploadFm>img {
 
 .uploadFm>img {
 
@@ -12989,8 +13154,26 @@ ol {
 
   background-image: url(../../../assets/icon/new/icon_arrow_a.png) !important;
 
   background-image: url(../../../assets/icon/new/icon_arrow_a.png) !important;
 
 }
 
 }
 
 
 
-.dragOver {
 
-  background: red !important;
 
+.dragOverTop {
 
+  border-top: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+  margin-top: 10px;
 
+}
 
+
 
+.dragOverBottom {
 
+  border-bottom: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+  margin-top: 10px;
 
+}
 
+
 
+.dragOverTop2 {
 
+  border-top: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+}
 
+
 
+.dragOverBottom2 {
 
+  border-bottom: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
 }
 
 }
 
 
 
 .isNavTask {
 
 .isNavTask {
 
@@ -13484,6 +13667,9 @@ ol {
 
   align-content: flex-start;
 
   align-content: flex-start;
 
 }
 
 }
 
 
 
+.class_item:first-child {
 
+  margin: 0 15px 15px 67px;
 
+}
 
 .class_item {
 
 .class_item {
 
   margin: 0 15px 15px 0;
 
   margin: 0 15px 15px 0;

+ 5 - 3
src/components/pages/synergyCourse/course.vue
Целия файл 

@@ -890,7 +890,9 @@ export default {
 
       this.ajax
 
       this.ajax
 
         .get(this.$store.state.api + "selectSynergyCourse", params)
 
         .get(this.$store.state.api + "selectSynergyCourse", params)
 
         .then((res) => {
 
         .then((res) => {
 
-          this.loading.close();
 
+          if (this.loading) {
 
+            this.loading.close();
 
+          }
 
           this.loading = "";
 
           this.loading = "";
 
           this.isLoading = false;
 
           this.isLoading = false;
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
@@ -1489,8 +1491,8 @@ export default {
 
   overflow: hidden;
 
   overflow: hidden;
 
   text-overflow: ellipsis;
 
   text-overflow: ellipsis;
 
   white-space: nowrap;
 
   white-space: nowrap;
 
-  /* font-weight: bold; */
 
-  font-size: 24px;
 
+  font-weight: bold;
 
+  font-size: 16px;
 
 }
 
 }
 
 
 
 .bottom_box>div:nth-child(1)>span:nth-child(2) {
 
 .bottom_box>div:nth-child(1)>span:nth-child(2) {

+ 204 - 18
src/components/pages/task/addCourse.vue
Целия файл 

@@ -92,16 +92,18 @@
 
                     </div> -->
 
                     </div> -->
 
                       <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">上传封面</div>
 
                       <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">上传封面</div>
 
                       <div style="width: 100%;">
 
                       <div style="width: 100%;">
 
-                        <div class="uploadFm" @click="choosePicVisible = true" v-if="cover.length == 0">
 
-                          <img src="../../../assets/icon/addPoster.png" alt="" />
 
-                          <div>点击添加封面</div>
 
+                        <div class="uploadFm" @click="choosePicVisible = true" :class="{uploadFm2:cover.length}">
 
+                          <img src="../../../assets/icon/addPoster.png" alt="" v-if="cover.length == 0"/>
 
+                          <img :src="cover[0].url" alt="" class="cover_p" v-else/>
 
+                          <div v-if="cover.length == 0">点击添加封面</div>
 
+                          <div class="cover_mask"><img src="../../../assets/icon/new/cover_update.png" /><span style="margin-top:5px;">修改封面</span></div>
 
                         </div>
 
                         </div>
 
-                        <el-upload :class="{ disUoloadSty: noneBtnImg }" class="upCss" action="#" list-type="picture"
 
+                        <!-- <el-upload :class="{ disUoloadSty: noneBtnImg }" class="upCss" action="#" list-type="picture"
 
                           v-loading="uploadLoading1" :http-request="beforeUpload1" ref="upload1"
 
                           v-loading="uploadLoading1" :http-request="beforeUpload1" ref="upload1"
 
                           :on-preview="handlePictureCardPreview" :on-remove="handle_remove1" :show-file-list="true"
 
                           :on-preview="handlePictureCardPreview" :on-remove="handle_remove1" :show-file-list="true"
 
                           :file-list="cover" accept="image/*" :limit="1" :on-exceed="onExceed" v-else>
 
                           :file-list="cover" accept="image/*" :limit="1" :on-exceed="onExceed" v-else>
 
                           <i class="el-icon-plus"></i>
 
                           <i class="el-icon-plus"></i>
 
-                        </el-upload>
 
+                        </el-upload> -->
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                   </div>
 
                   </div>
 
@@ -163,7 +165,10 @@
 
                     <!-- <div class="navTop">辅助导航</div> -->
 
                     <!-- <div class="navTop">辅助导航</div> -->
 
                     <div class="navBottom" :style="{ height: heightPx }">
 
                     <div class="navBottom" :style="{ height: heightPx }">
 
                       <div v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
                       <div v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
-                        .taskJson" :key="tIndex">
 
+                        .taskJson" :key="tIndex" :class="{
 
+                          dragOverTop: newIndex === tIndex && typeIndex == 'task-'+tIndex && oldIndex > tIndex,
 
+                          dragOverBottom: newIndex === tIndex && typeIndex == 'task-'+tIndex && oldIndex < tIndex,
 
+                        }">
 
                         <div @dragstart="dragTaskStart(t, tIndex)" @dragover.prevent="dragTaskOver(tIndex)"
 
                         <div @dragstart="dragTaskStart(t, tIndex)" @dragover.prevent="dragTaskOver(tIndex)"
 
                           @dragend="dragTaskEnd()" draggable @click="goToTask(tIndex)" class="navTask" :class="{
 
                           @dragend="dragTaskEnd()" draggable @click="goToTask(tIndex)" class="navTask" :class="{
 
                           isNavTask:
 
                           isNavTask:
 
@@ -283,7 +288,7 @@
 
                             itemTask.chapterData.length == 0
 
                             itemTask.chapterData.length == 0
 
                             "><img src="../../../assets/icon/new/c_none.png" alt /><span>请添加学习内容</span></div>
 
                             "><img src="../../../assets/icon/new/c_none.png" alt /><span>请添加学习内容</span></div>
 
                           <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
                           <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
-                            <div @dragstart="dragStart(item1, index1, itemTaskIndex)" @dragover.prevent="dragOver(index1)"
 
+                            <div @dragstart="dragStart(item1, index1, itemTaskIndex)" @dragover.prevent="dragOver(index1,itemTaskIndex)"
 
                               @dragend="dragEnd()" draggable class="chapter_upload"
 
                               @dragend="dragEnd()" draggable class="chapter_upload"
 
                               v-for="(item1, index1) in itemTask.chapterData" :key="item1.id" @click="
 
                               v-for="(item1, index1) in itemTask.chapterData" :key="item1.id" @click="
 
                                 getChapterData(
 
                                 getChapterData(
 
@@ -293,7 +298,10 @@
 
                                   index1,
 
                                   index1,
 
                                   item1.type
 
                                   item1.type
 
                                 )
 
                                 )
 
-                                ">
 
+                                " :class="{
 
+                                dragOverTop2: newIndex === index1 && typeIndex == 'chapter-'+itemTaskIndex+'-'+index1 && oldIndex > index1,
 
+                                dragOverBottom2: newIndex === index1 && typeIndex == 'chapter-'+itemTaskIndex+'-'+index1 && oldIndex < index1,
 
+                              }">
 
                               <div class="chapter_upload_drag"></div>
 
                               <div class="chapter_upload_drag"></div>
 
                               <div class="chapter_upload_t" style="width: 100%"></div>
 
                               <div class="chapter_upload_t" style="width: 100%"></div>
 
                               <div class="chapter_upload_o" style="
 
                               <div class="chapter_upload_o" style="
 
@@ -561,15 +569,33 @@
 
                                   其他
 
                                   其他
 
                                 </div> -->
 
                                 </div> -->
 
                               </div>
 
                               </div>
 
+                              <div class="chapter_upload_ud2" style="z-index: 99;margin:0 0 0 auto" v-if="itemTask.toolChoose.length > 1">
 
+                                  <div class="chapter_upload_up2" @click.stop="
 
+                                      upTool(
 
+                                        $event,
 
+                                        unitIndex,
 
+                                        itemTaskIndex, 
+                                        toolIndex
 
+                                      )
 
+                                  ">上移</div>
 
+                                  <div class="chapter_upload_down2" @click.stop="
 
+                                      downTool(
 
+                                        $event,
 
+                                        unitIndex,
 
+                                        itemTaskIndex, 
+                                        toolIndex
 
+                                      )
 
+                                  ">下移</div>
 
+                              </div>
 
                               <div v-if="itemTool.isFold3" class="show_toolD show"
 
                               <div v-if="itemTool.isFold3" class="show_toolD show"
 
                                 @click="fold3(itemTaskIndex, toolIndex)"
 
                                 @click="fold3(itemTaskIndex, toolIndex)"
 
-                                :style="{ right: itemTask.toolChoose.length > 1 ? '45px' : '0px' }"><img
 
+                                :style="{ margin: itemTask.toolChoose.length > 1 ? '0px 35px 0px 10px' : '0 0 0 auto' }"><img
 
                                   src="../../../assets/icon/new/icon-slide.png" />收起工具栏</div>
 
                                   src="../../../assets/icon/new/icon-slide.png" />收起工具栏</div>
 
                               <div v-else class="show_toolD" @click="fold3(itemTaskIndex, toolIndex)"
 
                               <div v-else class="show_toolD" @click="fold3(itemTaskIndex, toolIndex)"
 
-                                :style="{ right: itemTask.toolChoose.length > 1 ? '45px' : '0px' }"><img
 
+                                :style="{ margin: itemTask.toolChoose.length > 1 ? '0px 35px 0px 10px' : '0 0 0 auto' }"><img
 
                                   src="../../../assets/icon/new/icon-slide.png" />展开工具栏</div>
 
                                   src="../../../assets/icon/new/icon-slide.png" />展开工具栏</div>
 
                               <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
 
                               <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
 
-                                v-if="itemTask.toolChoose.length > 1" style="position: absolute; right: 0"></div>
 
+                                v-if="itemTask.toolChoose.length > 1" style="position: absolute; right: 0;top:-5px;"></div>
 
                             </div>
 
                             </div>
 
 
 
                             <div style="min-height: 163px" v-show="itemTool.isFold3">
 
                             <div style="min-height: 163px" v-show="itemTool.isFold3">
 
@@ -3937,8 +3963,11 @@
 
         <div class="check_class_left">
 
         <div class="check_class_left">
 
           <div class="check_class_all_box">
 
           <div class="check_class_all_box">
 
             <div class="check_class_left_title">选择班级</div>
 
             <div class="check_class_left_title">选择班级</div>
 
-            <div style="display:flex;align-items:center;"><el-checkbox v-model="checkAll"
 
-                @change="handleCheckAllChange" class="all_check">全选</el-checkbox></div>
 
+            <!-- <div style="display:flex;align-items:center;"><el-checkbox v-model="checkAll"
 
+                @change="handleCheckAllChange" class="all_check">全选</el-checkbox></div> -->
 
+          </div>
 
+          <div class="class_item" style="position:absolute; margin:0" v-if="grade2.length">            
+            <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
 
           </div>
 
           </div>
 
           <el-checkbox-group v-model="checkboxList2" class="check_class_item" @change="InviteChange" v-if="grade2.length">
 
           <el-checkbox-group v-model="checkboxList2" class="check_class_item" @change="InviteChange" v-if="grade2.length">
 
             <div v-for="item in grade2" :key="item.id" class="class_item">
 
             <div v-for="item in grade2" :key="item.id" class="class_item">
 
@@ -5163,6 +5192,7 @@ export default {
 
       oldData: null,
 
       oldData: null,
 
       newIndex: "",
 
       newIndex: "",
 
       englishList:{},
 
       englishList:{},
 
+      typeIndex: "",
 
     };
 
     };
 
   },
 
   },
 
   directives: {
 
   directives: {
 
@@ -6988,6 +7018,60 @@ export default {
 
       this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[ic] = a;
 
       this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[ic] = a;
 
       this.$forceUpdate();
 
       this.$forceUpdate();
 
     },
 
     },
 
+    upTool(e, i, j, tooli){
 
+      e.stopPropagation();
 
+      if (tooli == 0) {
 
+        return;
 
+      }
 
+      this.$confirm(
 
+        "切换工具顺序将删除此工具的提交成果，是否继续此操作?",
 
+        "提示",
 
+        {
 
+          confirmButtonText: "确定",
 
+          cancelButtonText: "取消",
 
+          type: "warning",
 
+        }
 
+      )
 
+        .then(() => {
 
+          var a =
 
+          JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli - 1]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli - 1] =
 
+            JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli] = a;
 
+          this.$forceUpdate()
 
+        })
 
+        .catch(() => {
 
+          return;
 
+        });
 
+    },
 
+    downTool(e, i, j, tooli){
 
+      e.stopPropagation();
 
+      if ( tooli ==
 
+        this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose.length -
 
+        1) {
 
+        return;
 
+      }
 
+      this.$confirm(
 
+        "切换工具顺序将删除此工具的提交成果，是否继续此操作?",
 
+        "提示",
 
+        {
 
+          confirmButtonText: "确定",
 
+          cancelButtonText: "取消",
 
+          type: "warning",
 
+        }
 
+      )
 
+        .then(() => {
 
+          var a =
 
+          JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli + 1]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli + 1] =
 
+            JSON.parse(JSON.stringify(this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli]));
 
+          this.unitJson[i].chapterInfo[0].taskJson[j].toolChoose[tooli] = a;
 
+          this.$forceUpdate()
 
+        })
 
+        .catch(() => {
 
+          return;
 
+        });
 
+    },
 
     addWork() {
 
     addWork() {
 
       let cPan = 1;
 
       let cPan = 1;
 
       for (var i = 0; i < this.unitJson.length; i++) {
 
       for (var i = 0; i < this.unitJson.length; i++) {
 
@@ -10087,7 +10171,8 @@ export default {
 
       this.oldIndex = i;
 
       this.oldIndex = i;
 
       this.oldData = val;
 
       this.oldData = val;
 
     },
 
     },
 
-    dragOver(i) {
 
+    dragOver(i, j) {
 
+      this.typeIndex = "chapter-" + j + '-' + i
 
       this.newIndex = i;
 
       this.newIndex = i;
 
     },
 
     },
 
     dragEnd() {
 
     dragEnd() {
 
@@ -10097,6 +10182,7 @@ export default {
 
       // 在列表中目标位置增加新的节点
 
       // 在列表中目标位置增加新的节点
 
       newItems.splice(this.newIndex, 0, this.oldData);
 
       newItems.splice(this.newIndex, 0, this.oldData);
 
       this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].chapterData = [...newItems];
 
       this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].chapterData = [...newItems];
 
+      this.typeIndex = "";
 
       this.newIndex = "";
 
       this.newIndex = "";
 
       this.$forceUpdate()
 
       this.$forceUpdate()
 
     },
 
     },
 
@@ -10105,10 +10191,13 @@ export default {
 
       this.oldData = val;
 
       this.oldData = val;
 
     },
 
     },
 
     dragTaskOver(i) {
 
     dragTaskOver(i) {
 
+      this.typeIndex = "task-" + i
 
       this.newIndex = i;
 
       this.newIndex = i;
 
     },
 
     },
 
     dragTaskEnd() {
 
     dragTaskEnd() {
 
       if(this.newIndex == this.oldIndex){
 
       if(this.newIndex == this.oldIndex){
 
+        this.newIndex = "";
 
+        this.typeIndex = "";
 
         return;
 
         return;
 
       }
 
       }
 
       this.$confirm(
 
       this.$confirm(
 
@@ -10127,10 +10216,12 @@ export default {
 
           // 在列表中目标位置增加新的节点
 
           // 在列表中目标位置增加新的节点
 
           newItems.splice(this.newIndex, 0, this.oldData);
 
           newItems.splice(this.newIndex, 0, this.oldData);
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson = [...newItems];
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson = [...newItems];
 
+          this.typeIndex = "";
 
           this.newIndex = "";
 
           this.newIndex = "";
 
           this.$forceUpdate()
 
           this.$forceUpdate()
 
         })
 
         })
 
         .catch(() => {
 
         .catch(() => {
 
+          this.typeIndex = "";
 
           this.newIndex = "";
 
           this.newIndex = "";
 
           return;
 
           return;
 
         });
 
         });
 
@@ -10655,9 +10746,9 @@ export default {
 
   font-size: 14px;
 
   font-size: 14px;
 
   cursor: pointer;
 
   cursor: pointer;
 
   color: #717C8D;
 
   color: #717C8D;
 
-  position: absolute;
 
+  /* position: absolute;
 
   right: 45px;
 
   right: 45px;
 
-  top: 5px;
 
+  top: 5px; */
 
 }
 
 }
 
 
 
 .show_toolD>img {
 
 .show_toolD>img {
 
@@ -11395,7 +11486,47 @@ export default {
 
   margin-bottom: 5px;
 
   margin-bottom: 5px;
 
 }
 
 }
 
 
 
+.chapter_upload_ud2 {
 
+  display: flex;
 
+  flex-direction: row;
 
+  justify-content: center;
 
+  margin: 0 10px 0 0;
 
+}
 
+
 
+.chapter_upload_ud2>.chapter_upload_up2 {
 
+  margin-bottom: 0;
 
+  margin-right: 10px;
 
+}
 
+
 
+
 
+.chapter_upload_down2,
 
+.chapter_upload_up2 {
 
+  cursor: pointer;
 
+  margin: 0 auto;
 
+  border-radius: 5px;
 
+  display: flex;
 
+  justify-content: center;
 
+  align-items: center;
 
+  color: #717C8D;
 
+  font-size: 14px;
 
+}
 
+.chapter_upload_up2{
 
+  margin-right:10px;
 
+}
 
+.chapter_upload_up2::before,
 
+.chapter_upload_down2::before {
 
+  content: '';
 
+  background-image: url('../../../assets/icon/new/c_up.png');
 
+  width: 14px;
 
+  height: 14px;
 
+  background-size: 100% 100%;
 
+  display: block;
 
+  margin-right: 5px;
 
+}
 
 
 
+.chapter_upload_up2::before {
 
+  background-image: url('../../../assets/icon/new/c_down.png') !important;
 
+}
 
 
 
 .addWordStyle {
 
 .addWordStyle {
 
   display: flex;
 
   display: flex;
 
@@ -12184,7 +12315,7 @@ ol {
 
   position: absolute;
 
   position: absolute;
 
   right: 15px;
 
   right: 15px;
 
   bottom: 35px;
 
   bottom: 35px;
 
-  z-index: 9999;
 
+  z-index: 999;
 
 }
 
 }
 
 
 
 .fold {
 
 .fold {
 
@@ -12742,6 +12873,37 @@ ol {
 
   align-items: center;
 
   align-items: center;
 
   font-size: 14px;
 
   font-size: 14px;
 
   color: #6e6e6e;
 
   color: #6e6e6e;
 
+  position:relative;
 
+}
 
+
 
+.cover_p{
 
+  width: 100% !important;
 
+  height: 100%;
 
+  object-fit: cover;
 
+}
 
+
 
+.uploadFm2:hover .cover_mask{
 
+  display: flex !important;
 
+}
 
+
 
+.cover_mask{
 
+  display:none;
 
+  width:100%;
 
+  height:100%;
 
+  position:absolute;
 
+  background:#00000054;
 
+  align-items: center;
 
+  justify-content: center;
 
+  flex-direction: column;
 
+}
 
+
 
+.cover_mask > img{
 
+  width: 30px;
 
+}
 
+
 
+.cover_mask > span{
 
+  color: #fff;
 
+  font-size: 12px;
 
 }
 
 }
 
 
 
 .uploadFm>img {
 
 .uploadFm>img {
 
@@ -13279,6 +13441,28 @@ ol {
 
   background-image: url(../../../assets/icon/new/icon_arrow_a.png) !important;
 
   background-image: url(../../../assets/icon/new/icon_arrow_a.png) !important;
 
 }
 
 }
 
 
 
+.dragOverTop {
 
+  border-top: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+  margin-top: 10px;
 
+}
 
+
 
+.dragOverBottom {
 
+  border-bottom: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+  margin-top: 10px;
 
+}
 
+
 
+.dragOverTop2 {
 
+  border-top: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+}
 
+
 
+.dragOverBottom2 {
 
+  border-bottom: 2px solid #0061FF !important;
 
+  border-radius: 0 !important;
 
+}
 
+
 
 .isNavTask {
 
 .isNavTask {
 
   /* background: #3681FC; */
 
   /* background: #3681FC; */
 
   background: #EEF3FB;
 
   background: #EEF3FB;
 
@@ -13756,7 +13940,6 @@ ol {
 
 .check_class_left_title {
 
 .check_class_left_title {
 
   font-size: 16px;
 
   font-size: 16px;
 
   font-weight: 700;
 
   font-weight: 700;
 
-  margin-bottom: 10px;
 
 }
 
 }
 
 
 
 .check_class_item {
 
 .check_class_item {
 
@@ -13769,6 +13952,9 @@ ol {
 
   align-content: flex-start;
 
   align-content: flex-start;
 
 }
 
 }
 
 
 
+.class_item:first-child {
 
+  margin: 0 15px 15px 67px;
 
+}
 
 .class_item {
 
 .class_item {
 
   margin: 0 15px 15px 0;
 
   margin: 0 15px 15px 0;

+ 151 - 0
src/components/pages/test/add/addTest.vue
Целия файл 

@@ -0,0 +1,151 @@
 
+<template>
 
+    <div class="pb_content" style="background: #F0F2F5;">
 
+        <div class="pb_content_body" style="position: relative; margin: 0">
 
+            <div class="right">
 
+                <div class="courseTop">
 
+                    <div class="stepsNav">
 
+                        <el-breadcrumb separator-class="el-icon-arrow-right">
 
+                            <el-breadcrumb-item :to="{
 
+                                path:
 
+                                    '/test?userid=' +
 
+                                    userid +
 
+                                    '&oid=' +
 
+                                    oid +
 
+                                    '&org=' +
 
+                                    org +
 
+                                    '&role=' +
 
+                                    role,
 
+                            }">评测管理</el-breadcrumb-item>
 
+                            <el-breadcrumb-item>
 
+                                <span style="color: rgb(15, 126, 255)">新建评测</span>
 
+                            </el-breadcrumb-item>
 
+                        </el-breadcrumb>
 
+                    </div>
 
+                    <div class="r_pub_button_retrun" @click="retrunCourse">返回</div>
 
+                </div>
 
+                <div class="step_box">
 
+                    <setInfo v-if="steps == 1" :oid="oid" :org="org"></setInfo>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+import setInfo from './setInfo/index.vue'
 
+export default {
 
+    components: {
 
+        setInfo,
 
+    },
 
+    data() {
 
+        return {
 
+            userid: this.$route.query.userid,
 
+            oid: this.$route.query.oid,
 
+            org: this.$route.query.org,
 
+            role: this.$route.query.role,
 
+            steps:1,
 
+        }
 
+    },
 
+    methods: {
 
+        retrunCourse() {
 
+            this
 
+                .$confirm("是否保存已编辑内容？", "提示", {
 
+                    confirmButtonText: "保存",
 
+                    cancelButtonText: "不保存",
 
+                    distinguishCancelAndClose: true,
 
+                    type: "warning",
 
+                })
 
+                .then(() => {
 
+                    //   if (this.cid == "" || this.cid == undefined) {
 
+                    //     if (this.courseName == "") {
 
+                    //       this.$message.error("请补充填写课程名称");
 
+                    //       return;
 
+                    //     } else {
 
+                    //       this.addWork();
 
+                    //     }
 
+                    //     this.steps = 4
 
+                    //   } else {
 
+                    //     if (this.courseName == "") {
 
+                    //       this.$message.error("请补充填写课程名称");
 
+                    //       return;
 
+                    //     } else {
 
+                    //       if (this.userid != this.courseUserid && this.role != "1") {
 
+                    //         this.updateWork2();
 
+                    //       } else {
 
+                    //         this.updateWork();
 
+                    //       }
 
+                    //       this.steps = 4
 
+                    //     }
 
+                    //   }
 
+                })
 
+                .catch((v) => {
 
+                    console.log(v)
 
+                    if (v == "cancel") {
 
+                        this.goTo(
 
+                            "/test?userid=" +
 
+                            this.userid +
 
+                            "&oid=" +
 
+                            this.oid +
 
+                            "&org=" +
 
+                            this.org +
 
+                            "&role=" +
 
+                            this.role
 
+                        );
 
+                    }
 
+                });
 
+        },
 
+        goTo(path) {
 
+            this.$router.push(path);
 
+        },
 
+    },
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.pb_content {
 
+    height: 100% !important;
 
+    /* margin: 0 20px 0 20px; */
 
+}
 
+
 
+.pb_content_body {
 
+    width: 100% !important;
 
+    height: 100%;
 
+}
 
+
 
+.right {
 
+    height: 100%;
 
+    width: 100%;
 
+    display: flex;
 
+    overflow: hidden;
 
+    flex-direction: column;
 
+}
 
+
 
+.basic_box {
 
+    margin: 0 auto;
 
+    position: relative;
 
+    padding: 0 20px 0 20px;
 
+}
 
+
 
+.courseTop {
 
+    display: flex;
 
+    flex-direction: row;
 
+    justify-content: space-between;
 
+    align-items: center;
 
+    width: calc(100% - 40px);
 
+    margin: 0 auto;
 
+    padding: 10px 0;
 
+}
 
+
 
+.stepsNav {
 
+    display: flex;
 
+    flex-direction: row;
 
+    justify-content: flex-start;
 
+    align-items: center;
 
+}
 
+
 
+.step_box{
 
+    width: calc(100% - 40px);
 
+    margin: 0 auto;
 
+    height: calc(100% - 38px);
 
+}
 
+</style>

+ 369 - 0
src/components/pages/test/add/setInfo/index.vue
Целия файл 

@@ -0,0 +1,369 @@
 
+<template>
 
+    <div class="rightBox">
 
+        <div class="whiteBg" style="background:unset;padding: 0;">
 
+            <div>
 
+                <div class="basic_box" style="padding: 0;">
 
+                    <div class="big_box">
 
+                        <div class="left_first">
 
+                            <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">设置基础信息</div>
 
+                            <div>
 
+                                <div style="width: 100%;">
 
+                                    <div class="course_input_box">
 
+                                        <div class="bb_courseIcon"><img src="../../../../../assets/icon/new/course.png" />
 
+                                        </div>
 
+                                        <input type="text" placeholder="请输入课程名称" class="binfo_input" v-model="courseName"
 
+                                            style="border: 1.5px solid rgb(202, 209, 220);margin: 0px 10px 0px 0px;border-radius: 5px;font-weight: 600;padding: 12px 14px 12px 71px;" />
 
+                                        <el-switch v-model="isTeacherSee" active-text="允许学生回答后查看正确答案"
 
+                                            style="justify-content: center;"></el-switch>
 
+                                    </div>
 
+                                </div>
 
+                            </div>
 
+                            <div class="both">
 
+                                <div class="choose">
 
+                                    <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index">
 
+                                        <span v-if="CourseTypeJson[item.id].length > 0">{{ item.name }}:</span>
 
+                                        <el-checkbox-group v-model="courseTypeId" v-if="CourseTypeJson[item.id].length > 0">
 
+                                            <el-checkbox v-for="item1 in CourseTypeJson[item.id]" :key="item1.id"
 
+                                                :label="item1.id">{{
 
+                                                    item1.name }}</el-checkbox>
 
+                                        </el-checkbox-group>
 
+                                    </div>
 
+                                </div>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="whiteBg" style="background:#fff;margin: 10px 0;min-height: 300px;">
 
+            <div class="whiteBg" style="border-radius: 0">
 
+                <div class="c_info_title">创建评测内容</div>
 
+                <div class="c_info_box">
 
+                    <div class="c_info_tab">
 
+                        <span :class="{ active: type == 1 }" @click="type = 1">智能创建</span>
 
+                        <span :class="{ active: type == 2 }" @click="type = 2">手动创建</span>
 
+                        <span :class="{ active: type == 3 }" @click="type = 3">题库导入</span>
 
+                    </div>
 
+                    <div class="c_info_tab_box"></div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    props: {
 
+        oid: {
 
+            type: String,
 
+        },
 
+        org: {
 
+            type: String,
 
+        },
 
+    },
 
+    data() {
 
+        return {
 
+            CourseType: [],
 
+            courseTypeId: [],
 
+            CourseTypeJson: {},
 
+            courseName: "",
 
+            isTeacherSee: false,
 
+            type: 1,
 
+        }
 
+    },
 
+    methods: {
 
+        selectAllType() {
 
+            let params = {
 
+                org: this.org && this.org != "" ? this.org : "",
 
+                oid: this.oid && this.oid != "" ? this.oid : "",
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectAllTypeT", params)
 
+                .then((res) => {
 
+                    this.CourseType = res.data;
 
+                    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 == "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 = "学科";
 
+                        }
 
+                    }
 
+                    let _courseTypeId = [];
 
+                    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 (res.data[2].length == 0 && res.data[3].length == 0) {
 
+                            for (var j = 0; j < res.data[1].length; j++) {
 
+                                if (
 
+                                    this.courseTypeId.indexOf(res.data[1][j].id) != -1 &&
 
+                                    _courseTypeId.indexOf(res.data[1][j].id) == -1
 
+                                ) {
 
+                                    _courseTypeId.push(res.data[1][j].id);
 
+                                }
 
+                                if (res.data[0][i].id == res.data[1][j].pid) {
 
+                                    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 (
 
+                                        this.courseTypeId.indexOf(res.data[2][j].id) != -1 &&
 
+                                        _courseTypeId.indexOf(res.data[2][j].id) == -1
 
+                                    ) {
 
+                                        _courseTypeId.push(res.data[2][j].id);
 
+                                    }
 
+                                    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 (
 
+                                        this.courseTypeId.indexOf(res.data[3][j].id) != -1 &&
 
+                                        _courseTypeId.indexOf(res.data[3][j].id) == -1
 
+                                    ) {
 
+                                        _courseTypeId.push(res.data[3][j].id);
 
+                                    }
 
+                                    if (res.data[0][i].id == res.data[3][j].pid) {
 
+                                        this.CourseTypeJson[res.data[0][i].id].push(res.data[3][j]); // 去除公共分类
 
+                                    }
 
+                                }
 
+                            }
 
+                        }
 
+                    }
 
+                    this.courseTypeId = _courseTypeId;
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        },
 
+    },
 
+    created() {
 
+        this.selectAllType();
 
+    }
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.rightBox {
 
+    width: calc(100%);
 
+    background: #F0F2F5;
 
+    overflow: auto;
 
+    height: calc(100% - 150px);
 
+    margin: 0 auto;
 
+    position: relative;
 
+    box-sizing: border-box;
 
+}
 
+
 
+.whiteBg {
 
+    /* background: #fff; */
 
+    border-radius: 10px;
 
+}
 
+
 
+.basic_box {
 
+    margin: 0 auto;
 
+    position: relative;
 
+    padding: 0 20px 0 20px;
 
+}
 
+
 
+.big_box {
 
+    /* margin-top: 20px; */
 
+    display: flex;
 
+    justify-content: space-between;
 
+    /* border-bottom: 1px solid #E0E2ED; */
 
+}
 
+
 
+.left_first {
 
+    display: flex;
 
+    flex-direction: column;
 
+    flex-wrap: nowrap;
 
+    width: calc(100%);
 
+    padding: 20px;
 
+    box-sizing: border-box;
 
+    background: #fff;
 
+    border-radius: 5px;
 
+}
 
+
 
+.course_input_box {
 
+    display: flex;
 
+    margin-right: 20px;
 
+    width: 100%;
 
+    align-items: center;
 
+    position: relative;
 
+}
 
+
 
+.course_input_box>.binfo_input {
 
+    width: calc(100% - 290px);
 
+    margin: 0 10px;
 
+}
 
+
 
+.bb_courseIcon {
 
+    width: 57px;
 
+    height: 45px;
 
+    background: #F0F4FA;
 
+    border-radius: 5px 0px 0px 5px;
 
+    display: flex;
 
+    align-items: center;
 
+    justify-content: center;
 
+    border-right: 1.5px solid rgb(202, 209, 220);
 
+    box-sizing: border-box;
 
+    position: absolute;
 
+    left: 1.5px
 
+}
 
+
 
+.bb_courseIcon>img {
 
+    width: 25px;
 
+    height: auto
 
+}
 
+
 
+.all_choose {
 
+    display: flex;
 
+    flex-direction: row;
 
+    align-items: flex-start;
 
+    width: 100%;
 
+}
 
+
 
+.all_choose+.all_choose {
 
+    /* margin-top: 10px */
 
+}
 
+
 
+.all_choose>span {
 
+    min-width: fit-content;
 
+    display: block;
 
+    white-space: nowrap;
 
+    overflow: hidden;
 
+    text-overflow: ellipsis;
 
+    margin-right: 20px;
 
+    font-weight: bold;
 
+    font-size: 14px;
 
+}
 
+
 
+.all_choose>>>.el-checkbox-group {
 
+    display: flex;
 
+    flex-direction: row;
 
+    width: 100%;
 
+    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;
 
+    margin-right: 10px;
 
+}
 
+
 
+.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;
 
+}
 
+
 
+.choose>div:nth-child(3)>span {
 
+    /* letter-spacing: 0 !important; */
 
+}
 
+
 
+.choose {
 
+    display: flex;
 
+    flex-direction: column;
 
+    flex-wrap: nowrap;
 
+    height: 100%;
 
+    justify-content: space-evenly;
 
+    align-items: flex-start;
 
+}
 
+
 
+.both {
 
+    display: flex;
 
+    flex-direction: row;
 
+    flex-wrap: wrap;
 
+    width: 100%;
 
+    align-items: center;
 
+    justify-content: flex-start;
 
+    margin: 15px 0;
 
+}
 
+
 
+.binfo_input {
 
+    width: 100%;
 
+    margin: 0;
 
+    padding: 12px 14px;
 
+    display: block;
 
+    min-width: 0;
 
+    outline: none;
 
+    box-sizing: border-box;
 
+    background: none;
 
+    border: none;
 
+    border-radius: 4px;
 
+    background: #fff;
 
+    font-size: 16px;
 
+    resize: none;
 
+    font-family: 'Microsoft YaHei';
 
+    min-height: 48px;
 
+    border: 1.5px solid #CAD1DC;
 
+}
 
+
 
+.c_info_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;
 
+}
 
+
 
+.c_info_title::before {
 
+    content: '';
 
+    display: block;
 
+    width: 3px;
 
+    height: 20px;
 
+    background: #0061FF;
 
+    border-radius: 3px;
 
+    margin: 0 5px 0 0;
 
+}
 
+
 
+.c_info_box {
 
+    width: 100%;
 
+}
 
+
 
+.c_info_tab {
 
+    display: flex;
 
+    align-items: center;
 
+    justify-content: center;
 
+}
 
+
 
+.c_info_tab>span {
 
+    cursor: pointer;
 
+    padding-bottom: 10px;
 
+    font-weight: bold;
 
+}
 
+
 
+.c_info_tab>span+span {
 
+    margin-left: 20px;
 
+}
 
+
 
+.c_info_tab>.active {
 
+    color: #3e88f4;
 
+    border-bottom: 2px solid #2f80f3;
 
+}
 
+
 
+
 
+.c_info_tab_box {}
 
+</style>

+ 1165 - 0
src/components/pages/test/index.vue
Целия файл 

@@ -0,0 +1,1165 @@
 
+<template>
 
+    <div class="pb_content" style="height: auto">
 
+        <div class="pb_head top">
 
+            <div>
 
+                <span>评测管理</span>
 
+            </div>
 
+            <div class="student_button">
 
+                <el-button type="primary" class="bgColor" @click="goToCourse()">新建评测</el-button>
 
+            </div>
 
+        </div>
 
+        <div class="pb_content_body" style="height: 100%">
 
+            <div class="student_head">
 
+                <div class="choose">
 
+                    <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index">
 
+                        <span v-if="CourseTypeJson[item.id].length">{{ item.name }}</span>
 
+                        <el-select v-if="CourseTypeJson[item.id].length" v-model="courseTypeId[item.id]" placeholder="请选择"
 
+                            @change="getTypeName">
 
+                            <el-option label="全部" value="1">全部</el-option>
 
+                            <el-option v-for="item1 in CourseTypeJson[item.id]" :key="item1.id" :label="item1.name"
 
+                                :value="item1.id">
 
+                            </el-option>
 
+                        </el-select>
 
+                    </div>
 
+                    <div class="student_search">
 
+                        <span>所有者</span>
 
+                        <el-select v-model="groupA" @change="search">
 
+                            <el-option value="0" label="我的"></el-option>
 
+                            <!-- <el-option value="4" label="全部"></el-option> -->
 
+                            <el-option value="2" label="他人"
 
+                                v-if="oid != '1c3b9def-8fbe-11ed-b13d-005056b86db5'"></el-option>
 
+                        </el-select>
 
+                        <!-- <el-select v-model="groupA" @change="search" v-else>
 
+                <el-option value="4" label="全部"></el-option>
 
+              </el-select> -->
 
+                    </div>
 
+                    <div @click="clear" class="clear" v-if="CourseType.length">重置</div>
 
+                </div>
 
+
 
+                <div class="student_right">
 
+                    <div class="head_left">
 
+                        <el-input v-model="courseName" class="student_input" placeholder="请输入项目名称"></el-input>
 
+                        <el-button class="course_button" @click="searchCourse">查询</el-button>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="student_table" v-loading="isLoading">
 
+                <div class="course_box">
 
+                    <div class="out_box" v-for="(item, index) in course" :key="index">
 
+                        <div class="myCourse" v-if="item.userid == userid">
 
+                            我的项目
 
+                        </div>
 
+                        <div class="myCourse" style="background:#4187f0" v-else-if="!item.course_teacher ||
 
+                            (item.course_teacher &&
 
+                                item.course_teacher.indexOf(userid) == -1)">
 
+                            他人项目
 
+                        </div>
 
+                        <div class="xtCourse" v-else>协同项目</div>
 
+                        <div class="tup">
 
+                            <img :src="item.cover != null && item.cover != ''
 
+                                    ? JSON.parse(item.cover).length > 0
 
+                                        ? JSON.parse(item.cover)[0].url
 
+                                        : mr
 
+                                    : mr
 
+                                " alt />
 
+                        </div>
 
+                        <div class="bottom_box">
 
+                            <div>{{ item.title }}</div>
 
+                            <div class="kc_t">
 
+                                创建人：{{ item.uname }}
 
+                            </div>
 
+                            <div class="kc_time">
 
+                                <span style="color: #4b4b4b">创建日期:</span>{{ item.time }}
 
+                            </div>
 
+                            <div class="kc_time">
 
+                                <span style="color: #4b4b4b">修改日期:</span>{{ item.utime }}
 
+                            </div>
 
+                        </div>
 
+                        <div class="three_bottom">
 
+                            <div @click="goToCourse2(item.courseId)" v-if="((item.userid == userid) ||
 
+                                (item.course_teacher &&
 
+                                    item.course_teacher.indexOf(userid) !== -1) || role == '1')">编辑</div>
 
+                            <div @click="get(item.courseId)">预览</div>
 
+                            <!-- 项目进展 -->
 
+                            <div @click="getA(item.courseId)">进展</div>
 
+                            <!-- <div @click="jump(item.courseId)">评论</div> -->
 
+                            <div @click="copyCourse(item.courseId)">复制</div>
 
+                            <div v-if="(item.userid == userid || role == '1')" @click="deleteCourse(item.courseId)">
 
+                                删除
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                    <div class="course_empty" v-if="course.length == 0">暂无数据</div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="student_page">
 
+            <el-pagination background layout="prev, pager, next" :page-size="pageSize" :total="total"
 
+                v-if="page && course.length" style="padding-bottom: 20px"
 
+                @current-change="handleCurrentChange"></el-pagination>
 
+        </div>
 
+        <el-dialog :visible.sync="dialogVisible1" size="tiny">
 
+            <img width="100%" :src="dialogImageUrl" alt />
 
+        </el-dialog>
 
+        <el-dialog title="查看提问" :visible.sync="dialogVisible" :append-to-body="true" width="750px"
 
+            :before-close="handleClose" class="dialog_diy">
 
+            <div>
 
+                <div class="a_addBox">
 
+                    <CourseProblem :problemCourse="problemCourse"></CourseProblem>
 
+                </div>
 
+            </div>
 
+            <span slot="footer" class="dialog-footer">
 
+                <el-button @click="dialogVisible = false">关 闭</el-button>
 
+            </span>
 
+        </el-dialog>
 
+        <el-dialog title="查看协同项目" :visible.sync="dialogVisibleCourse" :append-to-body="true" width="850px"
 
+            :before-close="handleClose" class="dialog_diy">
 
+            <div class="ct_box">
 
+                <div class="out_box" v-for="(item, index) in courseTeam" :key="index" style="margin-left: 15px">
 
+                    <div class="tup">
 
+                        <img :src="item.cover != null && item.cover != ''
 
+                                ? JSON.parse(item.cover).length > 0
 
+                                    ? JSON.parse(item.cover)[0].url
 
+                                    : mr
 
+                                : mr
 
+                            " alt />
 
+                    </div>
 
+                    <div class="bottom_box">
 
+                        <div>{{ item.title }}</div>
 
+                        <div class="kc_t">创建人：{{ item.uname }}</div>
 
+                        <div class="kc_time">{{ item.time }}</div>
 
+                    </div>
 
+                    <div class="three_bottom">
 
+                        <!-- <div @click="jump(item.courseId)">查看内容</div> -->
 
+                        <div @click="
 
+                            goTo(
 
+                                '/studentAddCourse?cid=' +
 
+                                item.courseId +
 
+                                '&userid=' +
 
+                                userid +
 
+                                '&oid=' +
 
+                                oid +
 
+                                '&org=' +
 
+                                org +
 
+                                '&role=' +
 
+                                role
 
+                            )
 
+                            ">
 
+                            编辑
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+                <div class="course_empty" v-if="courseTeam.length == 0">暂无数据</div>
 
+            </div>
 
+            <span slot="footer" class="dialog-footer">
 
+                <el-button @click="dialogVisibleCourse = false">关 闭</el-button>
 
+            </span>
 
+        </el-dialog>
 
+    </div>
 
+</template>
 
+  
+<script>
 
+import "../../../common/aws-sdk-2.235.1.min";
 
+import EditorBar from "../../../components/tools/wangEnduit";
 
+import CourseProblem from "../components/courseProblem";
 
+export default {
 
+    components: { EditorBar, CourseProblem },
 
+    data() {
 
+        return {
 
+            itemCount: 1,
 
+            courseTitle: "",
 
+            courseText: "",
 
+            courseTime: "",
 
+            isLoading: false,
 
+            fileList: [],
 
+            fileList1: [],
 
+            homeworkList: [{ name: "" }],
 
+            formLabelWidth: "100px",
 
+            dialogVisible: false,
 
+            dialogVisible1: false,
 
+            dialogVisibleCourse: false,
 
+            dialogImageUrl: "",
 
+            group: "",
 
+            userid: this.$route.query.userid,
 
+            oid: this.$route.query.oid,
 
+            org: this.$route.query.org,
 
+            role: this.$route.query.role,
 
+            orgArray: ["150e3120-9195-11ed-b13d-005056b86db5"],
 
+            oidArray: [],
 
+            Juri: "",
 
+            groupList: [],
 
+            JuriList: [],
 
+            page: 1,
 
+            total: 0,
 
+            pageSize: 20,
 
+            tableData: [],
 
+            now: "",
 
+            courseDetail: {},
 
+            addCourse: {},
 
+            groupA: "3",
 
+            classX: "",
 
+            course: [],
 
+            courseName: "",
 
+            mr: require("../../../assets/icon/kc1.png"),
 
+            CourseType: [],
 
+            CourseTypeJson: {},
 
+            courseTypeId: {},
 
+            courseTypeSon: [],
 
+            isChoose: 0,
 
+            problemCourse: null, //查看提问的项目
 
+            courseTeam: [],
 
+        };
 
+    },
 
+    methods: {
 
+        change(val) {
 
+            console.log(val);
 
+        },
 
+        time() {
 
+            if (!this.now) {
 
+                this.now = new Date().getTime();
 
+                return true;
 
+            } else {
 
+                let time = new Date().getTime();
 
+                if (time - this.now > 3000) {
 
+                    this.now = time;
 
+                    return true;
 
+                } else {
 
+                    return false;
 
+                }
 
+            }
 
+        },
 
+        addHomeworkBox() {
 
+            this.homeworkList.push({ name: "" });
 
+            this.itemCount++;
 
+        },
 
+        reduceHomeworkBox() {
 
+            var a = this.homeworkList;
 
+            a.splice(a.length - 1);
 
+            this.itemCount--;
 
+        },
 
+        goTo(path) {
 
+            this.$router.push(path);
 
+        },
 
+        goToCourse(courseId) {
 
+            if (courseId) {
 
+                this.$router.push(
 
+                    "/addTest?cid=" +
 
+                    courseId +
 
+                    "&userid=" +
 
+                    this.userid +
 
+                    "&oid=" +
 
+                    this.oid +
 
+                    "&org=" +
 
+                    this.org +
 
+                    "&role=" +
 
+                    this.role
 
+                );
 
+            } else {
 
+                this.$router.push(
 
+                    "/addTest?userid=" +
 
+                    this.userid +
 
+                    "&oid=" +
 
+                    this.oid +
 
+                    "&org=" +
 
+                    this.org +
 
+                    "&role=" +
 
+                    this.role
 
+                );
 
+            }
 
+            // this.$router.push(path);
 
+        },
 
+        goToCourse2(cid) {
 
+            this.$router.push(
 
+                "/studentAddCourse?cid=" +
 
+                cid +
 
+                "&userid=" +
 
+                this.userid +
 
+                "&oid=" +
 
+                this.oid +
 
+                "&org=" +
 
+                this.org +
 
+                "&type=2" +
 
+                "&role=" +
 
+                this.role
 
+            );
 
+        },
 
+        tableRowClassName({ row, rowIndex }) {
 
+            if ((rowIndex + 1) % 2 === 0) {
 
+                return "even_row";
 
+            } else {
 
+                return "";
 
+            }
 
+        },
 
+        jump(cid) {
 
+            // window.open(
 
+            //   "//pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetail?courseId=" +
 
+            //     cid +
 
+            //     "&userid=" +
 
+            //     this.userid
 
+            // );
 
+            window.parent.postMessage({ cid: cid, screenType: "2s" }, "*");
 
+        },
 
+        get(cid) {
 
+            window.parent.postMessage({ cid: cid, screenType: "3s" }, "*");
 
+        },
 
+        getA(cid) {
 
+            this.$router.push("/courseProgress?cid=" + cid + "&userid=" +
 
+                this.userid +
 
+                "&oid=" +
 
+                this.oid +
 
+                "&org=" +
 
+                this.org)
 
+        },
 
+        handle_remove(file, fileList) {
 
+            var _tmp = this.fileList;
 
+            for (var i = 0, len = _tmp.length; i < len; i++) {
 
+                if (_tmp[i].uid == file.uid) {
 
+                    _tmp.splice(i, 1);
 
+                    break;
 
+                }
 
+                this.fileList = _tmp;
 
+            }
 
+        },
 
+        handle_remove1(file, fileList) {
 
+            var _tmp = this.fileList1;
 
+            for (var i = 0, len = _tmp.length; i < len; i++) {
 
+                if (_tmp[i].uid == file.uid) {
 
+                    _tmp.splice(i, 1);
 
+                    break;
 
+                }
 
+                this.fileList1 = _tmp;
 
+            }
 
+        },
 
+        handleCurrentChange(val) {
 
+            // console.log(`当前页: ${val}`);
 
+            this.page = val;
 
+            this.getCourse();
 
+        },
 
+        init() { },
 
+        handleClose(done) {
 
+            done();
 
+        },
 
+        handleRemove(file, fileList) {
 
+            console.log(file, fileList);
 
+        },
 
+        handlePictureCardPreview(file) {
 
+            this.dialogImageUrl = file.url;
 
+            this.dialogVisible1 = true;
 
+        },
 
+        onExceed() {
 
+            this.$message.error("项目海报仅支持上传一张，请删除后再进行上传");
 
+        },
 
+        //uuid生成
 
+        guid() {
 
+            return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
 
+                /[xy]/g,
 
+                function (c) {
 
+                    var r = (Math.random() * 16) | 0,
 
+                        v = c == "x" ? r : (r & 0x3) | 0x8;
 
+                    return v.toString(16);
 
+                }
 
+            );
 
+        },
 
+        time() {
 
+            if (!this.now) {
 
+                this.now = new Date().getTime();
 
+                return true;
 
+            } else {
 
+                let time = new Date().getTime();
 
+                if (time - this.now > 3000) {
 
+                    this.now = time;
 
+                    return true;
 
+                } else {
 
+                    return false;
 
+                }
 
+            }
 
+        },
 
+        searchCourse() {
 
+            this.page = 1;
 
+            this.getCourse();
 
+        },
 
+        clear() {
 
+            if (this.CourseType.length) {
 
+                for (var i = 0; i < this.CourseType[0].length; i++) {
 
+                    this.courseTypeId[this.CourseType[0][i].id] = "";
 
+                }
 
+            }
 
+            this.getCourse();
 
+        },
 
+        getCourse() {
 
+            var typeE = [];
 
+            var typea, typeb, typec, typed, typef;
 
+            if (this.isChoose == 1) {
 
+                for (var i = 0; i < this.CourseType[0].length; i++) {
 
+                    if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
 
+                        typeE.push(this.CourseType[0][i].id);
 
+                    } else if (this.courseTypeId[this.CourseType[0][i].id] != "") {
 
+                        if (this.CourseType[0][i].name == "年级") {
 
+                            typea = this.courseTypeId[this.CourseType[0][i].id];
 
+                        } else if (this.CourseType[0][i].name == "专栏") {
 
+                            typeb = this.courseTypeId[this.CourseType[0][i].id];
 
+                        } else if (this.CourseType[0][i].name == "栏目") {
 
+                            typeb = this.courseTypeId[this.CourseType[0][i].id];
 
+                        } else if (this.CourseType[0][i].name == "学院") {
 
+                            typeb = this.courseTypeId[this.CourseType[0][i].id];
 
+                        } else if (this.CourseType[0][i].name == "新技能") {
 
+                            typec = this.courseTypeId[this.CourseType[0][i].id];
 
+                        } else if (this.CourseType[0][i].name == "赛道") {
 
+                            typed = this.courseTypeId[this.CourseType[0][i].id];
 
+                        } else if (this.CourseType[0][i].name == "项目类型") {
 
+                            typed = this.courseTypeId[this.CourseType[0][i].id];
 
+                        } else if (this.CourseType[0][i].name == "主题") {
 
+                            typef = this.courseTypeId[this.CourseType[0][i].id];
 
+                        }
 
+                        this.courseTypeSon.push(
 
+                            this.courseTypeId[this.CourseType[0][i].id]
 
+                        );
 
+                    }
 
+                }
 
+            }
 
+            this.isLoading = true;
 
+            let params = {
 
+                type: this.groupA,
 
+                uid: this.userid,
 
+                oid: this.oid,
 
+                org: this.org,
 
+                typea: typea != undefined ? typea : "",
 
+                typeb: typeb != undefined ? typeb : "",
 
+                typec: typec != undefined ? typec : "",
 
+                typed: typed != undefined ? typed : "",
 
+                typef: typef != undefined ? typef : "",
 
+                typeE: typeE.join(","),
 
+                cu: "",
 
+                cn: this.courseName,
 
+                page: this.page,
 
+                pageSize: this.pageSize,
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectTesttCourse", params)
 
+                .then((res) => {
 
+                    this.isLoading = false;
 
+                    this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
+                    this.course = res.data[0];
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        },
 
+        getTypeName() {
 
+            this.$forceUpdate();
 
+            this.page = 1;
 
+            this.isChoose = 1;
 
+            this.getCourse();
 
+        },
 
+        // searchCourse() {
 
+        //   this.isLoading = true;
 
+        //   let params = {
 
+        //     cu: "",
 
+        //     cn: this.courseName,
 
+        //     page: this.page,
 
+        //   };
 
+        //   this.ajax
 
+        //     .get(this.$store.state.api + "searchCourse", params)
 
+        //     .then((res) => {
 
+        //       this.isLoading = false;
 
+        //       this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
+        //       this.course = res.data[0];
 
+        //     })
 
+        //     .catch((err) => {
 
+        //       this.isLoading = false;
 
+        //       console.error(err);
 
+        //     });
 
+        // },
 
+        deleteCourse(cid) {
 
+            // if (this.time()) {
 
+            this.$confirm("确定删除此项目吗?", "提示", {
 
+                confirmButtonText: "确定",
 
+                cancelButtonText: "取消",
 
+                type: "warning",
 
+            })
 
+                .then(() => {
 
+                    this.isLoading = true;
 
+                    let params = {
 
+                        cid: cid,
 
+                    };
 
+                    this.ajax
 
+                        .get(this.$store.state.api + "deleteStudentCourse", params)
 
+                        .then((res) => {
 
+                            this.isLoading = false;
 
+                            this.$message.success("删除成功");
 
+                            this.getCourse();
 
+                        })
 
+                        .catch((err) => {
 
+                            console.error(err);
 
+                        });
 
+                })
 
+                .catch(() => {
 
+                    loading.close();
 
+                    this.isLoading = false;
 
+                    return;
 
+                });
 
+            // }
 
+        },
 
+        selectAllType() {
 
+            let params = {
 
+                org: this.org && this.org != "" ? this.org : "",
 
+                oid: this.oid && this.oid != "" ? this.oid : "",
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectAllTypeT", params)
 
+                .then((res) => {
 
+                    this.CourseType = res.data;
 
+
 
+                    for (var i = 0; i < res.data[0].length; i++) {
 
+                        if (res.data[0][i].id == "34629907-d02f-11ec-8c78-005056b86db5") {
 
+                            res.data[0][i].name = "学科";
 
+                        } else if (res.data[0][i].id == "34628934-d02f-11ec-8c78-005056b86db5") {
 
+                            res.data[0][i].name = "年级";
 
+                        }
 
+                        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 (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) {
 
+                            //     this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+                            //   }
 
+                            // }
 
+                            // if(this.org == '150e3120-9195-11ed-b13d-005056b86db5'){
 
+                            for (var j = 0; j < res.data[1].length; j++) {
 
+                                if (res.data[0][i].id == res.data[1][j].pid) {
 
+                                    this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+                                }
 
+                            }
 
+                            // }else{
 
+                            //   this.CourseType = []
 
+                            // }
 
+                        } 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]); // 去除公共分类
 
+                                    }
 
+                                }
 
+                            }
 
+                        }
 
+                    }
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        },
 
+        selectType() {
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectStudentType")
 
+                .then((res) => {
 
+                    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();
 
+                    this.selectTypeByOrg();
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        },
 
+        selectTypeByOid() {
 
+            let params = {
 
+                oid: this.oid,
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectStudentTypeByOid", 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() {
 
+            let params = {
 
+                oid: this.org,
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectStudentTypeByOid", 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);
 
+                });
 
+        },
 
+        openCourse() {
 
+            this.dialogVisibleCourse = true;
 
+            this.getTeamCourse();
 
+        },
 
+        getTeamCourse() {
 
+            let params = {
 
+                uid: this.userid,
 
+                oid: this.oid,
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectCourseTeam", params)
 
+                .then((res) => {
 
+                    this.courseTeam = res.data[0];
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        },
 
+        search() {
 
+            this.page = 1;
 
+            this.getCourse();
 
+        },
 
+        checkProblem(res) {
 
+            this.problemCourse = res;
 
+            this.dialogVisible = true;
 
+        },
 
+        copyCourse(cid) {
 
+            let params = [{
 
+                cid: cid,
 
+                uid: this.userid
 
+            }]
 
+            this.ajax
 
+                .post(this.$store.state.api + "copySCourse", params)
 
+                .then((res) => {
 
+                    this.page = 1
 
+                    if (this.role == "1") {
 
+                        this.groupA = "0";
 
+                    } else {
 
+                        this.groupA = "0";
 
+                    }
 
+                    this.$message.success("复制成功")
 
+                    this.clear()
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        }
 
+    },
 
+    created() {
 
+        if (this.role == '1') {
 
+            this.groupA = '0'
 
+        }
 
+        this.page = 1;
 
+        this.selectAllType();
 
+        this.getCourse();
 
+    },
 
+};
 
+</script>
 
+  
+<style scoped>
 
+.dialog_diy>>>.el-dialog__header {
 
+    background: #3d67bc !important;
 
+    padding: 15px 20px;
 
+}
 
+
 
+.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;
 
+}
 
+
 
+.student_head>>>.el-button--primary {
 
+    background-color: #2268bc;
 
+}
 
+
 
+.xls_button {
 
+    font-size: 14px;
 
+    cursor: pointer;
 
+    text-decoration: underline;
 
+    color: rgb(34, 104, 188);
 
+}
 
+
 
+.student_head {
 
+    display: flex;
 
+    justify-content: space-between;
 
+    align-items: baseline;
 
+    flex-direction: row;
 
+    flex-wrap: wrap;
 
+}
 
+
 
+.top {
 
+    display: flex;
 
+    justify-content: space-between;
 
+}
 
+
 
+.bgColor {
 
+    background: #466b99;
 
+}
 
+
 
+.student_search {
 
+    display: flex;
 
+    align-items: center;
 
+    /* width: calc(100% / 3); */
 
+    width: 190px;
 
+}
 
+
 
+.student_search span {
 
+    margin: 0 10px 0 0;
 
+    min-width: 65px;
 
+}
 
+
 
+.student_button {
 
+    display: flex;
 
+    overflow: hidden;
 
+    height: 40px;
 
+}
 
+
 
+.upload-demo {
 
+    display: flex;
 
+    flex-direction: column;
 
+    align-items: end;
 
+    /* position: relative; */
 
+    width: 100px;
 
+    overflow: hidden;
 
+}
 
+
 
+.student_table {
 
+    padding: 20px 0;
 
+    height: 100%;
 
+    /* overflow: auto; */
 
+    min-height: 360px;
 
+}
 
+
 
+.student_empty {
 
+    display: flex;
 
+    justify-content: center;
 
+    align-items: center;
 
+}
 
+
 
+.el-table>>>.even_row {
 
+    background-color: #f1f1f1;
 
+}
 
+
 
+.time {
 
+    font-size: 13px;
 
+    color: #999;
 
+}
 
+
 
+.course_button {
 
+    padding: 10px 20px;
 
+}
 
+
 
+.course_button_box {
 
+    display: flex;
 
+    margin-top: 5px;
 
+    justify-content: space-between;
 
+}
 
+
 
+.course_rate {
 
+    margin-top: 5px;
 
+}
 
+
 
+.course_view {
 
+    display: flex;
 
+    align-items: center;
 
+    margin: 5px 0 0 0;
 
+}
 
+
 
+.course_view i {
 
+    background-image: url("../../../assets/liulan.png");
 
+    width: 25px;
 
+    height: 25px;
 
+    background-size: 100% 100%;
 
+    /* margin-top: 1px; */
 
+    line-height: 25px;
 
+    vertical-align: text-top;
 
+    background-repeat: no-repeat;
 
+}
 
+
 
+.image {
 
+    width: 100%;
 
+    height: 150px;
 
+    display: block;
 
+}
 
+
 
+.course_box {
 
+    display: flex;
 
+    flex-wrap: wrap;
 
+}
 
+
 
+.student_page {
 
+    width: 95%;
 
+    margin: 0 auto;
 
+}
 
+
 
+.course_create_box {
 
+    font-size: 18px;
 
+}
 
+
 
+.course_name {
 
+    margin-top: 10px;
 
+}
 
+
 
+.course_name span {
 
+    margin-bottom: 10px;
 
+    display: block;
 
+}
 
+
 
+.homework_box {
 
+    display: flex;
 
+    align-items: center;
 
+    flex-wrap: wrap;
 
+}
 
+
 
+.course_homework {
 
+    width: 130px;
 
+    display: flex;
 
+    justify-content: center;
 
+    flex-direction: column;
 
+    align-items: center;
 
+    margin: 0 10px 10px 0;
 
+}
 
+
 
+.course_type {
 
+    margin-top: 10px;
 
+    display: flex;
 
+}
 
+
 
+.course_type1 span {
 
+    margin-bottom: 10px;
 
+    display: block;
 
+}
 
+
 
+.course_type2 {
 
+    margin-left: 20px;
 
+}
 
+
 
+.course_type2 span {
 
+    margin-bottom: 10px;
 
+    display: block;
 
+}
 
+
 
+.course_empty {
 
+    color: rgb(110, 110, 110);
 
+    width: 100%;
 
+    height: 100%;
 
+    display: flex;
 
+    align-items: center;
 
+    justify-content: center;
 
+}
 
+
 
+.el_cards>>>.el-card__body {
 
+    height: 100%;
 
+}
 
+
 
+.courseBtnBox {
 
+    display: flex;
 
+    flex-direction: column;
 
+    justify-content: space-between;
 
+    height: calc(100% - 170px);
 
+    padding: 10px;
 
+}
 
+
 
+.wordUpload {
 
+    display: flex;
 
+}
 
+
 
+.wordUpload>.buttonUp {
 
+    margin-right: 5px;
 
+}
 
+
 
+.out_box {
 
+    display: flex;
 
+    flex-direction: column;
 
+    flex-wrap: nowrap;
 
+    width: 250px;
 
+    background: #fff;
 
+    margin-right: 25px;
 
+    border: 1px solid #ccc;
 
+    height: fit-content;
 
+    box-sizing: border-box;
 
+    border-radius: 0px 0px 5px 5px;
 
+    /* overflow: hidden; */
 
+    margin-bottom: 15px;
 
+    position: relative;
 
+}
 
+
 
+.bottom_box {
 
+    display: flex;
 
+    padding: 10px 0 10px 10px;
 
+    flex-direction: column;
 
+    box-sizing: border-box;
 
+    height: 140px;
 
+    flex-wrap: nowrap;
 
+    justify-content: space-evenly;
 
+}
 
+
 
+.bottom_box>div:nth-child(1) {
 
+    width: 230px;
 
+    overflow: hidden;
 
+    text-overflow: ellipsis;
 
+    white-space: nowrap;
 
+}
 
+
 
+.tup {
 
+    width: 100%;
 
+    height: 141.06px;
 
+    margin: 0 auto;
 
+    overflow: hidden;
 
+    display: flex;
 
+    align-items: center;
 
+}
 
+
 
+.tup>img {
 
+    width: 100%;
 
+    height: 100%;
 
+    object-fit: contain;
 
+}
 
+
 
+.kc_time {
 
+    margin-top: 8px;
 
+    font-size: 14px;
 
+    color: #999;
 
+}
 
+
 
+.kc_t {
 
+    margin-top: 5px;
 
+    width: 100%;
 
+    white-space: nowrap;
 
+    overflow: hidden;
 
+    text-overflow: ellipsis;
 
+}
 
+
 
+.three_bottom {
 
+    display: flex;
 
+    flex-direction: row;
 
+    justify-content: space-around;
 
+    height: 40px;
 
+    align-items: center;
 
+    background: #f5f4f4;
 
+    font-size: 14px;
 
+}
 
+
 
+.three_bottom>div {
 
+    cursor: pointer;
 
+}
 
+
 
+.three_bottom>div:hover {
 
+    color: #79a2ff;
 
+}
 
+
 
+.head_left {
 
+    display: flex;
 
+}
 
+
 
+.student_input>>>.el-input__inner {
 
+    height: 40px;
 
+    width: 190px;
 
+    font-size: 13px;
 
+    padding: 0 10px;
 
+}
 
+
 
+.course_button {
 
+    color: #fff;
 
+    background: #2268bc;
 
+    width: 75px;
 
+    height: 40px;
 
+    padding: 0 !important;
 
+    font-size: 12px;
 
+    line-height: 40px;
 
+}
 
+
 
+.all_choose {
 
+    margin: 15px 0 10px;
 
+    height: 20%;
 
+    display: flex;
 
+    flex-direction: row;
 
+    align-items: center;
 
+    max-width: calc(100% / 3 - 50px);
 
+}
 
+
 
+.all_choose>span {
 
+    min-width: 75px;
 
+    display: block;
 
+    margin-right: 10px;
 
+    text-align-last: justify;
 
+}
 
+
 
+.choose {
 
+    display: flex;
 
+    flex-direction: row;
 
+    flex-wrap: wrap;
 
+    align-content: space-between;
 
+    height: 100%;
 
+    justify-content: flex-start;
 
+    width: 60%;
 
+    min-width: 868px;
 
+    align-items: center;
 
+}
 
+
 
+.choose>div:nth-child(2) {
 
+    margin-left: 1%;
 
+    width: 32.33333%;
 
+}
 
+
 
+.choose>div:nth-child(3) {
 
+    margin-left: 1%;
 
+    width: 32.33333%;
 
+}
 
+
 
+.choose>div:nth-child(5) {
 
+    margin: 5px 0 0 1%;
 
+}
 
+
 
+.choose>div:nth-child(4)>span {
 
+    /* width: 74px !important;
 
+    min-width: 74px; */
 
+}
 
+
 
+.choose>div:nth-child(4)>>>.el-select {
 
+    /* width: 217.5px;
 
+    min-width: 215.06px; */
 
+}
 
+
 
+.clear {
 
+    width: 70px;
 
+    max-width: 70px;
 
+    height: 35px;
 
+    background: #2268bc;
 
+    color: #fff;
 
+    text-align: center;
 
+    border-radius: 5px;
 
+    line-height: 35px;
 
+    cursor: pointer;
 
+    margin-left: 20px;
 
+}
 
+
 
+.ct_box {
 
+    height: 500px;
 
+    overflow: auto;
 
+    display: flex;
 
+    flex-wrap: wrap;
 
+}
 
+
 
+.myCourse {
 
+    position: absolute;
 
+    background: #3c3c3c;
 
+    width: 70px;
 
+    height: 30px;
 
+    border-radius: 30px;
 
+    color: #fff;
 
+    font-size: 14px;
 
+    text-align: center;
 
+    line-height: 30px;
 
+    top: 5px;
 
+    left: 5px;
 
+}
 
+
 
+.xtCourse {
 
+    position: absolute;
 
+    background: #466b99;
 
+    width: 70px;
 
+    height: 30px;
 
+    border-radius: 30px;
 
+    color: #fff;
 
+    font-size: 14px;
 
+    text-align: center;
 
+    line-height: 30px;
 
+    top: 5px;
 
+    left: 5px;
 
+}
 
+
 
+.subClick {
 
+    font-size: 16px;
 
+    cursor: pointer;
 
+    margin-left: 10px;
 
+    /* color: #ab582f; */
 
+    color: #409eff;
 
+}
 
+
 
+.more {
 
+    position: relative;
 
+
 
+}
 
+
 
+.more:hover div {
 
+    display: block;
 
+    color: #000;
 
+}
 
+
 
+.more div {
 
+    position: absolute;
 
+    bottom: 0px;
 
+    transform: translate(-50%, 100%);
 
+    background: #f5f4f4;
 
+    padding: 10px 20px;
 
+    z-index: 99;
 
+    width: 40px;
 
+    border-radius: 5px;
 
+    box-shadow: 0 0 3px 3px #80808020;
 
+    display: none;
 
+}
 
+
 
+.more div>span+span {
 
+    margin-top: 10px;
 
+}
 
+
 
+.more div>span {
 
+    display: block;
 
+    width: 100%;
 
+    text-align: center;
 
+}
 
+
 
+.more div>span:hover {
 
+    color: #79a2ff;
 
+}</style>
 
+

+ 36 - 15
src/components/tools/sunburst.vue
Целия файл 

@@ -4,11 +4,7 @@
 
       <img src="../../assets/nominddata.png" alt />
 
       <img src="../../assets/nominddata.png" alt />
 
     </div>
 
     </div>
 
     <!-- <img src="../../assets/dataimage/1.png" style="width:90%" /> -->
 
     <!-- <img src="../../assets/dataimage/1.png" style="width:90%" /> -->
 
-    <div
 
-      id="charts_canvas"
 
-      class="echart"
 
-      style="width: 100%; height: 100%"
 
-    ></div>
 
+    <div id="charts_canvas" class="echart" style="width: 100%; height: 100%"></div>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 
 
@@ -22,19 +18,43 @@ export default {
 
       timer: null,
 
       timer: null,
 
       ooption: [],
 
       ooption: [],
 
       option: {
 
       option: {
 
-        tooltip:{},
 
+        tooltip: {
 
+          formatter: function (params) {
 
+            var newParamsName = "";
 
+            var paramsNameNumber = params.name.length;
 
+            var provideNumber = 20;  //一行显示几个字
 
+            var rowNumber = Math.ceil(paramsNameNumber / provideNumber);
 
+            if (paramsNameNumber > provideNumber) {
 
+              for (var p = 0; p <rowNumber; p++) {
 
+                var tempStr = "";
 
+                var start = p * provideNumber;
 
+                var end = start + provideNumber;
 
+                if (p == rowNumber - 1) {
 
+                  tempStr = params.name.substring(start, paramsNameNumber);
 
+                } else {
 
+                  tempStr = params.name.substring(start, end) + "</br>";
 
+                }
 
+                newParamsName += tempStr;
 
+              }
 
+
 
+            } else {
 
+              newParamsName = params.name;
 
+            }
 
+            return newParamsName
 
+          }
 
+        },
 
         series: {
 
         series: {
 
           type: "sunburst",
 
           type: "sunburst",
 
           data: [],
 
           data: [],
 
           radius: [30, "90%"],
 
           radius: [30, "90%"],
 
           label: {
 
           label: {
 
             rotate: "radial",
 
             rotate: "radial",
 
-            // formatter: function (val) {
 
-            //   // console.log(val);
 
-            //   return val.name.length > 5
 
-            //     ? val.name.substring(0, 6) + '...'
 
-            //     : val.name;
 
-            // }
 
+            formatter: function (val) {
 
+              // console.log(val);
 
+              return val.name.length > 5
 
+                ? val.name.substring(0, 6) + '...'
 
+                : val.name;
 
+            }
 
           },
 
           },
 
         },
 
         },
 
       },
 
       },
 
@@ -76,7 +96,7 @@ export default {
 
         _array.push({ name: _item.name, value: count, children: [] });
 
         _array.push({ name: _item.name, value: count, children: [] });
 
         let j = 0;
 
         let j = 0;
 
         for (var item2 in _item.child) {
 
         for (var item2 in _item.child) {
 
-          let num2 = Object.keys( _item.child);
 
+          let num2 = Object.keys(_item.child);
 
           let count2 = count / num2.length;
 
           let count2 = count / num2.length;
 
           let _item2 = _item.child[item2];
 
           let _item2 = _item.child[item2];
 
           _array[i].children.push({
 
           _array[i].children.push({
 
@@ -85,7 +105,7 @@ export default {
 
             children: [],
 
             children: [],
 
           });
 
           });
 
           for (var item3 in _item2.child) {
 
           for (var item3 in _item2.child) {
 
-            let num3 = Object.keys( _item2.child);
 
+            let num3 = Object.keys(_item2.child);
 
             let count3 = count2 / num3.length;
 
             let count3 = count2 / num3.length;
 
             let _item3 = _item2.child[item3];
 
             let _item3 = _item2.child[item3];
 
             _array[i].children[j].children.push({
 
             _array[i].children[j].children.push({
 
@@ -115,7 +135,7 @@ export default {
 
       deep: true,
 
       deep: true,
 
     },
 
     },
 
     Josn: {
 
     Josn: {
 
-      handler: function (newVal, oldVal) {},
 
+      handler: function (newVal, oldVal) { },
 
       deep: true,
 
       deep: true,
 
     },
 
     },
 
   },
 
   },
 
@@ -153,6 +173,7 @@ export default {
 
   flex-shrink: 0;
 
   flex-shrink: 0;
 
   position: relative;
 
   position: relative;
 
 }
 
 }
 
+
 
 .noMind {
 
 .noMind {
 
   position: absolute;
 
   position: absolute;
 
   display: flex;
 
   display: flex;

+ 16 - 0
src/router/index.js
Целия файл 

@@ -97,6 +97,8 @@ import addCourseT from '@/components/pages/task/addCourse'
 
 import dataBoard from '@/components/pages/dataBoard'
 
 import dataBoard from '@/components/pages/dataBoard'
 
 import addSynergyCourse from '@/components/pages/synergyCourse/addCourse'
 
 import addSynergyCourse from '@/components/pages/synergyCourse/addCourse'
 
 import synergyCourse from '@/components/pages/synergyCourse/course'
 
 import synergyCourse from '@/components/pages/synergyCourse/course'
 
+import test from '@/components/pages/test/index'
 
+import addTest from '@/components/pages/test/add/addTest'
 
 
 
 
 
 // 全局修改默认配置，点击空白处不能关闭弹窗
 
 // 全局修改默认配置，点击空白处不能关闭弹窗
 
@@ -832,6 +834,20 @@ export default new Router({
 
                 requireAuth: '' // 是否需要判断是否登录,这里是需要判断
 
                 requireAuth: '' // 是否需要判断是否登录,这里是需要判断
 
             }
 
             }
 
         },
 
         },
 
+        {
 
+            path: '/test',
 
+            component: test,
 
+            meta: {
 
+                requireAuth: '' // 是否需要判断是否登录,这里是需要判断
 
+            }
 
+        },
 
+        {
 
+            path: '/addTest',
 
+            component: addTest,
 
+            meta: {
 
+                requireAuth: '' // 是否需要判断是否登录,这里是需要判断
 
+            }
 
+        },
 
         {
 
         {
 
             path: '/synergyCourse/add',
 
             path: '/synergyCourse/add',
 
             component: addSynergyCourse,
 
             component: addSynergyCourse,

Някои файлове не бяха показани, защото твърде много файлове са промени