update

src/components/pages/a.vue

@@ -1,326 +0,0 @@
-<template>
-    <div class="container">
-      <div class="setters">
-        <div class="minutes-set">
-          <button
-            data-setter="minutes-plus"
-            @click="changeTime('minutes-plus')"
-            :disabled="isStarted"
-            :style="{ opacity: isStarted ? 0.5 : 1 }"
-          >
-            +
-          </button>
-          <button
-            data-setter="minutes-minus"
-            @click="changeTime('minutes-minus')"
-            :disabled="isStarted"
-            :style="{ opacity: isStarted ? 0.5 : 1 }"
-          >
-            -
-          </button>
-        </div>
-        <div class="seconds-set">
-          <button
-            data-setter="seconds-plus"
-            @click="changeTime('seconds-plus')"
-            :disabled="isStarted"
-            :style="{ opacity: isStarted ? 0.5 : 1 }"
-          >
-            +
-          </button>
-          <button
-            data-setter="seconds-minus"
-            @click="changeTime('seconds-minus')"
-            :disabled="isStarted"
-            :style="{ opacity: isStarted ? 0.5 : 1 }"
-          >
-            -
-          </button>
-        </div>
-      </div>
-      <div class="circle">
-        <svg width="300" viewBox="0 0 220 220" xmlns="http://www.w3.org/2000/svg">
-          <g transform="translate(110,110)">
-            <circle r="100" class="e-c-base" />
-            <g transform="rotate(-90)">
-              <circle
-                r="100"
-                class="e-c-progress"
-                :style="{ strokeDasharray: offset }"
-              />
-              <g id="e-pointer" :style="{ transform: pointerTransform }">
-                <circle cx="100" cy="0" r="8" class="e-c-pointer" />
-              </g>
-            </g>
-          </g>
-        </svg>
-      </div>
-      <div class="controlls">
-        <div class="display-remain-time">{{ displayString }}</div>
-        <!-- <button
-          :class="{ play: !play, pause: play }"
-          id="pause"
-          @click="pauseTimer"
-        ></button> -->
-      </div>
-      <el-button type="primary" @click="reset" class="reset_btn">重置</el-button>
-    </div>
-  </template>
-  
-  <script>
-  export default {
-    props: ["preTime"],
-    data() {
-      return {
-        length: Math.PI * 2 * 100,
-        offset: 0,
-        pointerTransform: "",
-        play: false,
-        intervalTimer: null,
-        wholeTime: 0,
-        timeLeft: "",
-        isPaused: false,
-        isStarted: false,
-        displayString: "",
-      };
-    },
-    watch: {
-      displayString: {
-        immediate: true,
-        deep: true,
-        handler(newValue, oldValue) {
-          this.getValue();
-        },
-      },
-    },
-    methods: {
-      changeWholeTime(seconds) {
-        if (this.wholeTime + seconds >= 0) {
-          this.wholeTime += seconds;
-          this.update(this.wholeTime, this.wholeTime);
-        }
-      },
-      changeTime(param) {
-        switch (param) {
-          case "minutes-plus":
-            this.changeWholeTime(1 * 60);
-            break;
-          case "minutes-minus":
-            this.changeWholeTime(-1 * 60);
-            break;
-          case "seconds-plus":
-            this.changeWholeTime(1);
-            break;
-          case "seconds-minus":
-            this.changeWholeTime(-1);
-            break;
-        }
-        this.displayTimeLeft(this.wholeTime);
-      },
-      update(value, timePercent, type) {
-        this.offset = -this.length - (this.length * value) / timePercent;
-        if (value === 0 && type === 1) {
-          this.pointerTransform = `rotate(${360}deg)`;
-        } else {
-          this.pointerTransform = `rotate(${(360 * value) / timePercent}deg)`;
-        }
-      },
-      displayTimeLeft(timeLeft, type) {
-        //displays time on the input
-        let minutes = Math.floor(timeLeft / 60);
-        let seconds = timeLeft % 60;
-        this.displayString = `${minutes < 10 ? "0" : ""}${minutes}:${
-          seconds < 10 ? "0" : ""
-        }${seconds}`;
-        // displayOutput.textContent = displayString;
-        this.update(timeLeft, this.wholeTime, type);
-        this.updateTimeNum();
-      },
-      timer(seconds) {
-        //counts time, takes seconds
-        let remainTime = Date.now() + seconds * 1000;
-        this.displayTimeLeft(seconds);
-  
-        let _this = this;
-        _this.intervalTimer = setInterval(function () {
-          _this.timeLeft = Math.round((remainTime - Date.now()) / 1000);
-          if (_this.timeLeft < 0) {
-            clearInterval(_this.intervalTimer);
-            _this.isStarted = false;
-            _this.play = false;
-            // setterBtns.forEach(function (btn) {
-            //   btn.disabled = false;
-            //   btn.style.opacity = 1;
-            // });
-            _this.displayTimeLeft(_this.wholeTime);
-            _this.$message.success("时间到！！！");
-            // pauseBtn.classList.remove("pause");
-            // pauseBtn.classList.add("play");
-            return;
-          }
-          _this.displayTimeLeft(_this.timeLeft);
-        }, 1000);
-      },
-      pauseTimer() {
-        if (!this.play && !this.isPaused) {
-          this.play = true;
-          this.isStarted = true;
-          this.timer(this.wholeTime);
-        } else if (this.isPaused) {
-          this.play = true;
-          this.timer(this.timeLeft);
-          this.isStarted = true;
-          this.isPaused = this.isPaused ? false : true;
-        } else {
-          this.play = false;
-          this.isStarted = true;
-          clearInterval(this.intervalTimer);
-          this.isPaused = this.isPaused ? false : true;
-        }
-        console.log(1);
-      },
-      reset() {
-        clearInterval(this.intervalTimer);
-        this.play = false;
-        this.isStarted = false;
-        this.isPaused = false;
-        this.wholeTime = 0;
-        this.timeLeft = null;
-        this.update(this.wholeTime, this.wholeTime, 1);
-        this.displayTimeLeft(this.wholeTime, 1);
-      },
-      updateTimeNum() {
-        this.$emit("updateTimeNum", this.displayString);
-      },
-      getValue() {
-        this.displayString = this.preTime;
-        this.$forceUpdate();
-      },
-    },
-    created() {
-      this.offset = this.length;
-      this.update(this.wholeTime, this.wholeTime);
-      this.displayTimeLeft(this.wholeTime);
-      this.getValue();
-    },
-    beforeDestroy() {
-      clearInterval(this.intervalTimer);
-    },
-  };
-  </script>
-  
-  <style scoped>
-  button[data-setter] {
-    outline: none;
-    background: transparent;
-    border: none;
-    font-family: "Roboto";
-    font-weight: 300;
-    font-size: 36px;
-    width: 32px;
-    /* height: 30px; */
-    color: #409eff;
-    cursor: pointer;
-  }
-  button[data-setter]:hover {
-    opacity: 0.5;
-  }
-  .container {
-    position: relative;
-    /* top: 30px; */
-    width: 300px;
-    margin: 0 auto;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-  }
-  .setters {
-    position: absolute;
-    /* left: 85px;
-    top: 75px; */
-    left: 78px;
-    top: 75px;
-  }
-  .minutes-set {
-    float: left;
-    /* margin-right: 28px; */
-    margin-right: 20px;
-  }
-  .seconds-set {
-    float: right;
-  }
-  .controlls {
-    position: absolute;
-    left: 75px;
-    top: 105px;
-    text-align: center;
-  }
-  .display-remain-time {
-    font-family: "Roboto";
-    font-weight: 100;
-    font-size: 65px;
-    color: #409eff;
-  }
-  #pause {
-    outline: none;
-    background: transparent;
-    border: none;
-    margin-top: 10px;
-    width: 50px;
-    height: 50px;
-    position: relative;
-  }
-  .play::before {
-    display: block;
-    content: "";
-    position: absolute;
-    top: 8px;
-    left: 16px;
-    border-top: 15px solid transparent;
-    border-bottom: 15px solid transparent;
-    border-left: 22px solid #77a4d3;
-  }
-  .pause::after {
-    content: "";
-    position: absolute;
-    top: 8px;
-    left: 12px;
-    width: 15px;
-    height: 30px;
-    background-color: transparent;
-    border-radius: 1px;
-    border: 5px solid #77a4d3;
-    border-top: none;
-    border-bottom: none;
-  }
-  #pause:hover {
-    opacity: 0.8;
-  }
-  .e-c-base {
-    fill: none;
-    stroke: #b6b6b6;
-    stroke-width: 4px;
-  }
-  .e-c-progress {
-    fill: none;
-    stroke: #6eaded;
-    stroke-width: 4px;
-    transition: stroke-dashoffset 0.7s;
-  }
-  .e-c-pointer {
-    fill: #fff;
-    stroke: #6eaded;
-    stroke-width: 2px;
-  }
-  #e-pointer {
-    transition: transform 0.7s;
-  }
-  
-  .reset_btn {
-    width: 100px;
-    margin: 15px auto 0px;
-    background: #527aa3;
-    border: none;
-  }
-  </style>
-  

