Michael Wang 5 жил өмнө
parent
commit
77b7c2a1ce

+ 2 - 4
src/components/MainLayout/MainLayout.vue

@@ -111,7 +111,7 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
+import { mapState, mapGetters } from "vuex";
 import VueQrcode from "@chenfengyuan/vue-qrcode";
 import SiteMessagePopup from "./SiteMessagePopup.vue";
 
@@ -128,6 +128,7 @@ export default {
   },
   computed: {
     ...mapState(["user", "siteMessages", "QECSConfig"]),
+    ...mapGetters(["isEpcc"]),
     messageUnread() {
       return this.siteMessages.filter(v => v.hasRead === false).length;
     },
@@ -146,9 +147,6 @@ export default {
       const shouldShow = this.QECSConfig.SHOW_STUDENT_CLIENT_APP_QRCODE;
       return shouldShow === "true";
     },
-    isEpcc() {
-      return this.user.schoolDomain === "iepcc-ps.ecs.qmth.com.cn";
-    },
     getLogo() {
       return this.isEpcc
         ? require("./epcc-logo.png")

+ 7 - 5
src/features/OnlineExam/OnlineExamHome.vue

@@ -19,7 +19,7 @@
 <script>
 import EcsOnlineList from "./OnlineExamList.vue";
 import PhoneVerifyForDD from "./PhoneVerifyForDD.vue";
-import { mapMutations, mapState } from "vuex";
+import { mapMutations, mapState, mapGetters } from "vuex";
 
 export default {
   name: "OnlineExamHome",
@@ -36,6 +36,7 @@ export default {
   },
   computed: {
     ...mapState(["user", "siteMessagesTimeStamp"]),
+    ...mapGetters(["isEpcc"]),
   },
   beforeRouteEnter(to, from, next) {
     next(vm => {
@@ -68,9 +69,11 @@ export default {
                   姓名:{this.$store.state.user.name} -{" "}
                   {this.$store.state.user.studentCodeList.join(",")}
                 </div>
-                <div style="font-weight:bold; line-height: 25px;">
-                  专业:{this.$store.state.user.specialty}
-                </div>
+                {!this.isEpcc && (
+                  <div style="font-weight:bold; line-height: 25px;">
+                    专业:{this.$store.state.user.specialty}
+                  </div>
+                )}
                 {macosVersionTooLow && (
                   <div style="font-weight:bold; line-height: 25px; color: red">
                     您的操作系统版本过低,为保证考试过程顺利完成,请更新操作系统到
@@ -135,7 +138,6 @@ export default {
   beforeDestroy() {
     clearInterval(this.interval);
   },
-
   methods: {
     ...mapMutations(["updateSiteMessages"]),
   },

+ 5 - 4
src/features/OnlineExam/OnlineExamList.vue

@@ -90,7 +90,10 @@ import { createNamespacedHelpers } from "vuex";
 import OnlineExamResultList from "./OnlineExamResultList.vue";
 import OnlineExamFaceCheckModal from "./OnlineExamFaceCheckModal.vue";
 import moment from "moment";
-import { mapState as globalMapState } from "vuex";
+import {
+  mapState as globalMapState,
+  mapGetters as globalMapGetters,
+} from "vuex";
 const { mapState, mapMutations } = createNamespacedHelpers("examHomeModule");
 import CheckComputer from "./CheckComputer";
 
@@ -122,9 +125,7 @@ export default {
   computed: {
     ...globalMapState(["user", "timeDifference"]),
     ...mapState(["faceCheckModalOpen"]),
-    isEpcc() {
-      return this.user.schoolDomain === "iepcc-ps.ecs.qmth.com.cn";
-    },
+    ...globalMapGetters(["isEpcc"]),
   },
   created() {
     this.getNow();

+ 5 - 0
src/store.js

@@ -228,4 +228,9 @@ export default new Vuex.Store({
     examHomeModule,
     examingHomeModule,
   },
+  getters: {
+    isEpcc(state) {
+      return state.user.schoolDomain === "iepcc-ps.ecs.qmth.com.cn";
+    },
+  },
 });