From f11ef0d40a1974c26cb98f5ba7f066c671fba1b9 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 30 Jan 2024 17:07:51 +0800
Subject: [PATCH] fix

---
 public/index.html                 | 8 ++++----
 src/layouts/header/index.vue      | 3 ++-
 src/pages/ass/list/index.vue      | 5 ++++-
 src/pages/match/details/index.vue | 7 +++++--
 src/pages/match/list/index.vue    | 7 +++++--
 src/store/modules/user.js         | 4 ++++
 6 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/public/index.html b/public/index.html
index 62f3cca..0b1b861 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,20 +3,20 @@
     <head>
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="keywords" content="智信云,教学,教育,在线编程" />
+        <meta name="keywords" content="职站,教学,教育,在线编程" />
         <meta
             name="description"
-            content="智信云是一家为高等院校提供实验课程数字化服务的国家级高新技术企业。以区块链、大数据、人工智能等前沿技术在行业领域的运用为支撑，将新技术与经济与管理人才培养深度融合，面向全国高等院校的经济、金融、大数据应用等相关专业提供科研创新、金课建设、实验实训教学软件、实践教学以及学生就业培训为一体的专业建设咨询与技术支持服务。"
+            content="职站是一款辅助院校教师开展虚拟仿真实验教学的智能云实践平台。平台采用了大数据，云计算等技术，为学校搭建信息化平台提供了基础，可助力院校实现教学智能化升级。职站平台设计遵循着极简、高效的理念，可帮助老师轻松开展实验教学，并支持自定义发布考核和练习，智能统计和检验学生的日常实训练习效果；老师还可以通过可视化图表报告直观查看学生实训成绩，评估教学成果。"
         />
         <meta name="baidu-site-verification" content="code-TRfXe8xIkJ" />
         <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
         <link rel="stylesheet" href="//at.alicdn.com/t/font_830376_qzecyukz0s.css" />