src/components/pages/addCourse.vue

@@ -70,8 +70,10 @@
                   </el-tooltip>
                 </div>
                 <div class="moveBtn" v-if="unitJson[unitIndex].chapterInfo[0].taskJson.length > 1">
-                  <div class="chapter_upload_up" style="width: 15px;height: 15px;" @click.stop="taskMove(1, tIndex)"></div>
-                  <div class="chapter_upload_down" style="width: 15px;height: 15px;margin: 2px 0 0;" @click.stop="taskMove(2, tIndex)"></div>
+                  <div class="chapter_upload_up" style="width: 15px;height: 15px;" @click.stop="taskMove(1, tIndex)">
+                  </div>
+                  <div class="chapter_upload_down" style="width: 15px;height: 15px;margin: 2px 0 0;"
+                    @click.stop="taskMove(2, tIndex)"></div>
                 </div>
               </div>
             </div>
@@ -160,12 +162,12 @@
                 <div class="right_title">上传封面与成员</div>
 
                 <div style="
-                        padding: 0 0 50px 20px;
-                        display: flex;
-                        align-items: baseline;
-                        justify-content: flex-start;
-                        margin: 0 auto;
-                      ">
+                          padding: 0 0 50px 20px;
+                          display: flex;
+                          align-items: baseline;
+                          justify-content: flex-start;
+                          margin: 0 auto;
+                        ">
                   <div>
                     <div class="bInfo_title" style="margin-top: 0 !important">
                       课程封面
