Merge branch 'master' of http://47.112.200.206:3000/aijia/kmt

package-lock.json

@@ -4563,7 +4563,6 @@
           "version": "1.0.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "delayed-stream": "~1.0.0"
           }
@@ -4629,8 +4628,7 @@
         "delayed-stream": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "delegates": {
           "version": "1.0.0",
@@ -4677,9 +4675,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.5",
+            "mime-types": "^2.1.12"
           }
         },
         "fs.realpath": {
@@ -4772,8 +4770,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
+            "ajv": "^4.9.1",
+            "har-schema": "^1.0.5"
           }
         },
         "has-unicode": {
@@ -4836,7 +4834,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "is-typedarray": {
@@ -4922,16 +4920,14 @@
         "mime-db": {
           "version": "1.27.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "mime-types": {
           "version": "2.1.15",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
-            "mime-db": "1.27.0"
+            "mime-db": "~1.27.0"
           }
         },
         "minimatch": {
@@ -4939,14 +4935,13 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "brace-expansion": "1.1.7"
+            "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "mkdirp": {
           "version": "0.5.1",
@@ -5006,8 +5001,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "oauth-sign": {
           "version": "0.8.2",
@@ -5047,8 +5041,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
           }
         },
         "path-is-absolute": {

src/components/SeacherHomewrokStatus.vue

@@ -661,14 +661,22 @@ export default {
     // 查看学生作业原图详情
     GetStudentHomeworkDetail(v) {
       // debugger
+      const { SchoolData = 0 } = this
       this.$store.dispatch("GetStudentHomeworkDetail", {
         teacherId: v.teacherId,
         homeworkId: v.homeworkId,
         type: this.TeacherType
       });
-      this.$router.push({
-        path: "/Super/HomeWorkPictrue"
-      });
+      if (SchoolData == 1) {
+        this.$router.push({
+          path: "/home/HomeWorkPictrue"
+        });
+      } else {
+        this.$router.push({
+          path: "/Super/HomeWorkPictrue"
+        });
+      }
+      
     },
     // 查看老师详情信息
     async GetTeacherInfo() {

src/config/index.js

@@ -4,14 +4,14 @@ let RESET_URL = ''
 let TYPE = ''
 let IMG_BASE_URL = ''
 let APPOR_BASE_URL = ''
-if (process.env.NODE_ENV === 'development') {
-    BASE_URL = 'https://xt.sharingschool.com/sz'
-    APP_ID = "wx3d4605f43beda11a"//测试环境AppId
-    RESET_URL = "https://xtkmt.sharingschool.com/manager/index.html#/" //测试环境微信重定向页面
-     TYPE = 0
-     IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
-     APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
-} else {
+// if (process.env.NODE_ENV === 'development') {
+//     BASE_URL = 'https://xt.sharingschool.com/sz'
+//     APP_ID = "wx3d4605f43beda11a"//测试环境AppId
+//     RESET_URL = "https://xtkmt.sharingschool.com/manager/index.html#/" //测试环境微信重定向页面
+//      TYPE = 0
+//      IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
+//      APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
+// } else {
 
 // // 1.测试环境配置
              BASE_URL = 'https://xt.sharingschool.com/sz' //测试环境服务器地址
@@ -56,7 +56,7 @@ if (process.env.NODE_ENV === 'development') {
         // IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
         // APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html#/' //Oss实习环境作业批改地址
 
-}
+// }
 const TIME_OUT = 10000
 
 export {

src/pages/home/HomeWorkPictrue.vue

@@ -0,0 +1,241 @@
+<!-- 活动解析 -->
+<template>
+  <div>
+    <!-- table 表格 -->
+    <el-row :gutter="20" class="main-items">
+      <el-col :span="20" class="main" :offset="2">
+        <el-row>
+          <el-col :span="20" class :offset="2">
+            <div class="studentInfo">
+              <span class="studentName">{{StudentHomeworkDetail.name}}同学/{{StudentHomeworkDetail.subject}}作业</span>
+              <span v-if="StudentHomeworkDetail.status ==1" style="color:#52cc60;">/未分配</span>
+               <span v-if="StudentHomeworkDetail.status ==2" style="color:#52cc60;">/已分配未批改</span>
+             <span v-if="StudentHomeworkDetail.status ==3" style="color:#52cc60;">/批改中</span>
+              <br />
+              <span class="timeInfo">{{StudentHomeworkDetail.statusTime}}</span>
+            </div>
+          
+          </el-col>
+          <el-col :span="20" class :offset="2">
+            <div class="topLine"></div>
+          </el-col>
+          <el-col :span="20" class :offset="2">
+              <!-- {{StudentHomeworkDetail}} -->
+            <div class="beginPictrue" v-if="StudentHomeworkDetail.originPicList !== undefined && StudentHomeworkDetail.originPicList.length >0">
+              <div class="studentName">原图</div>
+              <ul>
+                <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomeworkDetail.originPicList" :key="k">
+                    <img :src="BASE_URL + v.url" alt class="table-img pictrueStyle" v-if="v.url"  />
+                    <img src="../../assets/img/attt.png" alt v-if="v.url ==''"  class="table-img pictrueStyle"/>
+                  <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                   <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  <!-- 模糊 -->
+                  <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
+                  <!-- 不全 -->
+                  <img v-if="v.type ==3" class="logoPic" src="../../assets/img/Reless (3).png" />
+                  <!-- 登记 -->
+                  <img  v-if="v.type ==22" class="logoPic" src="../../assets/img/sigin (3).png" />
+                  <!-- 补拍 -->
+                  <img v-if="v.type ==2" class="logoPic" src="../../assets/img/ReCamrea (1).png" />
+                  <!-- 不批改 -->
+                  <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
+                </li>
+              </ul>
+            </div>
+          </el-col>
+          <el-col :span="20" class :offset="2">
+            <div class="beginPictrue" v-if="StudentHomeworkDetail.correctPicList !== undefined && StudentHomeworkDetail.correctPicList.length >0">
+              <div class="studentName">批改图片</div>
+              <ul>
+                <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomeworkDetail.correctPicList" :key="k">
+                   <img :src="BASE_URL + v.url" alt class="table-img pictrueStyle" v-if="v.url"  />
+                    <img src="../../assets/img/attt.png" alt v-if="v.url ==''"  class="table-img pictrueStyle"/>
+                  <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                   <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  <!-- 模糊 -->
+                  <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
+                  <!-- 不全 -->
+                  <img v-if="v.type ==3" class="logoPic" src="../../assets/img/Reless (3).png" />
+                  <!-- 登记 -->
+                  <img  v-if="v.type ==22" class="logoPic" src="../../assets/img/sigin (3).png" />
+                  <!-- 补拍 -->
+                  <img v-if="v.type ==2" class="logoPic" src="../../assets/img/ReCamrea (1).png" />
+                  <!-- 不批改 -->
+                  <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
+                </li>
+              </ul>
+            </div>
+          </el-col>
+            <el-col :span="20" class :offset="2">
+            <div style="margin-top:200px; text-align:center;">
+              <el-button @click="routerback()" type="success" round>返回</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+    <!-- 升级校区管理员弹框 -->
+    <div class="showModel" @click="allShowModel(1)" v-if="PictruePush"></div>
+    <div class="modelspec" v-if="PictruePush">
+      <div class="detaillogo">
+        <img src="../../assets/img/del@2x.png" alt @click="allShowModel(1)" />
+      </div>
+      <img class="LargepictrueStyle" :src="BASE_URL + this.PrewPictrue " />
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters, mapActions } from "vuex";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
+export default {
+  components: {},
+  name: "",
+  props: {},
+  data() {
+    return {
+      BASE_URL: IMG_BASE_URL,
+      PictruePush: false,
+      PrewPictrue:""
+    };
+  },
+  created() {},
+  methods: {
+    pictrueAddView(v) {
+        this.PrewPictrue = v.url
+      this.PictruePush = true;
+    },
+        // 回退
+    routerback() {
+      this.$router.back(-1);
+    },
+    //关闭弹框
+    allShowModel(str) {
+      let _this = this;
+      if (str == 1) {
+        _this.PictruePush = false;
+      }
+    }
+  },
+  watch: {},
+  mounted() {},
+  computed: {
+    ...mapGetters(["StudentHomeworkDetail"])
+  }
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+.main {
+  background-color: #fff;
+  margin-top: 16px;
+  padding: 0 !important;
+  border: 1px solid #e1e1e1;
+  min-height: 980px;
+}
+
+.topLine {
+  width: 100%;
+  background-color: rgba(207, 204, 204, 0.815);
+  height: 1px;
+}
+.picLists {
+  position: relative;
+}
+.TeacherWords {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 30px;
+  background: #000000;
+  text-align: center;
+  line-height: 30px;
+  opacity: 0.4;
+  color: #ffff;
+  font-size: 8px;
+}
+.logoPic {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+.userstyle {
+  width: 50px;
+  height: 50px;
+  border-radius: 25px;
+}
+.studentInfo {
+  display: inline-block;
+  float: left;
+  /* height: 70px; */
+  margin-top: 30px;
+  text-align: left;
+}
+.loginMock {
+  color: #333333;
+  font-size: 14px;
+  display: inline-block;
+  float: right;
+  margin-top: 30px;
+}
+.timeInfo {
+  color: #999999;
+  font-size: 14px;
+}
+.studentName {
+  font-size: 18px;
+  color: black;
+  width: 120px;
+  text-align: left;
+}
+.pictrueStyle {
+  width: 120px;
+  height: 120px;
+  border-radius: 5px;
+}
+.beginPictrue ul li {
+  float: left;
+  margin: 15px 20px 15px 0px;
+  cursor: pointer;
+}
+.showModel {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000000;
+  opacity: 0.2;
+  overflow: hidden;
+  z-index: 1000;
+  color: #fff;
+}
+.modelspec {
+  margin: 0 auto;
+}
+.LargepictrueStyle {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+}
+.modelspec {
+  z-index: 10000;
+  width: 50%;
+  /* height: 100%; */
+  height: auto;
+  position: fixed;
+  top: 10%;
+  left: 25%;
+  bottom: 10%;
+  margin: auto;
+  border-radius: 10px;
+  text-align: center;
+}
+.detaillogo {
+  position: fixed;
+  top: 5%;
+  right: 13%;
+  cursor: pointer;
+}
+</style>

src/permission.js

@@ -2,7 +2,7 @@ import router from './router'
 import store from './store'
 import { Message } from 'element-ui'
 
-// let accessToken = localStorage.getItem("accessToken")
+let accessToken = localStorage.getItem("accessToken")
 router.beforeEach((to, from, next) => {
     let accessToken = localStorage.getItem("accessToken")
     // let ToAcess =  to.matched[1].meta.roles[0];

src/router/index.js

@@ -13,6 +13,7 @@ import TeacherApporval from "@/pages/home/TeacherApporval";
 import TeacherPay from "@/pages/home/TeacherPay";
 import LeaningAllStudentHomework from "@/pages/home/AllStudentHomework";
 import LeaningAllHomeWorkPictrue from "@/pages/home/AllHomeWorkPictrue";
+import TeacherHomeWorkPictrue from "@/pages/home/HomeWorkPictrue";
 
 // 超级管理员
 import CheckTeacherAudit from "@/pages/Super/CheckTeacherAudit";
@@ -180,6 +181,12 @@ export const constantRouterMap =
           component: LeaningAllStudentHomework,
           meta: { title: '作业列表', roles: ['2'] }
         },
+        {
+				  path: "HomeWorkPictrue",
+				  name: "HomeWorkPictrue",
+				  component: TeacherHomeWorkPictrue,
+				  meta: { title: '批改作业原图', roles: ['2'] }
+        },
        ]
      },
      //质检员

src/store/modules/user.js

@@ -187,6 +187,7 @@ const user = {
       //   unionid登录
       //  获取TOKEN
        UnionidLogin({ state, commit, dispatch }, data) {
+        
         console.log(data);
         axios.Tokenpost(GET_UUIONID_TOKEN, data).then(res => {
           if (res && res.code == '999') {