SanHQin 9 months ago
parent
commit
f9d9a782e8

+ 3 - 0
src/assets/icon/course/back.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="16" viewBox="0 0 20 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.614027 1.426C0.727567 1.15188 0.919852 0.917585 1.16656 0.752756C1.41327 0.587927 1.70332 0.499966 2.00003 0.5H12C13.9892 0.5 15.8968 1.29018 17.3033 2.6967C18.7099 4.10322 19.5 6.01088 19.5 8C19.5 9.98912 18.7099 11.8968 17.3033 13.3033C15.8968 14.7098 13.9892 15.5 12 15.5H3.00003C2.6022 15.5 2.22067 15.342 1.93937 15.0607C1.65806 14.7794 1.50003 14.3978 1.50003 14C1.50003 13.6022 1.65806 13.2206 1.93937 12.9393C2.22067 12.658 2.6022 12.5 3.00003 12.5H12C13.1935 12.5 14.3381 12.0259 15.182 11.182C16.0259 10.3381 16.5 9.19347 16.5 8C16.5 6.80653 16.0259 5.66193 15.182 4.81802C14.3381 3.97411 13.1935 3.5 12 3.5H5.62103L6.56103 4.44C6.83413 4.72303 6.98515 5.10201 6.98155 5.4953C6.97795 5.8886 6.82001 6.26474 6.54177 6.54273C6.26353 6.82071 5.88723 6.97828 5.49393 6.98151C5.10063 6.98475 4.7218 6.83337 4.43903 6.56L0.939027 3.06C0.729412 2.85026 0.586665 2.5831 0.528819 2.29227C0.470973 2.00144 0.500625 1.69999 0.614027 1.426Z" fill="#699BF7"/>
+</svg>

+ 13 - 4
src/components/classRoomHelper/index.vue

@@ -4,6 +4,8 @@
       <searchArea
         :courseDetail="courseDetail"
         ref="searchAreaRef"
+				:navList="navList"
+				:tcid="tcid"
         v-if="itemType == 1"
       />
       <taskArea
@@ -34,7 +36,7 @@
           </el-tooltip>
         </div>
 
-        <div @click="$emit('review')">
+        <div @click="$emit('review')" v-if="tType==1">
           <el-tooltip class="item" effect="dark" content="评论" placement="top">
             <img
               :src="require('../../assets/icon/course/comment.png')"
@@ -43,8 +45,7 @@
             />
           </el-tooltip>
         </div>
-
-        <div @click="$emit('authority')" v-if="tType==1">
+        <div @click="$emit('authority')" v-if="(tType==1 || tType == 4)"><!-- -->
           <el-tooltip class="item" effect="dark" content="权限" placement="top">
             <img
               :src="require('../../assets/icon/course/setting.png')"
@@ -166,7 +167,15 @@ export default {
 		tType:{
 			type:Number,
 			default:0,
-		}
+		},
+		navList:{
+			type:Array,
+			default:()=>[]
+		},
+		tcid:{
+			type:String,
+			default:""
+		},
   },
   data() {
     return {

+ 1 - 1
src/components/easy2/studyStudent.vue

@@ -8041,7 +8041,7 @@
       </div>
     </div>
 		<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
-		<classRoomHelper v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="2" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
+		<classRoomHelper :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
                     '/courseDetail?userid=' +
                       userid +
                       '&oid=' +

+ 1 - 1
src/components/easy3/studyStudent.vue

@@ -8029,7 +8029,7 @@
       </div>
     </div>
 				<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
-		<classRoomHelper v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="3" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
+		<classRoomHelper :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
                     '/courseDetail?userid=' +
                       userid +
                       '&oid=' +

+ 1 - 1
src/components/studyStudent.vue

@@ -8038,7 +8038,7 @@
         </el-dialog>
       </div>
 			<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
-      <classRoomHelper v-show="orgArray.includes(org) || oidArray.includes(oid)"  ref="classRoomHelperRef" :courseDetail="courseDetail" :tType='1' @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
+      <classRoomHelper :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)"  ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
                     '/courseDetail?userid=' +
                       userid +
                       '&oid=' +