@@ -181,13 +183,13 @@
                     </el-upload>
                   </div>
                   <div style="
-                          display: flex;
-                          flex-flow: row nowrap;
-                          flex-direction: row;
-                          flex-wrap: wrap;
-                          align-items: baseline;
-                          margin: 0 30px;
-                        ">
+                            display: flex;
+                            flex-flow: row nowrap;
+                            flex-direction: row;
+                            flex-wrap: wrap;
+                            align-items: baseline;
+                            margin: 0 30px;
+                          ">
                     <!-- <div style="margin: 0 80px">
                       <div class="bInfo_title">
                         选择课程成员
@@ -251,23 +253,23 @@
               <div class="right_title">目标管理</div>
               <div style="margin: 15px auto; padding: 0 0 0 20px">
                 <div style="
-                        width: 100%%;
-                        display: flex;
-                        flex-direction: row;
-                        flex-wrap: nowrap;
-                        align-content: center;
-                        align-items: center;
-                        justify-content: space-between;
-                      ">
-                  <div style="
+                          width: 100%%;
                           display: flex;
-                          flex-flow: row nowrap;
-                          align-items: flex-start;
-                          width: 100%;
-                          flex-direction: column;
+                          flex-direction: row;
                           flex-wrap: nowrap;
-                          position: relative;
+                          align-content: center;
+                          align-items: center;
+                          justify-content: space-between;
                         ">
+                  <div style="
+                            display: flex;
+                            flex-flow: row nowrap;
+                            align-items: flex-start;
+                            width: 100%;
+                            flex-direction: column;
+                            flex-wrap: nowrap;
+                            position: relative;
+                          ">
                     <!-- <div style="margin-right: 15px; min-width: 120px">
                       请选择评价指标
                     </div>
@@ -323,21 +325,21 @@
                   </div>
                 </div>
                 <div v-if="evalua" style="
-                        border: 1px solid #e5e5e5;
-                        width: 95%;
-                        margin-top: 30px;
-                        box-shadow: 3px 1px 15px 3px #e0e0e0;
-                      ">
+                          border: 1px solid #e5e5e5;
+                          width: 95%;
+                          margin-top: 30px;
+                          box-shadow: 3px 1px 15px 3px #e0e0e0;
+                        ">
                   <div class="e_add_top">
                     <div class="e_add_title">
                       <span>当前使用目标管理</span>
                       <span>{{ eTitle }}</span>
                       <img src="../../assets/line.png" class="cru_line" style="
-                              width: 125px;
-                              height: 20px;
-                              bottom: -10px;
-                              left: 155px;
-                            " />
+                                width: 125px;
+                                height: 20px;
+                                bottom: -10px;
+                                left: 155px;
+                              " />
                       <!-- <el-input
                         v-model="eTitle"
                         placeholder="请输入名称"
@@ -392,13 +394,13 @@
                   </div>
 
                   <div style="
-                          margin-top: 10px;
-                          line-height: 19px;
-                          overflow: hidden;
-                          text-overflow: ellipsis;
-                          white-space: nowrap;
-                          padding: 0 20px;
-                        ">
+                            margin-top: 10px;
+                            line-height: 19px;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
+                            padding: 0 20px;
+                          ">
                     {{ aa.title }}
                   </div>
                 </div>
@@ -408,13 +410,13 @@
                   </div>
 
                   <div style="
-                          margin-top: 10px;
-                          line-height: 19px;
-                          overflow: hidden;
-                          text-overflow: ellipsis;
-                          white-space: nowrap;
-                          padding: 0 20px;
-                        ">
+                            margin-top: 10px;
+                            line-height: 19px;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
+                            padding: 0 20px;
+                          ">
                     任务模式
                   </div>
                 </div>
@@ -424,13 +426,13 @@
                   </div>
 
                   <div style="
-                          margin-top: 10px;
-                          line-height: 19px;
-                          overflow: hidden;
-                          text-overflow: ellipsis;
-                          white-space: nowrap;
-                          padding: 0 20px;
-                        ">
+                            margin-top: 10px;
+                            line-height: 19px;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
+                            padding: 0 20px;
+                          ">
                     单向模式
                   </div>
                 </div>
@@ -456,17 +458,17 @@
           <div class="rightBox" v-if="this.steps == 3" ref="rightboxR">
             <div class="basic_box">
               <div style="
-                      display: flex;
-                      flex-direction: row;
-                      align-items: center;
-                      position: sticky;
-                      top: 0;
-                      background: #fff;
-                      z-index: 99;
-                      width: 100%;
-                      padding: 0 20px 0 20px;
-                      box-sizing: border-box;
-                    ">
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        position: sticky;
+                        top: 0;
+                        background: #fff;
+                        z-index: 99;
+                        width: 100%;
+                        padding: 0 20px 0 20px;
+                        box-sizing: border-box;
+                      ">
                 <div class="cru_selectBox">
                   <div v-for="(item, index) in unitJson" :key="index" class="cru_select"
                     :class="unitIndex == index ? 'cru_selected' : ''" @click="unitSet(index)">
@@ -493,11 +495,11 @@
                   </div>
                 </div>
                 <div v-if="!unitJson[unitIndex].easy" style="
