提交最新代码

src/config/index.js

@@ -31,17 +31,17 @@ if (process.env.NODE_ENV === 'development') {
 
 //  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  // 2.正式环境配置(Kmt)
-        //   BASE_URL = 'https://api.sharingschool.com/sz'; //正式环境地址 
-        //   APP_ID = "wxd18ca9555a939281"//正式环境
-        //   RESET_URL = "https://kmt.sharingschool.com/aijia/manager/index.html#/" //正式环境微信重定向页面
-        //   TYPE = 0
-        //   IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
-        //   APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
+          BASE_URL = 'https://api.sharingschool.com/sz'; //正式环境地址 
+          APP_ID = "wxd18ca9555a939281"//正式环境
+          RESET_URL = "https://kmt.sharingschool.com/aijia/manager/index.html#/" //正式环境微信重定向页面
+          TYPE = 0
+          IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
+          APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
 
 // -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  // 3.OSS正式环境(aiKmt)
         //     BASE_URL = 'https://api.sharingschool.com/sz'; // OSS正式环境地址
-        //     APP_ID =  "wx5a83afb22813e986"//OSS正式环境
+        //        APP_ID =  "wx5a83afb22813e986"//OSS正式环境
         //     RESET_URL = "https://aikmt.sharingschool.com/manager/index.html#/" //OSS正式环境
         //     TYPE = 1
         //     IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
@@ -49,12 +49,12 @@ if (process.env.NODE_ENV === 'development') {
 
 // -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 // 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/AllHomeWorkPictrue.vue

@@ -40,6 +40,12 @@
                   <!-- 不批改 -->
                   <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
                   <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}上传</div>
+                   <div class="operateTime">
+                        <span class="teacherImgUrl">
+                          <img :src="BASE_URL + v.teacherImgUrl" alt="">
+                        </span>
+                         <span  v-if="v.teacherName">{{v.teacherName}}老师批改</span>      
+                      </div>
                 </li>
               </ul>
             </div>
@@ -65,11 +71,11 @@
                   <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
                       <div class="operateTime" v-if="v.startTime">{{v.startTime}}开始批改</div>
                      <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}批改完</div>
-                      <div class="operateTime" v-if="v.teacherName">
+                      <div class="operateTime" >
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师批改</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师批改</span>      
                       </div>
                 </li>
               </ul>
@@ -97,11 +103,11 @@
                       <div class="operateTime" v-if="v.startTime">{{v.startTime}}开始匹配</div>
                      <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}匹配完</div>
                      <div class="operateTime" v-if="!v.operateTime">未匹配</div>
-                       <div class="operateTime" v-if="v.teacherName">
+                       <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师匹配</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师匹配</span>      
                       </div>
                 </li>
               </ul>
@@ -130,11 +136,11 @@
                   <img v-if="v.type ==23" class="logoPic" src="../../assets/img/wrong (3).png" />
                      <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}质检完</div>
                      <div class="operateTime" v-if="!v.operateTime">未质检</div>
-                       <div class="operateTime" v-if="v.teacherName">
+                       <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师质检</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师质检</span>      
                       </div>
                 </li>
               </ul>
@@ -164,11 +170,11 @@
                   
                   <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}质检完</div>
                      <div class="operateTime" v-if="!v.operateTime">未质检</div>
-                       <div class="operateTime" v-if="v.teacherName">
+                       <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师质检</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师质检</span>      
                       </div>
                 </li>
               </ul>
@@ -335,7 +341,7 @@ export default {
 }
 .beginPictrue ul li {
   float: left;
-  margin: 15px 100px 15px 0px;
+  margin: 30px 100px 30px 0px;
   cursor: pointer;
 }
 .showModel {

src/pages/Qualityinspector/checkListInfo.vue

@@ -569,6 +569,7 @@ export default {
   created() {
     const managerId = this.$route.query.managerId;
     this.managerId = managerId;
+    this.TeacherCheackStyle = 2
   },
   computed: {
     ...mapGetters([

src/pages/home/AllHomeWorkPictrue.vue

@@ -40,6 +40,12 @@
                   <!-- 不批改 -->
                   <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
                   <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}上传</div>
+                   <div class="operateTime" >
+                        <span class="teacherImgUrl">
+                          <img :src="BASE_URL + v.teacherImgUrl" alt="">
+                        </span>
+                         <span v-if="v.teacherName">{{v.teacherName}}老师批改</span>      
+                      </div>
                 </li>
               </ul>
             </div>
@@ -65,11 +71,11 @@
                   <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
                      <div class="operateTime" v-if="v.startTime">{{v.startTime}}开始批改</div>
                      <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}批改完</div>
-                      <div class="operateTime" v-if="v.teacherName">
+                      <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师批改</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师批改</span>      
                       </div>
                 </li>
               </ul>
@@ -97,11 +103,11 @@
                      <div class="operateTime" v-if="v.startTime">{{v.startTime}}开始匹配</div>
                      <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}匹配完</div>
                      <div class="operateTime" v-if="!v.operateTime">未匹配</div>
-                       <div class="operateTime" v-if="v.teacherName">
+                       <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师匹配</span>      
+                         <span v-if="v.teacherName"> {{v.teacherName}}老师匹配</span>      
                       </div>
                 </li>
               </ul>
@@ -130,11 +136,11 @@
                   <img v-if="v.type ==23" class="logoPic" src="../../assets/img/wrong (3).png" />
                      <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}质检完</div>
                      <div class="operateTime" v-if="!v.operateTime">未质检</div>
-                       <div class="operateTime" v-if="v.teacherName">
+                       <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师质检</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师质检</span>      
                       </div>
                 </li>
               </ul>
@@ -164,11 +170,11 @@
                   
                   <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}质检完</div>
                      <div class="operateTime" v-if="!v.operateTime">未质检</div>
