2

src/components/course/mateitem.vue

@@ -53,19 +53,13 @@
             </span>
           </div>
         </div>
-        <template v-if="subItem.ClassType == 3||subItem.ClassType == 2">
+        <template v-if="subItem.ClassType == 1||subItem.ClassType == 3">
           <div class="plan_Inner" style="align-items:center;">
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
-              {{ subItem.Ranks }}/{{ subItem.TotalPlanNum }}
-            </div>
-          </div>
-        </template>
-        <template v-else>
-          <div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress >= 0">
-            <div class="plan_LeftTitle">课程进度：</div>
-            <div class="plan_RightInner">
-              <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+              <span v-if="subItem.ClassType == 1">{{ subItem.Ranks }}/{{ subItem.TotalPlanNum }}</span>
+              <span v-if="subItem.ClassType == 3">第{{ subItem.Ranks||0 }}次课</span>
+              <span v-if="subItem.ClassType == 3&&subItem.CourseGradeName" class="q-ml-sm">({{subItem.CourseGradeName}})</span>
             </div>
           </div>
         </template>

src/components/stuMan/subscribe/detail.vue

@@ -27,17 +27,6 @@
           </div>
         </template>
       </q-field>
-      <!-- <q-field
-        filled
-        label="等级"
-        stack-label
-        class="col-6"
-        v-if="saveObj.ClassType == 3"
-      >
-        <template v-slot:control>
-          <div>{{ saveObj.CourseGradeName }}</div>
-        </template>
-      </q-field> -->
       <q-field filled label="类型" stack-label class="col-6">
         <template v-slot:control>
           <div>
@@ -56,7 +45,7 @@
           <div>
             <span v-if="saveObj.ClassType == 1">{{ saveObj.Ranks }}/{{ saveObj.TotalPlanNum }}</span>
             <span v-if="saveObj.ClassType == 3">第{{ saveObj.Ranks||0 }}次课</span>
-            <span class="q-ml-sm" v-if="saveObj.ClassType == 3">({{ saveObj.CourseGradeName }})</span>
+            <span class="q-ml-sm" v-if="saveObj.ClassType == 3&&saveObj.CourseGradeName">({{ saveObj.CourseGradeName }})</span>
           </div>
         </template>
       </q-field>

src/pages/classroom/components/mateitem.vue

@@ -40,16 +40,12 @@
               <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
             </div>
           </div>
-          <div class="plan_Inner" style="align-items:center;" v-if="subItem.ClassType===1&&subItem.CompleteProgress>=0">
+          <div class="plan_Inner" style="align-items:center;" v-if="subItem.ClassType===1&&subItem.ClassType===3">
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
-              <el-progress :percentage="subItem.CompleteProgress"></el-progress>
-            </div>
-          </div>
-          <div class="plan_Inner" style="align-items:center;" v-if="subItem.ClassType!==1&&subItem.Ranks&&subItem.TotalPlanNum">
-            <div class="plan_LeftTitle">课程进度：</div>
-            <div class="plan_RightInner">
-              {{subItem.Ranks}}/{{subItem.TotalPlanNum}}
+              <span v-if="subItem.ClassType == 1">{{ subItem.Ranks }}/{{ subItem.TotalPlanNum }}</span>
+              <span v-if="subItem.ClassType == 3">第{{ subItem.Ranks||0 }}次课</span>
+              <span v-if="subItem.ClassType == 3&&subItem.CourseGradeName" class="q-ml-sm">({{subItem.CourseGradeName}})</span>
             </div>
           </div>
           <template v-if="subItem.ClassType == 3">

src/pages/teacher/components/mateitem.vue

@@ -51,10 +51,12 @@
               </span>
             </div>
           </div>
-          <div class="plan_Inner" style="align-items:center;">
+          <div class="plan_Inner" style="align-items:center;" v-if="subItem.ClassType == 1&&subItem.ClassType ==3">
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
-              {{subItem.Ranks}}/{{subItem.TotalPlanNum}}
+              <span v-if="subItem.ClassType == 1">{{ subItem.Ranks }}/{{ subItem.TotalPlanNum }}</span>
+              <span v-if="subItem.ClassType == 3">第{{ subItem.Ranks||0 }}次课</span>
+              <span v-if="subItem.ClassType == 3&&subItem.CourseGradeName" class="q-ml-sm">({{subItem.CourseGradeName}})</span>
             </div>
           </div>
           <template v-if="subItem.ClassType == 3">