-                        margin: 50px 0px 10px;
-                        font-size: 1.5em;
-                        font-weight: 700;
-                        color: #0f7eff;
-                      ">
+                          margin: 50px 0px 10px;
+                          font-size: 1.5em;
+                          font-weight: 700;
+                          color: #0f7eff;
+                        ">
                   添加任务
                 </div>
                 <div class="taskBorder" :style="{ minHeight: unitJson[unitIndex].easy && 'unset' }"
@@ -508,16 +510,16 @@
                         任务{{ itemTaskIndex + 1 }}
                       </div>
                       <div class="chapter_contentbox" style="
-                              flex-direction: row;
-                              justify-content: flex-start;
-                              align-items: center;
-                            ">
-                        <div style="
-                                border-left: 6px solid #5699e8;
-                                height: 20px;
-                                padding-left: 10px;
-                                line-height: 22px;
+                                flex-direction: row;
+                                justify-content: flex-start;
+                                align-items: center;
                               ">
+                        <div style="
+                                  border-left: 6px solid #5699e8;
+                                  height: 20px;
+                                  padding-left: 10px;
+                                  line-height: 22px;
+                                ">
                           任务名称
                         </div>
                         <div>
@@ -531,14 +533,14 @@
                           style="position: absolute; right: 55px"></div>
                       </div>
                       <div style="
-                              display: flex;
-                              margin: 0 0 20px 0;
-                              flex-direction: row;
-                              justify-content: flex-start;
-                              align-items: center;
-                              width: 70.5% !important;
-                              padding-top: 30px;
-                            ">
+                                display: flex;
+                                margin: 0 0 20px 0;
+                                flex-direction: row;
+                                justify-content: flex-start;
+                                align-items: center;
+                                width: 70.5% !important;
+                                padding-top: 30px;
+                              ">
                         <div class="lineTitle">任务描述</div>
                         <div class="line"></div>
                       </div>
@@ -564,18 +566,18 @@
                     </div>
                   </div>
                   <div v-if="!unitJson[unitIndex].easy" class="basic_box" style="
-                          margin: 0;
-                          min-height: 0;
-                          width: 90% !important;
-                          padding-top: 10px !important;
-                        ">
-                    <div style="
-                            display: flex;
-                            margin: 0 0 20px 0;
-                            flex-direction: row;
-                            justify-content: flex-start;
-                            align-items: center;
+                            margin: 0;
+                            min-height: 0;
+                            width: 90% !important;
+                            padding-top: 10px !important;
                           ">
+                    <div style="
+                              display: flex;
+                              margin: 0 0 20px 0;
+                              flex-direction: row;
+                              justify-content: flex-start;
+                              align-items: center;
+                            ">
                       <div class="lineTitle">学习内容</div>
                       <div class="line"></div>
                     </div>
@@ -597,10 +599,10 @@
                           ">
                           <div class="chapter_upload_t" style="width: 100%"></div>
                           <div class="chapter_upload_o" style="
-                                  position: relative;
-                                  display: flex;
-                                  align-items: center;
-                                ">
+                                    position: relative;
+                                    display: flex;
+                                    align-items: center;
+                                  ">
                             <div class="chapter_upload_l" style="padding: 1px 0 0 10px">
                               <div v-if="item1.type == 2" class="chapter_upload_l_i1"></div>
                               <div v-if="
@@ -611,12 +613,12 @@
                               <div v-if="item1.type == 8" class="chapter_upload_l_i8" style="margin-left: 1px"></div>
                             </div>
                             <div class="chapter_upload_ic" style="
-                                    cursor: pointer;
-                                    position: absolute;
-                                    width: 45px;
-                                    right: 0;
-                                    top: 0;
-                                  ">
+                                      cursor: pointer;
+                                      position: absolute;
+                                      width: 45px;
+                                      right: 0;
+                                      top: 0;
+                                    ">
                               <div class="chapter_upload_ic_l"></div>
                               <div class="chapter_upload_ic_r" style="position: absolute" @click.stop="
                                 deleteChapterData(
@@ -643,34 +645,34 @@
     index1
   )
 " style="
-                                      border: none;
-                                      outline: none;
-                                      width: 80%;
-                                      minwidth: 215px;
-                                      z-index: 99;
-                                      font-size: 14px;
-                                      white-space: nowrap;
-                                      overflow: hidden;
-                                      text-overflow: ellipsis;
-                                    " />
+                                        border: none;
+                                        outline: none;
+                                        width: 80%;
+                                        minwidth: 215px;
+                                        z-index: 99;
+                                        font-size: 14px;
+                                        white-space: nowrap;
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                      " />
                               <input :placeholder="item1.name" v-if="item1.type == 6" style="
-                                      border: none;
-                                      outline: none;
-                                      width: 80%;
-                                      white-space: nowrap;
-                                      overflow: hidden;
-                                      text-overflow: ellipsis;
-                                    " readonly="true" @click="selectAttText(itemTaskIndex, index1)" />
+                                        border: none;
+                                        outline: none;
+                                        width: 80%;
+                                        white-space: nowrap;
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                      " readonly="true" @click="selectAttText(itemTaskIndex, index1)" />
                               <input :placeholder="
                                 item1.title ? item1.title : '链接'
                               " v-if="item1.type == 8" style="
