提交最新代码

src/config/index.js

@@ -40,21 +40,21 @@ if (process.env.NODE_ENV === 'development') {
 
 // -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  // 3.OSS正式环境(aiKmt)
-            BASE_URL = 'https://api.sharingschool.com/sz'; // OSS正式环境地址
-            APP_ID =  "wx5a83afb22813e986"//OSS正式环境
-            RESET_URL = "https://aikmt.sharingschool.com/manager/index.html#/" //OSS正式环境
-            TYPE = 1
-            IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
-            APPOR_BASE_URL = 'https://aikmt.sharingschool.com/kmt/index.html#/'; //oss正式环境作业批改地址地址;
+        //     BASE_URL = 'https://api.sharingschool.com/sz'; // OSS正式环境地址
+        //     APP_ID =  "wx5a83afb22813e986"//OSS正式环境
+        //     RESET_URL = "https://aikmt.sharingschool.com/manager/index.html#/" //OSS正式环境
+        //     TYPE = 1
+        //     IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
+        //     APPOR_BASE_URL = 'https://aikmt.sharingschool.com/kmt/index.html#/'; //oss正式环境作业批改地址地址;
 
 // -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 // 4.OSS实训环境配置(Sxkmt)
-        //  BASE_URL = 'https://sx.sharingschool.com/sz'  //OSS实训环境地址
-        //  APP_ID = "wx7fe760dc3c45794d" //OSS实训环境
-        // RESET_URL = "https://sxkmt.sharingschool.com/manager/index.html#/" //OSS实训环境
-        // TYPE = 0
-        // IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
-        // APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html#/' //Oss实习环境作业批改地址
+        BASE_URL = 'https://sx.sharingschool.com/sz'  //OSS实训环境地址
+        APP_ID = "wx7fe760dc3c45794d" //OSS实训环境
+        RESET_URL = "https://sxkmt.sharingschool.com/manager/index.html#/" //OSS实训环境
+        TYPE = 0
+        IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
+        APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html#/' //Oss实习环境作业批改地址
 
 }
 const TIME_OUT = 15000

src/pages/Qualityinspector/GetCheckHomeWork.vue

