update

src/components/pages/addCourse.vue

@@ -138,10 +138,12 @@
                           <input type="text" placeholder="请输入课程名称" class="binfo_input" v-model="courseName" />
                         </div>
                       </div>
-                      <div class="pType_box">
+                      <div class="pType_box all_choose" v-if="oid=='1c3b9def-8fbe-11ed-b13d-005056b86db5'">
+                        <span>类型</span>
+                        <!-- 学科+ 主题+  未来+ -->
                         <el-checkbox-group v-model="pTypeCheck" style="display: flex;align-items: center;">
-                          <div class="all_choose" style="width:100px" v-for="(item, index) in CourseType[0]" :key="index">
-                              <el-checkbox  v-if="CourseTypeJson[item.id].length" :label="item.id" >{{item.name}}+</el-checkbox>
+                          <div class="all_choose" style="width:100px" v-for="(item, index) in CourseType2" :key="index">
+                              <el-checkbox :label="item.id" >{{item.name}}+</el-checkbox>
                           </div>
                         </el-checkbox-group>
                       </div>
@@ -304,35 +306,6 @@
                         flex-wrap: nowrap;
                         position: relative;
                       ">
-                    <!-- <div style="margin-right: 15px; min-width: 120px">
-                      请选择评价指标
-                    </div>
-                    <div>
-                      <el-select
-                        v-model="evalua"
-                        placeholder="请选择体系"
-                        @change="checkEva"
-                      >
-                        <el-option
-                          v-for="(e, eIndex) in evaJuri"
-                          :key="eIndex"
-                          :label="e.title"
-                          :value="e.id"
-                        ></el-option>
-                      </el-select>
-                    </div> -->
-                    <!-- <div
-                      @click="openT"
-                      class="addPeople"
-                      style="
-                        background: #6b92c9;
-                        margin: 0 0 0 15px;
-                        position: absolute;
-                        right: 23%;
-                      "
-                    >
-                      前往设置目标管理
-                    </div> -->
                     <div class="e_box">
                       <div class="e_card" v-for="(item, index) in evaJuri" :key="index">
                         <div class="e_card_picture">
@@ -341,12 +314,8 @@
                         <div class="e_card_name">
                           <span>{{ item.title }}</span>
                         </div>
-                        <!-- <div class="e_card_time">
-                          <span>{{ item.time }}</span>
-                        </div> -->
                         <div class="e_card_btn">
                           <span @click="checkEva(item.id, 2)">导入</span>
-                          <!-- <span @click="openT">前往设置</span> -->
                         </div>
                       </div>
                       <div class="addEva" @click="openT">
@@ -374,11 +343,6 @@
                             bottom: -10px;
                             left: 155px;
                           " />
-                      <!-- <el-input
-                        v-model="eTitle"
-                        placeholder="请输入名称"
-                        @change="setMindData"
-                      ></el-input>-->
                     </div>
                     <div class="e_add_delete" @click="deleteEva()">
                       <img src="../../assets/icon/delete.png" alt="" />
@@ -2873,6 +2837,7 @@ export default {
       AttTextIndex: 0,
       cTemplate: "",
       CourseType: [],
+      CourseType2: [],
       CourseTypeJson: {},
       courseTypeId: [],
       courseTypeSon: [],
@@ -6054,6 +6019,16 @@ export default {
         .get(this.$store.state.api + "selectAllType", params)
         .then((res) => {
           this.CourseType = res.data;
+          this.CourseType2 = [{name:'学科'},{name:'主题'},{name:'未来'}];
+            for(var cti = 0;cti<res.data[0].length;cti++){
+              if(res.data[0][cti].name == '年级'){
+                this.CourseType2[1].id = res.data[0][cti].id
+              }else if(res.data[0][cti].name == '主题'){
+                this.CourseType2[2].id = res.data[0][cti].id
+              }else if(res.data[0][cti].name == '学科'){
+                this.CourseType2[0].id = res.data[0][cti].id
+              }
+            }
           let _courseTypeId = [];
           for (var i = 0; i < res.data[0].length; i++) {
             if (!this.cid) {
@@ -7941,7 +7916,7 @@ ol {
 }
 
 .all_choose>span {
-  width: 100px;
+  min-width: 100px;
   display: block;
   letter-spacing: 14px;
   white-space: nowrap;

src/components/pages/student/addCourse.vue

@@ -1964,8 +1964,9 @@
                 <img src="../../../assets/icon/qr_code.jpg" v-if="org == '150e3120-9195-11ed-b13d-005056b86db5'" alt />
                 <img src="../../../assets/icon/right.png" v-else alt />
               </div>
-              <div style="font-weight: bold;margin:10px 0" v-if="org == '150e3120-9195-11ed-b13d-005056b86db5'">请前往腾讯未来教室小程序活动作品展示栏提交您的作品</div>
-              <div style="font-weight: bold">成功</div>
+              <div style="font-weight: bold;margin:10px 0" v-if="org == '150e3120-9195-11ed-b13d-005056b86db5'">请参加双师科创成长营活动的成员</div>
+              <div style="font-weight: bold;margin:10px 0" v-if="org == '150e3120-9195-11ed-b13d-005056b86db5'">前往腾讯未来教室小程序活动作品展示栏提交您的作品</div>
+              <div style="font-weight: bold">创建成功</div>
               <!-- <div>您的项目编号</div>
                               <div class="number">{{ number }}</div>-->
               <!-- <div class="success_button">
@@ -4400,6 +4401,10 @@ export default {
                 }
               );
           }
+          let _task = this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].toolArray
+          for(var _tool = 0;_tool<_task.length;_tool++){
+              delete _task[_tool].proVisible
+          }
         }
         if (cPan == 2) {
           this.unitIndex = oldValue;
@@ -6174,6 +6179,7 @@ export default {
       this.sourcesData = [];
       this.proVisible = false;
       this.progress = 0;
+      this.inputShow = true;
       this.taskCount = itemTaskIndex;
       this.dialogVisibleSource = true;
     },
@@ -8148,6 +8154,10 @@ export default {
                   }
                   this.unitJson[j].chapterInfo[i].taskJson[k].chapterData =
                     _chapterData;
+                  let _task = this.unitJson[j].chapterInfo[i].taskJson[k].toolArray
+                  for(var _tool = 0;_tool<_task.length;_tool++){
+                      delete _task[_tool].proVisible
+                  }
                 }
               }
             }
@@ -9001,6 +9011,9 @@ export default {
             .toolArray[index].toolData
         )
       );
+      this.proVisible = false;
+      this.progress = 0;
+      this.inputShow = true;
       this.dialogVisibleSource = true;
     },
     addQuestion() {