-                                      border: none;
-                                      outline: none;
-                                      width: 80%;
-                                      white-space: nowrap;
-                                      overflow: hidden;
-                                      text-overflow: ellipsis;
-                                    " readonly="true" @click="selectLine(itemTaskIndex, index1)" />
+                                        border: none;
+                                        outline: none;
+                                        width: 80%;
+                                        white-space: nowrap;
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                      " readonly="true" @click="selectLine(itemTaskIndex, index1)" />
                               <div class="chapter_upload_ud" style="z-index: 99">
                                 <div class="chapter_upload_up" @click="
                                   upCd($event, unitIndex, index, index1)
@@ -739,11 +741,11 @@
                     </div>
                   </div>
                   <div v-if="unitJson[unitIndex].easy" class="basic_box" style="
-                          margin: 0 auto;
-                          min-height: 0;
-                          width: 95% !important;
-                          padding: 20px 10px 10px;
-                        ">
+                            margin: 0 auto;
+                            min-height: 0;
+                            width: 95% !important;
+                            padding: 20px 10px 10px;
+                          ">
                     <div>
                       <div class="add_chapters_box" v-if="
                         itemTask.chapterData &&
@@ -762,10 +764,10 @@
                           ">
                             <div class="chapter_upload_t" style="width: 100%"></div>
                             <div class="chapter_upload_o" style="
-                                  position: relative;
-                                  display: flex;
-                                  align-items: center;
-                                ">
+                                    position: relative;
+                                    display: flex;
+                                    align-items: center;
+                                  ">
                               <div class="chapter_upload_l" style="padding: 1px 0 0 10px">
                                 <div v-if="item1.type == 2" class="chapter_upload_l_i1"></div>
                                 <div v-if="
@@ -776,12 +778,12 @@
                                 <div v-if="item1.type == 8" class="chapter_upload_l_i8" style="margin-left: 1px"></div>
                               </div>
                               <div class="chapter_upload_ic" style="
-                                    cursor: pointer;
-                                    position: absolute;
-                                    width: 45px;
-                                    right: 0;
-                                    top: 0;
-                                  ">
+                                      cursor: pointer;
+                                      position: absolute;
+                                      width: 45px;
+                                      right: 0;
+                                      top: 0;
+                                    ">
                                 <div class="chapter_upload_ic_l"></div>
                                 <div class="chapter_upload_ic_r" style="position: absolute" @click.stop="
                                   deleteChapterData(
@@ -813,34 +815,34 @@
     index1
   )
 " style="
-                                      border: none;
-                                      outline: none;
-                                      width: 80%;
-                                      minwidth: 215px;
-                                      z-index: 99;
-                                      font-size: 14px;
-                                      white-space: nowrap;
-                                      overflow: hidden;
-                                      text-overflow: ellipsis;
-                                    " />
+                                        border: none;
+                                        outline: none;
+                                        width: 80%;
+                                        minwidth: 215px;
+                                        z-index: 99;
+                                        font-size: 14px;
+                                        white-space: nowrap;
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                      " />
                                 <input :placeholder="item1.name" v-if="item1.type == 6" style="
-                                      border: none;
-                                      outline: none;
-                                      width: 80%;
-                                      white-space: nowrap;
-                                      overflow: hidden;
-                                      text-overflow: ellipsis;
-                                    " readonly="true" @click="selectAttText(itemTaskIndex, index1)" />
+                                        border: none;
+                                        outline: none;
+                                        width: 80%;
+                                        white-space: nowrap;
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                      " readonly="true" @click="selectAttText(itemTaskIndex, index1)" />
                                 <input :placeholder="
                                   item1.title ? item1.title : '链接'
                                 " v-if="item1.type == 8" style="
-                                      border: none;
-                                      outline: none;
-                                      width: 80%;
-                                      white-space: nowrap;
-                                      overflow: hidden;
-                                      text-overflow: ellipsis;
-                                    " readonly="true" @click="selectLine(itemTaskIndex, index1)" />
+                                        border: none;
+                                        outline: none;
+                                        width: 80%;
+                                        white-space: nowrap;
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                      " readonly="true" @click="selectLine(itemTaskIndex, index1)" />
                                 <div class="chapter_upload_ud" style="z-index: 99">
                                   <!-- <div class="chapter_upload_up" @click="
                                   upCd($event, unitIndex, index, index1)
@@ -929,18 +931,18 @@
                     </div>
                   </div>
                   <div style="
-                          flex-direction: row;
-                          justify-content: flex-start;
-                          align-items: center;
-                          padding: 0 0 0 30px;
-                          paddint-top: 10px !important;
-                        ">
-                    <div style="
-                            display: flex;
                             flex-direction: row;
+                            justify-content: flex-start;
                             align-items: center;
-                            margin-bottom: 20px;
+                            padding: 0 0 0 30px;
+                            paddint-top: 10px !important;
                           ">
+                    <div style="
+                              display: flex;
+                              flex-direction: row;
+                              align-items: center;
+                              margin-bottom: 20px;
+                            ">
                       <div class="lineTitle">{{ !unitJson[unitIndex].easy ? '练习内容' : '评价内容' }}</div>
                       <div class="line" style="width: 90%"></div>
                     </div>