-        <title>智信云</title>
+        <title>职站——为院校打造一站式虚拟仿真实训教学数智云平台</title>
         <script>
             var _hmt = _hmt || [];
             (function () {
                 var hm = document.createElement('script');
-                hm.src = 'https://hm.baidu.com/hm.js?e4d7deeca2d6ea71d2bd5fa2365bc654';
+                hm.src = 'https://hm.baidu.com/hm.js?72fbad6ebf1d6c705117fe8fe0686a0e';
                 var s = document.getElementsByTagName('script')[0];
                 s.parentNode.insertBefore(hm, s);
             })();
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index d361e36..dc525ef 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -131,7 +131,7 @@ export default {
   },
   methods: {
     ...mapMutations("user", [
-      'SET_CUSTOMERNAME', 'setUserId'
+      'SET_CUSTOMERNAME', 'setUserId', 'setAccount'
     ]),
     ...mapActions("user", [
       "logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName"
@@ -212,6 +212,7 @@ export default {
         userAvatars && this.setAvatar(userAvatars);
         this.setUserId(userId)
         this.setUserName(userName);
+        this.setAccount(res.result.userAccount.account);
         if (!userName && !this.customerName) {
           this.$get(this.api.isClient).then(res => {
             res.customerName && this.SET_CUSTOMERNAME(res.customerName)
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 330c866..808fd8f 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -276,7 +276,7 @@ export default {
   },
   computed: {
     ...mapState("user", [
-      "userId", "schoolId", "studentId", "userName"
+      "userId", "schoolId", "studentId", "userName", 'account'
     ])
   },
   watch: {
@@ -510,6 +510,9 @@ export default {
       } else if (curriculumId == 12) {
         // 众筹系统
         window.open(`http://${Setting.zcPath}?systemId=${this.systemId}&courseId=${this.cid}&projectId=${this.projectId}&token=${token}&userId=${this.userId}&assessmentId=${this.assessmentId}&classId=${classId}&mallId=${mallId}${Setting.isTest ? '&beta=1' : ''}`);
+      } else if (curriculumId == 19) {
+        // 沙盘
+        href = `${Setting.sandPath}/#/?curriculumName=${row.sysName}&token=${token}&cid=${this.cid}&mallId=${mallId}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${classId}&startTime=${row.startTime}&stopTime=${row.stopTime}&userId=${this.userId}&account=${this.account}&referrer=${encodeURIComponent(location.href)}`
       } else {
         if (process.env.NODE_ENV === 'development') {
           href = 'http://192.168.31.125:8085/#/'
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index 73194a7..0d624b5 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -829,7 +829,7 @@ export default {
   },
   computed: {
     ...mapState("user", [
-      "userId", 'logView'
+      "userId", 'account', 'logView'
     ]),
   },
   components: {
@@ -1695,7 +1695,7 @@ export default {
     // 进入子系统
     toSub () {
       const { form } = this
-      const { systemId, projectId, cid, stageId, startTime, endTime, mallId } = this.curStage
+      const { systemId, systemName, projectId, cid, stageId, startTime, endTime, mallId } = this.curStage
       const competitionId = form.id
       const teamId = form.competitionRegistration.teamId
       let token = Util.local.get(Setting.tokenKey);
@@ -1705,6 +1705,9 @@ export default {
       } else if (systemId == 12) {
         // 众筹系统
         window.open(`http://${Setting.zcPath}?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&startTime=${startTime}&endTime=${endTime}&mallId=${mallId}${Setting.isTest ? '&beta=1' : ''}`);
+      } else if (systemId == 19) {
+        // 沙盘
+        location.href = `${Setting.sandPath}/#/?curriculumName=${systemName}&token=${token}&cid=${cid}&mallId=${mallId}&systemId=${systemId}&projectId=${projectId}&assessmentId=&classId=&startTime=&stopTime=${endTime}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&userId=${this.userId}&account=${this.account}&referrer=${encodeURIComponent(location.href)}`
       } else {
         // python系统
         this.toPython(this.curProject)
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 24f632c..651bb76 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -478,7 +478,7 @@ export default {
   },
   computed: {
     ...mapState("user", [
-      "userId"
+      "userId", 'account',
     ]),
     ...mapState('match', [
       'eventType'
@@ -1036,7 +1036,7 @@ export default {
     // 进入子系统
     toSub () {
       const form = this.curItem
-      const { systemId, projectId, cid, stageId, startTime, endTime, mallId } = form.curStage
+      const { systemId, systemName, projectId, cid, stageId, startTime, endTime, mallId } = form.curStage
       const competitionId = form.id
       const teamId = form.teamId
       let token = Util.local.get(Setting.tokenKey);
@@ -1046,6 +1046,9 @@ export default {
       } else if (systemId == 12) {
         // 众筹系统
         window.open(`http://${Setting.zcPath}?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&startTime=${startTime}&endTime=${endTime}&mallId=${mallId}${Setting.isTest ? '&beta=1' : ''}`);
+      } else if (systemId == 19) {
+        // 沙盘
+        location.href = `${Setting.sandPath}/#/?curriculumName=${systemName}&token=${token}&cid=${cid}&mallId=${mallId}&systemId=${systemId}&projectId=${projectId}&assessmentId=&classId=&startTime=&stopTime=${endTime}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&userId=${this.userId}&account=${this.account}&referrer=${encodeURIComponent(location.href)}`
       } else {
         // python系统
         this.toPython()
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 4611cd5..3862228 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -14,6 +14,7 @@ export default {
         avatar: "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
         userId: '',
         studentId: '',
+				account: '',
         userName: '',
         customerName: '',
         schoolId: '',
@@ -55,6 +56,9 @@ export default {
         setUserId: (state, userId) => {
             state.userId = userId
         },
+        setAccount: (state, account) => {
+            state.account = account
+        },
     },
     actions: {
         login({ state, commit }, userInfo) {
