lsc 1 년 전
부모
커밋
2b49985b61

+ 1 - 1
dist/index.html

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

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.1dd3f4c79f60f686b7c86cb643760e21.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.1dd3f4c79f60f686b7c86cb643760e21.css.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.8ea04f59ef39445b80fd060adeaa1da5.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.8ea04f59ef39445b80fd060adeaa1da5.css.map


BIN
dist/static/img/projectName2.8662e29.png


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.36c95a9605b5f633f4dd.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.36c95a9605b5f633f4dd.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 9 - 0
src/App.vue

@@ -483,4 +483,13 @@ html::-webkit-scrollbar-thumb {
 .el-cascader-node__label{
   max-width: 150px;
 }
+
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #0061FF;
+    color: #FFF;
+}
+
+.el-pagination.is-background .el-pager li:not(.disabled):hover {
+    color: #0061FF;
+}
 </style>

+ 1 - 1
src/assets/css/button.css

@@ -215,7 +215,7 @@
 
 .r_pub_button_course {
   color: #fff;
-  background-color: #466b99;
+  background-color: #0061FF;
   font-size: 16px;
   font-weight: 500;
   border-radius: 4px;

BIN
src/assets/icon/projectName2.png


+ 18 - 6
src/components/pages/addCourse.vue

@@ -223,9 +223,9 @@
               </div>
               <div class="whiteBg" style="border-radius: 0; margin-top: 15px">
                 <div class="c_info_title">课程简要描述</div>
-                <div style="width: 95%; padding: 0 0px 0 20px">
-                  <div style="width: 55%">
-                    <textarea rows="6" class="binfo_input binfo_textarea" cols v-model="courseText" placeholder="请输入课程简要描述"></textarea>
+                <div style="width: 100%;padding: 0px 20px;box-sizing: border-box;">
+                  <div style="width: calc((100% - 55% - 100px) * 2 - 30px)">
+                    <textarea v-autoHeight="68" rows="2" class="binfo_input binfo_textarea" cols v-model="courseText" placeholder="请输入课程简要描述"></textarea>
                   </div>
                 </div>
               </div>
@@ -752,7 +752,7 @@
                         justify-content: space-between;
                         align-items: center;
                       " :style="{ margin: !itemTask.isFoldchapter ? '20px 0 10px' : '20px 0 0' }">
-                            <div style="margin-bottom:10px" class="lineTitle">学习内容</div>
+                            <div style="margin-bottom:10px" class="lineTitle clineTitle">学习内容</div>
                             <div style="margin-bottom:10px" v-if="!itemTask.isFoldchapter" class="show_taskD show"
                               @click="foldC(itemTaskIndex)"><img src="../../assets/icon/new/icon-slide.png" />收起学习内容</div>
                             <div style="margin-bottom:10px" v-else class="show_taskD" @click="foldC(itemTaskIndex)"><img
@@ -1254,7 +1254,7 @@
                         align-items: center;
                         margin: 5px 0 20px;
                       ">
-                            <div class="lineTitle">
+                            <div class="lineTitle clineTitle">
                               {{
                                 !unitJson[unitIndex].easy ||
                                 unitJson[unitIndex].easy == 6 ||
@@ -2450,7 +2450,7 @@
                           align-items: center;
                           margin: 20px 0;
                         ">
-                              <div class="lineTitle">评价设置</div>
+                              <div class="lineTitle clineTitle">评价设置</div>
                               <!-- <div class="line" style="width: 90%"></div> -->
                             </div>
                           </div>
@@ -12231,6 +12231,18 @@ ol {
   margin: 0 5px 0 0;
 }
 
+.clineTitle::before {
+  content: '';
+  display: block;
+  min-width: 10px;
+  width: 10px;
+  height: 10px;
+  background: #0061ff;
+  border-radius: 50%;
+  margin: 0 5px 0 0;
+}
+
+
 .courseTop {
   display: flex;
   flex-direction: row;

+ 3 - 3
src/components/pages/course.vue

@@ -1239,7 +1239,7 @@ export default {
 }
 
 .bgColor {
-  background: #466b99;
+  background: #0061FF;
 }
 
 .student_search {
@@ -1638,7 +1638,7 @@ export default {
 .clear {
   width: 70px;
   height: 35px;
-  background: #2268bc;
+  background: #0061FF;
   color: #fff;
   text-align: center;
   border-radius: 5px;
@@ -1670,7 +1670,7 @@ export default {
 
 .xtCourse {
   position: absolute;
-  background: #466b99;
+  background: #0061FF;
   width: 70px;
   height: 30px;
   border-radius: 5px;

+ 11 - 0
src/components/pages/easy/addCourse.vue

@@ -12218,6 +12218,17 @@ ol {
   margin: 0 5px 0 0;
 }
 
+.clineTitle::before {
+  content: '';
+  display: block;
+  min-width: 10px;
+  width: 10px;
+  height: 10px;
+  background: #0061ff;
+  border-radius: 50%;
+  margin: 0 5px 0 0;
+}
+
 .courseTop {
   display: flex;
   flex-direction: row;

+ 2 - 2
src/components/pages/scourse.vue

@@ -750,7 +750,7 @@ export default {
 }
 
 .bgColor {
-  background: #466b99;
+  background: #0061FF;
 }
 
 .student_search {
@@ -1018,7 +1018,7 @@ export default {
 
 .course_button {
   color: #fff;
-  background: #2268bc;
+  background: #0061FF;
   width: 75px;
   height: 40px;
   padding: 0 !important;

+ 318 - 269
src/components/pages/student/addCourse.vue

@@ -5,66 +5,91 @@
         <div class="stepBg">
           <div class="stepTop">
             <div v-if="steps == 1" class="first" @click="navSteps(1)">
-              <div>
-                <img src="../../../assets/icon/first.png" alt />
+              <div class="cfirst">
+                <div>
+                  <img src="../../../assets/icon/first.png" alt />
+                </div>
+                <div>填写基本信息</div>
               </div>
-              <div>填写基本信息</div>
             </div>
             <div v-else class="firstNo" @click="navSteps(1)">
-              <div>
-                <img src="../../../assets/icon/firstNo.png" alt />
+              <div class="cfirst">
+                <div>
+                  <img src="../../../assets/icon/firstNo.png" alt />
+                </div>
+                <div>填写基本信息</div>
               </div>
-              <div>填写基本信息</div>
             </div>
             <div v-show="cidttt === 0" class="secondNo">
               <div v-if="steps == 2" class="newSteps second" @click="navSteps(2)">
-                <div style="margin: 5px 10px 0 0; width: 2rem">
-                  <img src="../../../assets/icon/second.png" alt />
+                <div class="cfirst">
+                  <div>
+                    <img src="../../../assets/icon/second.png" alt />
+                  </div>
+                  <div>选择项目框架</div>
                 </div>
-                <div>选择项目框架</div>
               </div>
               <div v-else class="newSteps secondNo" @click="navSteps(2)">
-                <div>
-                  <img src="../../../assets/icon/secondNo.png" alt />
+                <div class="cfirst">
+                  <div>
+                    <img src="../../../assets/icon/secondNo.png" alt />
+                  </div>
+                  <div>选择项目框架</div>
                 </div>
-                <div>选择项目框架</div>
               </div>
             </div>
             <div v-if="steps == 3" class="third" @click="navSteps(3)">
-              <div>
-                <img src="../../../assets/icon/third.png" alt />
+              <div class="cfirst">
+                <div>
+                  <img src="../../../assets/icon/third.png" alt />
+                </div>
+                <div>上传项目内容</div>
               </div>
-              <div>上传项目内容</div>
+
             </div>
             <div v-else class="thirdNo" @click="navSteps(3)">
-              <div>
-                <img src="../../../assets/icon/thirdNo.png" alt />
+              <div class="cfirst">
+                <div>
+                  <img src="../../../assets/icon/thirdNo.png" alt />
+                </div>
+                <div>上传项目内容</div>
               </div>
-              <div>上传项目内容</div>
+
             </div>
             <div v-if="steps == 4 && type == 2" class="four">
-              <div>
-                <img src="../../../assets/icon/five.png" alt style="width: 33px" />
+              <div class="cfirst">
+                <div>
+                  <img src="../../../assets/icon/five.png" alt />
+                </div>
+                <div>项目进展</div>
               </div>
-              <div>项目进展</div>
+
             </div>
             <div v-else-if="type == 2" class="fourNo" @click="navSteps(4)">
-              <div>
-                <img src="../../../assets/icon/fiveNo.png" alt style="width: 33px" />
+              <div class="cfirst">
+                <div>
+                  <img src="../../../assets/icon/fiveNo.png" alt />
+                </div>
+                <div>项目进展</div>
               </div>
-              <div>项目进展</div>
+
             </div>
             <div v-if="steps == 5" class="four">
-              <div>
-                <img src="../../../assets/icon/four.png" alt />
+              <div class="cfirst">
+                <div>
+                  <img src="../../../assets/icon/four.png" alt />
+                </div>
+                <div>上传完成</div>
               </div>
-              <div>上传完成</div>
+
             </div>
             <div v-else class="fourNo">
-              <div>
-                <img src="../../../assets/icon/fourNo.png" alt />
+              <div class="cfirst">
+                <div>
+                  <img src="../../../assets/icon/fourNo.png" alt />
+                </div>
+                <div>上传完成</div>
               </div>
-              <div>上传完成</div>
             </div>
           </div>
           <div class="stepsBottom" v-if="steps == 3">
@@ -151,7 +176,7 @@
                           项目名称
                         </div>
                         <div style="display: flex; margin-right: 20px">
-                          <img src="../../../assets/icon/projectName.png" alt style="margin-right: 8px" />
+                          <img src="../../../assets/icon/projectName2.png" alt style="margin-right: 8px" />
                           <input type="text" placeholder="请输入项目名称" class="binfo_input" v-model="courseName" />
                         </div>
                       </div>
@@ -234,7 +259,7 @@
                     <div style="flex: 0.5 1 0%; margin: 0; width: 180px"
                       v-if="courseUserid != '' ? courseUserid == userid : true">
                       <div class="bInfo_title">协同编辑</div>
-                      <div class="addPeople" @click="openMember" style="background: #6b92c9">
+                      <div class="addPeople" @click="openMember" style="background: #0061FF">
                         添加协同成员
                       </div>
                       <div v-if="checkboxList3.length" style="
@@ -485,9 +510,9 @@
                     :class="unitIndex == index ? 'cru_selected' : ''" @click="unitSet(index)">
                     第{{ index + 1 }}阶段
                   </div>
-                  <img src="../../../assets/line.png" class="cru_line" :style="{
+                  <div class="cru_line" :style="{
                     left: offsetLetfPx + 'px',
-                  }" />
+                  }" ></div>
                 </div>
                 <div class="addStageImg" @click="addunit()">
                   <img src="../../../assets/icon/add.png" alt />
@@ -533,7 +558,7 @@
                               margin-bottom: 10px;
                             ">
                             <div style="
-                                border-left: 6px solid #5699e8;
+                                border-left: 6px solid #0061FF;
                                 height: 20px;
                                 padding: 0 10px;
                                 line-height: 22px;
@@ -880,300 +905,302 @@
                           <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
                             v-if="itemTask.toolArray.length > 0" style="position: absolute; right: 55px"></div>
                         </div>
-                        <div style="margin-top: 10px">
-                          <div class="tool" v-if="itemTool.tool == 1">
-                            <div class="whiteBIcon" @click="openToolFun(1, itemTaskIndex, toolIndex)">
-                              <img src="../../../assets/icon/secondToolList/whiteBoard.png" alt />
-                              <div style="margin: 5px 0">电子白板</div>
+                        <div style="margin: 10px 0;display: flex;">
+                          <div>
+                            <div class="tool" v-if="itemTool.tool == 1">
+                              <div class="whiteBIcon" @click="openToolFun(1, itemTaskIndex, toolIndex)">
+                                <img src="../../../assets/icon/secondToolList/whiteBoard.png" alt />
+                                <div style="margin: 5px 0">电子白板</div>
+                              </div>
                             </div>
-                          </div>
-                          <div class="tool" v-if="itemTool.tool == 3">
-                            <div class="whiteBIcon" @click="openToolFun(3, itemTaskIndex, toolIndex)">
-                              <img src="../../../assets/icon/secondToolList/mindMapping.png" alt />
-                              <div style="margin: 5px 0">思维导图</div>
+                            <div class="tool" v-if="itemTool.tool == 3">
+                              <div class="whiteBIcon" @click="openToolFun(3, itemTaskIndex, toolIndex)">
+                                <img src="../../../assets/icon/secondToolList/mindMapping.png" alt />
+                                <div style="margin: 5px 0">思维导图</div>
+                              </div>
                             </div>
-                          </div>
-                          <div class="tool" v-if="itemTool.tool == 6">
-                            <div class="whiteBIcon" @click="openToolFun(6, itemTaskIndex, toolIndex)">
-                              <img src="../../../assets/icon/secondToolList/doc.png" alt />
-                              <div style="margin: 5px 0">协同文档</div>
+                            <div class="tool" v-if="itemTool.tool == 6">
+                              <div class="whiteBIcon" @click="openToolFun(6, itemTaskIndex, toolIndex)">
+                                <img src="../../../assets/icon/secondToolList/doc.png" alt />
+                                <div style="margin: 5px 0">协同文档</div>
+                              </div>
                             </div>
-                          </div>
-                          <div class="tool" v-if="itemTool.tool == 15">
-                            <div class="whiteBIcon" @click="openToolFun(15, itemTaskIndex, toolIndex)">
-                              <img src="../../../assets/icon/thirdToolList/answer.png" alt />
-                              <div style="margin: 5px 0">问答</div>
+                            <div class="tool" v-if="itemTool.tool == 15">
+                              <div class="whiteBIcon" @click="openToolFun(15, itemTaskIndex, toolIndex)">
+                                <img src="../../../assets/icon/thirdToolList/answer.png" alt />
+                                <div style="margin: 5px 0">问答</div>
+                              </div>
                             </div>
-                          </div>
-                          <div class="tool" v-if="itemTool.tool == 48 && !itemTool.toolPhoto.length
-                            ">
-                            <div class="whiteBIcon" @click="openToolFun(48, itemTaskIndex, toolIndex)">
-                              <img src="../../../assets/icon/fourthToolList/table.png" alt />
-                              <div style="margin: 5px 0">表格</div>
+                            <div class="tool" v-if="itemTool.tool == 48 && !itemTool.toolPhoto.length
+                              ">
+                              <div class="whiteBIcon" @click="openToolFun(48, itemTaskIndex, toolIndex)">
+                                <img src="../../../assets/icon/fourthToolList/table.png" alt />
+                                <div style="margin: 5px 0">表格</div>
+                              </div>
                             </div>
-                          </div>
-                          <div class="tool" v-if="itemTool.tool == 52 && !itemTool.toolPhoto.length
-                            " style="position: relative">
-                            <div class="whiteBIcon" @click="openToolFun(52, itemTaskIndex, toolIndex)">
-                              <img src="../../../assets/icon/fourthToolList/text.png" alt />
-                              <div style="margin: 5px 0">文档</div>
+                            <div class="tool" v-if="itemTool.tool == 52 && !itemTool.toolPhoto.length
+                              " style="position: relative">
+                              <div class="whiteBIcon" @click="openToolFun(52, itemTaskIndex, toolIndex)">
+                                <img src="../../../assets/icon/fourthToolList/text.png" alt />
+                                <div style="margin: 5px 0">文档</div>
+                              </div>
                             </div>
-                          </div>
-                          <div class="tool" v-if="itemTool.tool == 53" style="position: relative">
-                            <div class="whiteBIcon" :id="itemTaskIndex + '-' + toolIndex" @click="addImg($event)">
-                              <img src="../../../assets/icon/fourthToolList/file.png" alt />
-                              <div style="margin: 5px 0">文件上传</div>
-                              <input type="file"
-                                accept="application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/zip"
-                                style="display: none" @change="
-                                  beforeUploadCC(
-                                    $event,
-                                    1,
-                                    itemTaskIndex,
-                                    toolIndex,
-                                    53
-                                  )
-                                  " />
-                              <div v-if="itemTool.proVisible" class="mask">
-                                <div class="lbox2">
-                                  <img src="../../../assets/loading.gif" />
+                            <div class="tool" v-if="itemTool.tool == 53" style="position: relative">
+                              <div class="whiteBIcon" :id="itemTaskIndex + '-' + toolIndex" @click="addImg($event)">
+                                <img src="../../../assets/icon/fourthToolList/file.png" alt />
+                                <div style="margin: 5px 0">文件上传</div>
+                                <input type="file"
+                                  accept="application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/zip"
+                                  style="display: none" @change="
+                                    beforeUploadCC(
+                                      $event,
+                                      1,
+                                      itemTaskIndex,
+                                      toolIndex,
+                                      53
+                                    )
+                                    " />
+                                <div v-if="itemTool.proVisible" class="mask">
+                                  <div class="lbox2">
+                                    <img src="../../../assets/loading.gif" />
+                                  </div>
                                 </div>
                               </div>
                             </div>
-                          </div>
-                          <div class="tool" v-if="itemTool.tool == 54" style="
+                            <div class="tool" v-if="itemTool.tool == 54" style="
+                              display: flex;
+                              flex-direction: row;
+                              align-items: flex-end;
+                            ">
+                              <div class="whiteBIcon" :id="itemTaskIndex + '-' + toolIndex" @click="addImg($event)"
+                                style="position: relative">
+                                <img src="../../../assets/icon/fourthToolList/photo.png" alt />
+                                <div style="margin: 5px 0">拍照</div>
+                                <!-- capture="camera" -->
+                                <input type="file" accept="video/mp4, video/quicktime, video/x-msvideo,image/*"
+                                  style="display: none" @change="
+                                    beforeUploadCC(
+                                      $event,
+                                      2,
+                                      itemTaskIndex,
+                                      toolIndex,
+                                      54
+                                    )
+                                    " />
+                                <div v-if="itemTool.proVisible" class="mask" style="background: unset" @click.stop="1">
+                                  <div class="lbox2"></div>
+                                </div>
+                              </div>
+                              <div v-if="itemTool.proVisible" style="margin: 5px 0" class="f_size_box">
+                                <img src="../../../assets/loading.gif" />
+                                <div>
+                                  <span>{{ itemTool.isFinishSize }}M</span> /
+                                  <span>{{ itemTool.isAllSize }}M</span>
+                                </div>
+                                <!-- <el-button type="text">取消</el-button> -->
+                              </div>
+                            </div>
+                            <div class="tool" v-if="itemTool.tool == 55" style="
                               display: flex;
                               flex-direction: row;
                               align-items: flex-end;
                             ">
-                            <div class="whiteBIcon" :id="itemTaskIndex + '-' + toolIndex" @click="addImg($event)"
-                              style="position: relative">
-                              <img src="../../../assets/icon/fourthToolList/photo.png" alt />
-                              <div style="margin: 5px 0">拍照</div>
-                              <!-- capture="camera" -->
-                              <input type="file" accept="video/mp4, video/quicktime, video/x-msvideo,image/*"
-                                style="display: none" @change="
+                              <div class="whiteBIcon" :id="itemTaskIndex + '-' + toolIndex" @click="addImg($event)"
+                                style="position: relative">
+                                <img src="../../../assets/icon/fourthToolList/zip.png" alt />
+                                <div style="margin: 5px 0">文件</div>
+                                <input type="file" accept="*" style="display: none" @change="
                                   beforeUploadCC(
                                     $event,
-                                    2,
+                                    3,
                                     itemTaskIndex,
                                     toolIndex,
-                                    54
+                                    55
                                   )
                                   " />
-                              <div v-if="itemTool.proVisible" class="mask" style="background: unset" @click.stop="1">
-                                <div class="lbox2"></div>
+                                <div v-if="itemTool.proVisible" class="mask" style="background: unset" @click.stop="1">
+                                  <div class="lbox2"></div>
+                                </div>
                               </div>
-                            </div>
-                            <div v-if="itemTool.proVisible" style="margin: 5px 0" class="f_size_box">
-                              <img src="../../../assets/loading.gif" />
-                              <div>
-                                <span>{{ itemTool.isFinishSize }}M</span> /
-                                <span>{{ itemTool.isAllSize }}M</span>
+                              <div v-if="itemTool.proVisible" style="margin: 5px 0" class="f_size_box">
+                                <img src="../../../assets/loading.gif" />
+                                <div>
+                                  <span>{{ itemTool.isFinishSize }}M</span> /
+                                  <span>{{ itemTool.isAllSize }}M</span>
+                                </div>
+                                <!-- <el-button type="text">取消</el-button> -->
                               </div>
-                              <!-- <el-button type="text">取消</el-button> -->
                             </div>
-                          </div>
-                          <div class="tool" v-if="itemTool.tool == 55" style="
-                              display: flex;
-                              flex-direction: row;
-                              align-items: flex-end;
-                            ">
-                            <div class="whiteBIcon" :id="itemTaskIndex + '-' + toolIndex" @click="addImg($event)"
-                              style="position: relative">
-                              <img src="../../../assets/icon/fourthToolList/zip.png" alt />
-                              <div style="margin: 5px 0">文件</div>
-                              <input type="file" accept="*" style="display: none" @change="
-                                beforeUploadCC(
-                                  $event,
-                                  3,
-                                  itemTaskIndex,
-                                  toolIndex,
-                                  55
-                                )
-                                " />
-                              <div v-if="itemTool.proVisible" class="mask" style="background: unset" @click.stop="1">
-                                <div class="lbox2"></div>
+                            <div class="tool" v-if="itemTool.tool == 56">
+                              <div class="whiteBIcon" @click="openToolFun(56, itemTaskIndex, toolIndex)">
+                                <img src="../../../assets/icon/thirdToolList/ask.png" alt />
+                                <div style="margin: 5px 0">投票</div>
                               </div>
                             </div>
-                            <div v-if="itemTool.proVisible" style="margin: 5px 0" class="f_size_box">
-                              <img src="../../../assets/loading.gif" />
+                            <div v-if="itemTool.tool == 57">
                               <div>
-                                <span>{{ itemTool.isFinishSize }}M</span> /
-                                <span>{{ itemTool.isAllSize }}M</span>
+                                <iframe src="https://v.cocorobo.cn" frameborder="0" width="100%" height="650"></iframe>
                               </div>
-                              <!-- <el-button type="text">取消</el-button> -->
-                            </div>
-                          </div>
-                          <div class="tool" v-if="itemTool.tool == 56">
-                            <div class="whiteBIcon" @click="openToolFun(56, itemTaskIndex, toolIndex)">
-                              <img src="../../../assets/icon/thirdToolList/ask.png" alt />
-                              <div style="margin: 5px 0">投票</div>
-                            </div>
-                          </div>
-                          <div v-if="itemTool.tool == 57">
-                            <div>
-                              <iframe src="https://v.cocorobo.cn" frameborder="0" width="100%" height="650"></iframe>
                             </div>
-                          </div>
-                          <div v-if="itemTool.tool == 51">
-                            <div class="vedioTaskBox">
-                              <div class="box_course" :class="'box_course' + itemTaskIndex + toolIndex
-                                " v-if="itemTool.toolData.length > 0 && !itemTool.isNoFile">
-                                <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
-                                  .type == 2
-                                  ">
-                                  <div class="workd_media" style="height: 100%">
-                                    <video-player class="video-player vjs-custom-skin" :playsinline="true" :options="itemTool.toolData[itemTool.sourceIndex]
-                                      .src
-                                      " @play="onPlayerPlay($event)" style="width: 99%; height: 100%"></video-player>
+                            <div v-if="itemTool.tool == 51">
+                              <div class="vedioTaskBox">
+                                <div class="box_course" :class="'box_course' + itemTaskIndex + toolIndex
+                                  " v-if="itemTool.toolData.length > 0 && !itemTool.isNoFile">
+                                  <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
+                                    .type == 2
+                                    ">
+                                    <div class="workd_media" style="height: 100%">
+                                      <video-player class="video-player vjs-custom-skin" :playsinline="true" :options="itemTool.toolData[itemTool.sourceIndex]
+                                        .src
+                                        " @play="onPlayerPlay($event)" style="width: 99%; height: 100%"></video-player>
+                                    </div>
                                   </div>
-                                </div>
-                                <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
-                                  .type == 6
-                                  " style="
+                                  <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
+                                    .type == 6
+                                    " style="
                                     box-shadow: 0 0 6px 1px #f2f2f2;
                                     width: 99%;
                                     background: #f1f1f1;
                                     height: 650px;
                                   ">
-                                  <div class="texttitle">查看文档</div>
-                                  <el-form class="textBox">
-                                    <el-form-item class="textTitle">
-                                      <div style="
+                                    <div class="texttitle">查看文档</div>
+                                    <el-form class="textBox">
+                                      <el-form-item class="textTitle">
+                                        <div style="
                                           font-size: 22px;
                                           max-height: 100px;
                                           overflow: auto;
                                         ">
-                                        {{
-                                          itemTool.toolData[
-                                            itemTool.sourceIndex
-                                          ].name
-                                        }}
-                                      </div>
-                                    </el-form-item>
-                                    <div v-html="itemTool.toolData[itemTool.sourceIndex]
-                                          .url
-                                        " class="textContent"></div>
-                                  </el-form>
-                                </div>
-                                <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
-                                  .type == 3
-                                  " style="height: 650px; width: 99%">
-                                  <iframe style="
+                                          {{
+                                            itemTool.toolData[
+                                              itemTool.sourceIndex
+                                            ].name
+                                          }}
+                                        </div>
+                                      </el-form-item>
+                                      <div v-html="itemTool.toolData[itemTool.sourceIndex]
+                                            .url
+                                          " class="textContent"></div>
+                                    </el-form>
+                                  </div>
+                                  <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
+                                    .type == 3
+                                    " style="height: 650px; width: 99%">
+                                    <iframe style="
                                       width: 100%;
                                       height: 100%;
                                       border: none;
                                     " :src="itemTool.toolData[itemTool.sourceIndex]
                                       .src
                                       "></iframe>
-                                </div>
-                                <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
-                                  .type == 8
-                                  " style="height: 650px; width: 99%">
-                                  <iframe style="
+                                  </div>
+                                  <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
+                                    .type == 8
+                                    " style="height: 650px; width: 99%">
+                                    <iframe style="
                                       width: 100%;
                                       height: 100%;
                                       border: none;
                                     " :src="itemTool.toolData[itemTool.sourceIndex]
                                       .src
                                       " security="restricted"
-                                    sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
-                                </div>
-                                <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
-                                  .type == 13
-                                  " style="height: 650px; width: 99%">
-                                  <el-image :src="itemTool.toolData[itemTool.sourceIndex].url" fit="contain"
-                                    style="width: 100%; height: 100%; cursor: pointer"
-                                    @click="previewImg(itemTool.toolData[itemTool.sourceIndex].url)"></el-image>
-                                </div>
-                                <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
-                                  .type == 9
-                                  " style="height: 650px; width: 99%">
-                                  <pdf :pdfUrl="itemTool.toolData[itemTool.sourceIndex]
-                                    .url
-                                    " style="
+                                      sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
+                                  </div>
+                                  <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
+                                    .type == 13
+                                    " style="height: 650px; width: 99%">
+                                    <el-image :src="itemTool.toolData[itemTool.sourceIndex].url" fit="contain"
+                                      style="width: 100%; height: 100%; cursor: pointer"
+                                      @click="previewImg(itemTool.toolData[itemTool.sourceIndex].url)"></el-image>
+                                  </div>
+                                  <div class="wheel" v-if="itemTool.toolData[itemTool.sourceIndex]
+                                    .type == 9
+                                    " style="height: 650px; width: 99%">
+                                    <pdf :pdfUrl="itemTool.toolData[itemTool.sourceIndex]
+                                      .url
+                                      " style="
                                       width: 100%;
                                       height: 100%;
                                       overflow: auto;
                                     ">
-                                  </pdf>
+                                    </pdf>
+                                  </div>
                                 </div>
-                              </div>
-                              <div class="vedioList" :class="'vedioList' + itemTaskIndex + toolIndex"
-                                v-if="itemTool.toolData.length > 0">
-                                <div class="navTitile">内容列表:</div>
-                                <div class="navBox">
-                                  <div>
-                                    <div class="vedioTimeBox" v-for="(
+                                <div class="vedioList" :class="'vedioList' + itemTaskIndex + toolIndex"
+                                  v-if="itemTool.toolData.length > 0">
+                                  <div class="navTitile">内容列表:</div>
+                                  <div class="navBox">
+                                    <div>
+                                      <div class="vedioTimeBox" v-for="(
                                         chapter, cIndex
                                       ) in itemTool.toolData" :key="cIndex + '1'"
-                                      @click="setChapterIndex(itemTool, cIndex)">
-                                      <div class="vedioName" :class="{
-                                        isClickNav:
-                                          itemTool.sourceIndex == cIndex,
-                                      }">
-                                        {{
-                                          chapter.type == 8
-                                          ? chapter.title
-                                          : chapter.name
-                                        }}
+                                        @click="setChapterIndex(itemTool, cIndex)">
+                                        <div class="vedioName" :class="{
+                                          isClickNav:
+                                            itemTool.sourceIndex == cIndex,
+                                        }">
+                                          {{
+                                            chapter.type == 8
+                                            ? chapter.title
+                                            : chapter.name
+                                          }}
+                                        </div>
                                       </div>
                                     </div>
                                   </div>
                                 </div>
                               </div>
-                            </div>
-                            <div style="padding: 10px 0 0" v-if="itemTool.toolData[itemTool.sourceIndex]">
-                              <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
-                                .type == 3 ||
-                                itemTool.toolData[itemTool.sourceIndex]
-                                  .type == 9
-                                " type="primary" @click="
+                              <div style="padding: 10px 0 0" v-if="itemTool.toolData[itemTool.sourceIndex]">
+                                <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
+                                  .type == 3 ||
+                                  itemTool.toolData[itemTool.sourceIndex]
+                                    .type == 9
+                                  " type="primary" @click="
     checkFileFull(
       itemTool.toolData[itemTool.sourceIndex]
         .type,
       itemTool.toolData[itemTool.sourceIndex].src
     )
     ">全屏查看</el-button>
-                              <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
-                                .type == 3 ||
-                                itemTool.toolData[itemTool.sourceIndex]
-                                  .type == 9
-                                " type="primary" @click="
+                                <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
+                                  .type == 3 ||
+                                  itemTool.toolData[itemTool.sourceIndex]
+                                    .type == 9
+                                  " type="primary" @click="
     downloadFile(
       itemTool.toolData[itemTool.sourceIndex].src
     )
     ">文件下载</el-button>
-                              <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
-                                .type == 8
-                                " type="primary" @click="
+                                <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
+                                  .type == 8
+                                  " type="primary" @click="
     openLineS(
       itemTool.toolData[itemTool.sourceIndex].src
     )
     ">打开链接
-                              </el-button>
-                              <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
-                                .type == 6
-                                " type="primary" @click="
+                                </el-button>
+                                <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
+                                  .type == 6
+                                  " type="primary" @click="
     checkFileFull(
       itemTool.toolData[itemTool.sourceIndex]
         .type,
       itemTool.toolData[itemTool.sourceIndex]
     )
     ">全屏查看</el-button>
-                              <el-button type="primary" @click="
-                                editSourceUpadte(itemTaskIndex, toolIndex)
-                                ">添加资源</el-button>
+                                <el-button type="primary" @click="
+                                  editSourceUpadte(itemTaskIndex, toolIndex)
+                                  ">添加资源</el-button>
+                              </div>
                             </div>
                           </div>
-                        </div>
-                        <div v-if="itemTool.tool != 51">
-                          <textarea rows="3" type="text" placeholder="添加工具描述" class="binfo_input" style="
-                                margin: 0 0 20px;
+                          <div v-if="itemTool.tool != 51" style="width: 71.5%;"
+                            :style="{ marginLeft: ((itemTool.tool == 52 || itemTool.tool == 48) && itemTool.toolPhoto.length) ? '0' : '10px' }">
+                            <textarea rows="3" type="text" placeholder="添加工具描述" class="binfo_input" style="
                                 resize: none;
-                                width: 71.5% !important;
+                                width: 100% !important;
                               " v-model="itemTool.toolDetail"></textarea>
+                          </div>
                         </div>
                         <div v-if="itemTool.toolPhoto.length" style="margin-top: 10px" class="toolimg_box">
                           <div class="toolimg" v-for="(photo, pIndex) in itemTool.toolPhoto" :key="pIndex"
@@ -6827,7 +6854,7 @@ export default {
               : "";
             if (element != "") {
               b++;
-              this.$message.error(`请将题目${i+1}填写完整。`);
+              this.$message.error(`请将题目${i + 1}填写完整。`);
               return;
             } else {
               a++;
@@ -6848,7 +6875,7 @@ export default {
               if (checkC != "") {
                 index++;
               } else {
-                this.$message.error(`题目${i+1}选项不能为空!`);
+                this.$message.error(`题目${i + 1}选项不能为空!`);
                 return;
               }
             }
@@ -6896,7 +6923,7 @@ export default {
               : "";
             if (element != "") {
               b++;
-              this.$message.error(`请将题目${i+1}填写完整。`);
+              this.$message.error(`请将题目${i + 1}填写完整。`);
               return;
             } else {
               a++;
@@ -6917,7 +6944,7 @@ export default {
               if (checkC != "") {
                 index++;
               } else {
-                this.$message.error(`题目${i+1}选项不能为空!`);
+                this.$message.error(`题目${i + 1}选项不能为空!`);
                 return;
               }
             }
@@ -8776,11 +8803,15 @@ export default {
 
 .cru_line {
   position: absolute;
-  bottom: 0px;
-  transition: all 0.5s;
-  left: 0px;
-  width: 125px;
-  margin-left: -25px;
+    bottom: 8px;
+    -webkit-transition: all 0.5s;
+    transition: all 0.5s;
+    left: 0px;
+    width: 60px;
+    margin-left: 6px;
+    background: #0061FF;
+    height: 4px;
+    border-radius: 5px;
 }
 
 .cru_select {
@@ -8792,7 +8823,7 @@ export default {
 }
 
 .cru_selected {
-  color: #0b7fc2 !important;
+  color: #0061FF !important;
 }
 
 .chapter_contentbox {
@@ -9401,7 +9432,7 @@ ol {
 }
 
 .stepTop>div {
-  height: 80px;
+  height: 65px;
   width: 85%;
   cursor: pointer;
   margin: 10px 0;
@@ -9412,7 +9443,7 @@ ol {
 .second,
 .third,
 .four {
-  background: #4a83d0;
+  background: #0061FF;
   height: 90px;
   color: #fff;
   display: flex;
@@ -9421,14 +9452,32 @@ ol {
   justify-content: center;
 }
 
-.first>div:nth-child(1),
-.second>div:nth-child(1),
-.third>div:nth-child(1),
-.four>div:nth-child(1) {
-  margin: 5px 10px 0 0;
-  width: 2rem;
+.cfirst{
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  width: 150px;
+}
+
+.cfirst img{
+  width:100%;
+}
+
+.cfirst > div:nth-child(1){
+  margin-right: 5px;
+  width: 28px;
+  display: flex;
+  align-items: center;
 }
 
+/* .first>div>div:nth-child(1),
+.second>div>div:nth-child(1),
+.third>div>div:nth-child(1),
+.four>div>div:nth-child(1) {
+  margin: 0 10px 0 0;
+  width: 2rem;
+} */
+
 .firstNo,
 .secondNo,
 .thirdNo,
@@ -9441,13 +9490,13 @@ ol {
   justify-content: center;
 }
 
-.firstNo>div:nth-child(1),
-.secondNo>div:nth-child(1),
-.thirdNo>div:nth-child(1),
-.fourNo>div:nth-child(1) {
-  margin: 5px 10px 0 0;
+/* .firstNo>div>div:nth-child(1),
+.secondNo>div>div:nth-child(1),
+.thirdNo>div>div:nth-child(1),
+.fourNo>div>div:nth-child(1) {
+  margin: 0 10px 0 0;
   width: 2rem;
-}
+} */
 
 .uploadWidth>>>.el-upload {
   width: 60px;
@@ -9536,7 +9585,7 @@ ol {
 
 .upCss>>>.el-upload-list__item .el-icon-close {
   font-size: 20px;
-    z-index: 9999;
+  z-index: 9999;
 }
 
 .addStageImg {

+ 3 - 3
src/components/pages/student/course.vue

@@ -729,7 +729,7 @@ export default {
 }
 
 .student_head>>>.el-button--primary {
-  background-color: #2268bc;
+  background-color: #0061FF;
 }
 
 .xls_button {
@@ -753,7 +753,7 @@ export default {
 }
 
 .bgColor {
-  background: #466b99;
+  background: #0061FF;
 }
 
 .student_search {
@@ -1020,7 +1020,7 @@ export default {
 
 .course_button {
   color: #fff;
-  background: #2268bc;
+  background: #0061FF;
   width: 75px;
   height: 40px;
   padding: 0 !important;

+ 11 - 0
src/components/pages/task/addCourse.vue

@@ -12502,6 +12502,17 @@ ol {
   margin: 0 5px 0 0;
 }
 
+.clineTitle::before {
+  content: '';
+  display: block;
+  min-width: 10px;
+  width: 10px;
+  height: 10px;
+  background: #0061ff;
+  border-radius: 50%;
+  margin: 0 5px 0 0;
+}
+
 .courseTop {
   display: flex;
   flex-direction: row;

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.