@@ -948,23 +950,23 @@
                   <div v-if="!unitJson[unitIndex].easy" class="toolChoose" style="padding: 0 0 0 30px">
                     <div class="tools">
                       <div class="leftTools" style="
-                              width: 95%;
-                              padding: 0 0 15px 0;
-                              border-bottom: 1px solid #efefef;
-                              margin-bottom: 15px;
-                            " v-for="(itemTool, toolIndex) in itemTask.toolChoose" :key="toolIndex">
+                                width: 95%;
+                                padding: 0 0 15px 0;
+                                border-bottom: 1px solid #efefef;
+                                margin-bottom: 15px;
+                              " v-for="(itemTool, toolIndex) in itemTask.toolChoose" :key="toolIndex">
                         <div>
                           <textarea rows="3" type="text" placeholder="添加工具描述" class="binfo_input"
                             style="margin: 0 0 20px 0; width: 71.5% !important" v-model="itemTool.toolDetail"></textarea>
                         </div>
                         <div style="
-                                display: flex;
-                                flex-direction: row;
-                                align-items: baseline;
-                                flex-wrap: nowrap;
-                                justify-content: flex-start;
-                                position: relative;
-                              ">
+                                  display: flex;
+                                  flex-direction: row;
+                                  align-items: baseline;
+                                  flex-wrap: nowrap;
+                                  justify-content: flex-start;
+                                  position: relative;
+                                ">
                           <div style="margin-right: 20px; font-weight: bold">
                             步骤 {{ toolIndex + 1 }} ：
                           </div>
@@ -1505,11 +1507,11 @@
                   <div v-else class="toolChoose" style="padding: 0 0 0 30px">
                     <div class="tools">
                       <div class="leftTools" style="
-                              width: 95%;
-                              padding: 0 0 15px 0;
-                              border-bottom: 1px solid #efefef;
-                              margin-bottom: 15px;
-                            " v-for="(itemTool, toolIndex) in itemTask.toolChoose" :key="toolIndex">
+                                width: 95%;
+                                padding: 0 0 15px 0;
+                                border-bottom: 1px solid #efefef;
+                                margin-bottom: 15px;
+                              " v-for="(itemTool, toolIndex) in itemTask.toolChoose" :key="toolIndex">
                         <div style="min-height: 163px">
                           <div class="toolSort">
                             <div class="tool">
@@ -1532,11 +1534,11 @@
                   <div class="elist_css">
                     <div class="elist_title">
                       <div style="
-                              display: flex;
-                              flex-direction: row;
-                              align-items: center;
-                              margin-bottom: 20px;
-                            ">
+                                display: flex;
+                                flex-direction: row;
+                                align-items: center;
+                                margin-bottom: 20px;
+                              ">
                         <div class="lineTitle">评价设置</div>
                         <div class="line" style="width: 90%"></div>
                       </div>
@@ -1578,21 +1580,21 @@
                         </div>
                       </div>
                       <div v-if="evalua" style="
-                              border: 1px solid #e5e5e5;
-                              width: 55%;
-                              margin-top: 20px;
-                              box-shadow: 3px 1px 15px 3px #e0e0e0;
-                            " class="evaCss">
+                                border: 1px solid #e5e5e5;
+                                width: 55%;
+                                margin-top: 20px;
+                                box-shadow: 3px 1px 15px 3px #e0e0e0;
+                              " class="evaCss">
                         <div class="e_add_top">
                           <div class="e_add_title">
                             <span>当前使用目标管理</span>
                             <span>{{ eTitle }}</span>
                             <img src="../../assets/line.png" class="cru_line" style="
-                                    width: 125px;
-                                    height: 20px;
-                                    bottom: -10px;
-                                    left: 155px;
-                                  " />
+                                      width: 125px;
+                                      height: 20px;
+                                      bottom: -10px;
+                                      left: 155px;
+                                    " />
                             <!-- <el-input
                         v-model="eTitle"
                         placeholder="请输入名称"
@@ -1649,10 +1651,10 @@
             </div>
           </div>
           <div style="
-                  width: calc(100% - 20px);
-                  background: rgb(255, 255, 255);
-                  border-radius: 10px;
-                " v-if="this.steps == 4">
+                    width: calc(100% - 20px);
+                    background: rgb(255, 255, 255);
+                    border-radius: 10px;
+                  " v-if="this.steps == 4">
             <div class="basic_box_success">
               <div class="right_img">
                 <img src="../../assets/icon/right.png" alt />
@@ -1843,11 +1845,11 @@
       :before-close="handleClose" class="dialog_diy">
       <div>
         <div class="a_add_title" style="
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-                justify-content: center;
-              ">
+                  display: flex;
+                  flex-direction: row;
+                  align-items: center;
+                  justify-content: center;
+                ">
           <div style="margin-right: 20px; font-size: 20px">标题:</div>
           <el-input v-model="askJson.askTitle" placeholder="请输入标题" style="width: 400px"></el-input>
         </div>
@@ -2010,19 +2012,19 @@
       <div class="toolChoose" style="padding: 0 0 0 30px">
         <div class="tools">
           <div class="leftTools" style="