@@ -133,9 +133,9 @@ export default {
     AutoApor() {
       this.Activeindex = true;
     },
-        StudentSearchPages() {
-        this.$router.push({
-        path: "/Qualityinspector/checkAllStudentHomework",
+    StudentSearchPages() {
+      this.$router.push({
+      path: "/Qualityinspector/checkAllStudentHomework",
       });
     },
     selectTipage(item) {

src/pages/Qualityinspector/checkListInfo.vue

@@ -377,6 +377,16 @@
                 <div v-if="GetTeacherDetail.status ===0" class="Online">（离线）</div>
                 <div class="model-items-first-left-down">{{GetTeacherDetail.school}}</div>
               </div>
+                <!-- 青铜等级 -->
+              <img src="../../assets/img/Bronze-level.png" v-if="GetTeacherDetail.teacherLevel ==0" alt class="model-items-first-img"/>
+              <!-- 白银等级 -->
+               <img src="../../assets/img/The-silver-grade.png" v-if="GetTeacherDetail.teacherLevel ==1" alt class="model-items-first-img"/>
+              <!-- 黄金等级 -->
+              <img src="../../assets/img/Gold-grade.png" v-if="GetTeacherDetail.teacherLevel ==2" alt class="model-items-first-img"/>
+              <!-- 铂金等级 -->
+               <img src="../../assets/img/Platinum-rating.png" v-if="GetTeacherDetail.teacherLevel ==3" alt class="model-items-first-img"/>
+               <!-- 钻石等级 -->
+                <img src="../../assets/img/Diamond-grade.png" v-if="GetTeacherDetail.teacherLevel ==4" alt class="model-items-first-img"/>
             </div>
           </div>
           <div

src/pages/home/SchoolManager.vue

@@ -327,11 +327,6 @@
                         <span>去批改</span>
                       </el-button>
                       <el-button @click="isShow(v,1)" type="success">去分配</el-button>
-                      <span
-                        v-if="v.waitingTime"
-                        class="WorngCount"
-                        style="color:#52CC60;font-size:12px;"
-                      >{{v.waitingTime}}</span>
                     </div>
                     <div
                       class="ApporTeacher"
@@ -376,6 +371,13 @@
                         style="color:#fbfbfb;font-size:12px;"
                       >报错{{v.wrongCount}}</span>
                     </div>
+                     <div style="width: 15%">
+                         <span
+                         v-if="v.waitingTime"
+                        class="WorngCount"
+                        style="color:#52CC60;font-size:10px;"
+                      >{{v.waitingTime}}</span>
+                    </div>
                   </div>
                   <!-- 分页显示 -->
                   <el-pagination
@@ -991,6 +993,16 @@
                 <div v-if="GetTeacherDetail.status ===0" class="Online">（离线）</div>
                 <div class="model-items-first-left-down">{{GetTeacherDetail.school}}</div>
               </div>
+              <!-- 青铜等级 -->
+              <img src="../../assets/img/Bronze-level.png" v-if="GetTeacherDetail.teacherLevel ==0" alt class="model-items-first-img"/>
+              <!-- 白银等级 -->
+               <img src="../../assets/img/The-silver-grade.png" v-if="GetTeacherDetail.teacherLevel ==1" alt class="model-items-first-img"/>
+              <!-- 黄金等级 -->
+              <img src="../../assets/img/Gold-grade.png" v-if="GetTeacherDetail.teacherLevel ==2" alt class="model-items-first-img"/>
+              <!-- 铂金等级 -->
+               <img src="../../assets/img/Platinum-rating.png" v-if="GetTeacherDetail.teacherLevel ==3" alt class="model-items-first-img"/>
+               <!-- 钻石等级 -->
+                <img src="../../assets/img/Diamond-grade.png" v-if="GetTeacherDetail.teacherLevel ==4" alt class="model-items-first-img"/>
               <div
                 class="closeTeacherID"
                 v-if="this.teacherRoles != 11  && this.TeacherIdStatus !==3"

src/pages/super/HomeworkTotally.vue

@@ -103,9 +103,6 @@ export default {
     var currentdate = year + seperator1 + month + seperator1 + strDate;
     this.startTime = currentdate
     this.endTime = currentdate
-    console.log(this.startTime)
-     console.log(this.endTime)
-      console.log(currentdate)
 }
 
   },

src/pages/super/SchoolManager.vue

@@ -317,13 +317,8 @@
                     </div>
                     <div class="tr-sw180" v-if="v.status === 2" style="width: 25%"></div>
                     <div class="tr-sw180" v-if="v.status === 1" style="width: 25%">
-                      <!-- <el-button type="" plain><a style="text-decoration:none;color:#52cc60;" :href="'https://kmt.sharingschool.com/aijia/kmt/index.html?homeworkId='+v.homeworkId+'&accessToken='+accessToken+'&state='+1">去批改</a></el-button> -->
+        
                       <el-button @click="isShow(v,1)" type="success">去分配</el-button>
-                         <span
-                         v-if="v.waitingTime"
-                        class="WorngCount"
-                        style="color:#52CC60;font-size:10px;"
-                      >{{v.waitingTime}}</span>
                     </div>
                     <div
                       class="ApporTeacher"
@@ -363,6 +358,13 @@
                         style="color:#fbfbfb;font-size:12px;"
                       >报错{{v.wrongCount}}</span>
                     </div>
+                    <div style="width: 15%">
+                         <span
+                         v-if="v.waitingTime"
+                        class="WorngCount"
+                        style="color:#52CC60;font-size:10px;"
+                      >{{v.waitingTime}}</span>
+                    </div>
                   </div>
                   <!-- 分页显示 -->
                   <div v-if="parseInt(TeacherHomeworkList.pages) > 10">
@@ -911,14 +913,21 @@
                 class="model-items-first-img"
               />
               <div class="model-items-first-left" style="display:inline-block">
-                <!-- <div class="Onlinename">李小花</div>
-                <div class="Online">（在线）</div>
-                <div class="model-items-first-left-down">南方科技大学</div>-->
                 <div class="Onlinename">{{GetTeacherDetail.name}}</div>
                 <div v-if="GetTeacherDetail.status ===1" class="Online">（在线）</div>
                 <div v-if="GetTeacherDetail.status ===0" class="Online">（离线）</div>
                 <div class="model-items-first-left-down">{{GetTeacherDetail.school}}</div>
               </div>
+                <!-- 青铜等级 -->
+              <img src="../../assets/img/Bronze-level.png" v-if="GetTeacherDetail.teacherLevel ==0" alt class="model-items-first-img"/>
+              <!-- 白银等级 -->
+               <img src="../../assets/img/The-silver-grade.png" v-if="GetTeacherDetail.teacherLevel ==1" alt class="model-items-first-img"/>
+              <!-- 黄金等级 -->
+              <img src="../../assets/img/Gold-grade.png" v-if="GetTeacherDetail.teacherLevel ==2" alt class="model-items-first-img"/>
+              <!-- 铂金等级 -->
+               <img src="../../assets/img/Platinum-rating.png" v-if="GetTeacherDetail.teacherLevel ==3" alt class="model-items-first-img"/>
+               <!-- 钻石等级 -->
+                <img src="../../assets/img/Diamond-grade.png" v-if="GetTeacherDetail.teacherLevel ==4" alt class="model-items-first-img"/>
               <div
                 class="closeAnOpenId"
                 style="display:inline-block"