-                       <div class="operateTime" v-if="v.teacherName">
+                       <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师质检</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师质检</span>      
                       </div>
                 </li>
               </ul>
@@ -335,7 +341,7 @@ export default {
 }
 .beginPictrue ul li {
   float: left;
-  margin: 15px 100px 15px 0px;
+  margin: 30px 100px 30px 0px;
   cursor: pointer;
 }
 .showModel {

src/pages/home/SchoolManager.vue

@@ -1391,6 +1391,7 @@ export default {
   created() {
     const managerId = this.$route.query.managerId;
     this.managerId = managerId;
+    this.TeacherCheackStyle = 2
   },
   watch: {
     BeforetoTeacherAllotCode(val, oldVal) {
@@ -1899,6 +1900,7 @@ export default {
     },
     selectTitle(k) {
       this.modelindex = k;
+      this.TeacherCheackStyle = 2
       if (k === 0) {
         this.TeacherType = 8;
         this.Activeindex = false;

src/pages/super/AllHomeWorkPictrue.vue

@@ -40,6 +40,12 @@
                   <!-- 不批改 -->
                   <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
                   <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}上传</div>
+                   <div class="operateTime">
+                        <span class="teacherImgUrl">
+                          <img :src="BASE_URL + v.teacherImgUrl" alt="">
+                        </span>
+                         <span v-if="v.teacherName">{{v.teacherName}}老师批改</span>      
+                      </div>
                 </li>
               </ul>
             </div>
@@ -65,11 +71,11 @@
                   <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
                      <div class="operateTime" v-if="v.startTime">{{v.startTime}}开始批改</div>
                      <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}批改完</div>
-                      <div class="operateTime" v-if="v.teacherName">
+                      <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师批改</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师批改</span>      
                       </div>
                 </li>
               </ul>
@@ -97,11 +103,11 @@
                       <div class="operateTime" v-if="v.startTime">{{v.startTime}}开始匹配</div>
                      <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}匹配完</div>
                      <div class="operateTime" v-if="!v.operateTime">未匹配</div>
-                       <div class="operateTime" v-if="v.teacherName">
+                       <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师匹配</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师匹配</span>      
                       </div>
                 </li>
               </ul>
@@ -130,11 +136,11 @@
                   <img v-if="v.type ==23" class="logoPic" src="../../assets/img/wrong (3).png" />
                      <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}质检完</div>
                      <div class="operateTime" v-if="!v.operateTime">未质检</div>
-                       <div class="operateTime" v-if="v.teacherName">
+                       <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师质检</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师质检</span>      
                       </div>
                 </li>
               </ul>
@@ -164,11 +170,11 @@
                   
                   <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}质检完</div>
                      <div class="operateTime" v-if="!v.operateTime">未质检</div>
-                       <div class="operateTime" v-if="v.teacherName">
+                       <div class="operateTime">
                         <span class="teacherImgUrl">
                           <img :src="BASE_URL + v.teacherImgUrl" alt="">
                         </span>
-                         <span>{{v.teacherName}}老师质检</span>      
+                         <span v-if="v.teacherName">{{v.teacherName}}老师质检</span>      
                       </div>
                 </li>
               </ul>
@@ -335,7 +341,7 @@ export default {
 }
 .beginPictrue ul li {
   float: left;
-  margin: 15px 100px 15px 0px;
+  margin: 30px 100px 30px 0px;
   cursor: pointer;
 }
 .showModel {

src/pages/super/SchoolManager.vue

@@ -1550,6 +1550,7 @@ export default {
   created() {
     const managerId = this.$route.query.managerId;
     this.managerId = managerId;
+   this.TeacherCheackStyle = 2
   },
   computed: {
     ...mapGetters([
@@ -1906,6 +1907,7 @@ export default {
     },
     selectTitle(k) {
       this.modelindex = k;
+      this.TeacherCheackStyle = 2
       if (k === 0) {
         this.TeacherType = 8;
         this.Activeindex = false;
@@ -2435,9 +2437,6 @@ export default {
   },
   mounted() {
     this.InfoWatch();
-    // this.getsetDictByType2();
-    // this.getUserNameList();
-    // this.itemListReshow();
   },
   watch: {
     getTeacherIdStatus(val, oldVal) {