-                  width: 95%;
-                  padding: 0 0 15px 0;
-                  border-bottom: 1px solid #efefef;
-                  margin-bottom: 15px;
-                " v-for="(itemTools, itemToolsIndex) in chapTools" :key="itemToolsIndex">
+                    width: 95%;
+                    padding: 0 0 15px 0;
+                    border-bottom: 1px solid #efefef;
+                    margin-bottom: 15px;
+                  " v-for="(itemTools, itemToolsIndex) in chapTools" :key="itemToolsIndex">
             <div style="
-                    display: flex;
-                    flex-direction: row;
-                    align-items: baseline;
-                    flex-wrap: nowrap;
-                    justify-content: flex-start;
-                    position: relative;
-                  ">
+                      display: flex;
+                      flex-direction: row;
+                      align-items: baseline;
+                      flex-wrap: nowrap;
+                      justify-content: flex-start;
+                      position: relative;
+                    ">
               <div class="chooseWho">
                 <div :class="chapToolsType == 0 ? 'isChooseActive' : ''" @click="chapToolsType = 0">
                   互动类
@@ -2171,11 +2173,11 @@
       :before-close="handleClose" class="dialog_diy">
       <div>
         <div class="a_add_title" style="
-                display: flex;
-                flex-direction: column;
-                align-items: flex-start;
-                justify-content: center;
-              ">
+                  display: flex;
+                  flex-direction: column;
+                  align-items: flex-start;
+                  justify-content: center;
+                ">
           <div style="margin-bottom: 20px; font-size: 20px">问题:</div>
           <el-input v-model="answerQ" placeholder="请输入您要问的问题"></el-input>
         </div>
@@ -2189,11 +2191,11 @@
       :before-close="handleClose" class="dialog_diy">
       <div>
         <div class="a_add_title" style="
-                display: flex;
-                flex-direction: column;
-                align-items: flex-start;
-                justify-content: center;
-              ">
+                  display: flex;
+                  flex-direction: column;
+                  align-items: flex-start;
+                  justify-content: center;
+                ">
           <div style="margin-bottom: 20px; font-size: 20px">问题:</div>
           <el-input v-model="answerQ" placeholder="请输入您想要回答的问题"></el-input>
         </div>
@@ -2433,13 +2435,13 @@
     <el-dialog title="添加班级" :visible.sync="dialogVisibleMoreUpload" :append-to-body="true" width="30%"
       :before-close="handleClose" class="dialog_diy">
       <div style="
-              width: 100%;
-              display: flex;
-              flex-direction: row;
-              flex-wrap: nowrap;
-              align-items: center;
-              justify-content: center;
-            ">
+                width: 100%;
+                display: flex;
+                flex-direction: row;
+                flex-wrap: nowrap;
+                align-items: center;
+                justify-content: center;
+              ">
         <div>班级：</div>
         <el-select multiple v-model="uploadJson" placeholder="请选择">
           <el-option v-for="item in classJuri" :key="item.id" :label="item.name" :value="item.id">
@@ -5408,6 +5410,7 @@ export default {
     selectCourseDetail() {
       if (this.cid == "" || this.cid == undefined) {
         console.log("这是新增课程");
+        this.selectAllType();
       } else {
         this.cidType = 1;
         let params = {
@@ -5482,7 +5485,7 @@ export default {
 
             this.seleteCourseUpdate();
             this.setMan()
-
+            this.selectAllType();
             // }, 5000);
             this.$forceUpdate();
             setTimeout(() => {
@@ -5711,6 +5714,8 @@ export default {
         .get(this.$store.state.api + "selectAllType", params)
         .then((res) => {
           this.CourseType = res.data;
+          let _courseTypeId = []
+
           for (var i = 0; i < res.data[0].length; i++) {
             if (!this.cid) {
               this.courseTypeId[res.data[0][i].id] = [];
@@ -5725,6 +5730,9 @@ export default {
             }
             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]); // 去除公共分类
                 }
@@ -5732,6 +5740,9 @@ export default {
             } 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]); // 去除公共分类
                   }
@@ -5739,6 +5750,9 @@ export default {
               }
               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[2][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]); // 去除公共分类
                   }
@@ -5746,6 +5760,7 @@ export default {
               }
             }
           }
+          this.courseTypeId = _courseTypeId
         })
         .catch((err) => {
           console.error(err);
@@ -6195,7 +6210,6 @@ export default {
     this.getClass();
     this.getTemplate();
     // this.selectType();
-    this.selectAllType();
     this.selectEva();
     this.loading = false;
     this.timer2 = setInterval(() => {
@@ -8817,7 +8831,7 @@ ol {
   height: 100%;
 }
 
-.moveBtn{
+.moveBtn {
   display: flex;
   flex-direction: column;
   align-items: flex-end;

src/components/pages/scourse.vue

@@ -508,6 +508,57 @@ export default {
         });
       // }
     },
+    selectAllType() {
+      let params = {
+        org: this.org && this.org != "" ? this.org : "",
+        oid: this.oid && this.oid != "" ? this.oid : "",
+      };
+      this.ajax
+        .get(this.$store.state.api + "selectAllTypeS", params)
+        .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.CourseTypeJson[res.data[0][i].id]) {
+              this.CourseTypeJson[res.data[0][i].id] = [];
+            }
+            if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
+              if (res.data[0][i].name == "赛道") {
+                this.CourseType[0][i].name = "项目类型";
+              }
+            }
+
+            if (res.data[2].length == 0 && res.data[3].length == 0) {
+              for (var j = 0; j < res.data[1].length; j++) {
+                if (res.data[0][i].id == res.data[1][j].pid) {
+                  this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
+                }
+              }
+            } else {
+              if (res.data[2].length > 0) {
+                for (var j = 0; j < res.data[2].length; j++) {
+                  if (res.data[0][i].id == res.data[2][j].pid) {
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[2][j]); // 去除公共分类
+                  }
+                }
+              }
+              if (res.data[3].length > 0) {
+                for (var j = 0; j < res.data[3].length; j++) {
+                  if (res.data[0][i].id == res.data[3][j].pid) {
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[3][j]); // 去除公共分类
+                  }
+                }
+              }
+            }
+          }
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
     selectType() {
       this.ajax
         .get(this.$store.state.api + "selectStudentType")
@@ -629,7 +680,7 @@ export default {
   },
   created() {
     this.page = 1;
-    this.selectType();
+    this.selectAllType();
     this.getCourse();
   },
 };
@@ -967,8 +1018,10 @@ export default {
 }
 
 .all_choose>span {
-  width: 50px;
+  width: 75px;
   display: block;
+  margin-right: 10px;
+  text-align-last: justify;
 }
 
 .choose {

src/components/pages/student/course.vue

@@ -2,7 +2,7 @@
   <div class="pb_content" style="height: auto">
     <div class="pb_head top">
       <div>
-        <span>{{orgArray.indexOf(org) != -1 || oidArray.indexOf(oid) != -1 ? "师生项目" : "项目管理"}}</span>
+        <span>{{ orgArray.indexOf(org) != -1 || oidArray.indexOf(oid) != -1 ? "师生项目" : "项目管理" }}</span>
         <!-- <span class="subClick" @click="
           goTo('/works?userid=' + userid + '&oid=' + oid + '&org=' + org)
         ">评价管理</span> -->
@@ -122,8 +122,8 @@
     <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">
+    <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>
@@ -204,8 +204,8 @@ export default {
       userid: this.$route.query.userid,
       oid: this.$route.query.oid,
       org: this.$route.query.org,
-      orgArray:["150e3120-9195-11ed-b13d-005056b86db5"],
-      oidArray:[],
+      orgArray: ["150e3120-9195-11ed-b13d-005056b86db5"],
+      oidArray: [],
       Juri: "",
       groupList: [],
       JuriList: [],
@@ -283,18 +283,18 @@ export default {
       }
       // this.$router.push(path);
     },
-    goToCourse2(cid){
+    goToCourse2(cid) {
       this.$router.push(
-          "/studentAddCourse?cid=" +
-          cid +
-          "&userid=" +
-          this.userid +
-          "&oid=" +
-          this.oid +
-          "&org=" +
-          this.org +
-          "&type=2"
-        );
+        "/studentAddCourse?cid=" +
+        cid +
+        "&userid=" +
+        this.userid +
+        "&oid=" +
+        this.oid +
+        "&org=" +
+        this.org +
+        "&type=2"
+      );
     },
     tableRowClassName({ row, rowIndex }) {
       if ((rowIndex + 1) % 2 === 0) {
@@ -495,8 +495,8 @@ export default {
             .then((res) => {
               this.isLoading = false;
               this.$message.success("删除成功");
-                
-              if(this.tableData.length == 1 && this.page>1){
+
+              if (this.tableData.length == 1 && this.page > 1) {
                 this.page--
               }
               this.getCourse();
@@ -512,6 +512,57 @@ export default {
         });
       // }
     },
+    selectAllType() {
+      let params = {
+        org: this.org && this.org != "" ? this.org : "",
+        oid: this.oid && this.oid != "" ? this.oid : "",
+      };
+      this.ajax
+        .get(this.$store.state.api + "selectAllTypeS", params)
+        .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.CourseTypeJson[res.data[0][i].id]) {
+              this.CourseTypeJson[res.data[0][i].id] = [];
+            }
+            if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
+              if (res.data[0][i].name == "赛道") {
+                this.CourseType[0][i].name = "项目类型";
+              }
+            }
+
+            if (res.data[2].length == 0 && res.data[3].length == 0) {
+              for (var j = 0; j < res.data[1].length; j++) {
+                if (res.data[0][i].id == res.data[1][j].pid) {
+                  this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
+                }
+              }
+            } else {
+              if (res.data[2].length > 0) {
+                for (var j = 0; j < res.data[2].length; j++) {
+                  if (res.data[0][i].id == res.data[2][j].pid) {
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[2][j]); // 去除公共分类
+                  }
+                }
+              }
+              if (res.data[3].length > 0) {
+                for (var j = 0; j < res.data[3].length; j++) {
+                  if (res.data[0][i].id == res.data[3][j].pid) {
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[3][j]); // 去除公共分类
+                  }
+                }
+              }
+            }
+          }
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
     selectType() {
       this.ajax
         .get(this.$store.state.api + "selectStudentType")
@@ -633,7 +684,7 @@ export default {
   },
   created() {
     this.page = 1;
-    this.selectType();
+    this.selectAllType();
     this.getCourse();
   },
 };
@@ -971,8 +1022,10 @@ export default {
 }
 
 .all_choose>span {
-  width: 50px;
+  width: 75px;
   display: block;
+  margin-right: 10px;
+  text-align-last: justify;
 }
 
 .choose {