进入子系统等

README.md

@@ -0,0 +1 @@
+# 职站前台前端

src/layouts/header/index.vue

@@ -25,7 +25,7 @@
                 </el-dropdown>
               </div>
             </template>
-            <div v-else class="login" @click="toLogin">
+            <div v-else class="login" @click="toNew('/login')">
                 <img src="@/assets/img/user.png" alt="">
                 <span>登录</span>
             </div>
@@ -66,6 +66,7 @@ export default {
         ...mapActions("user", [
             "logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName"
         ]),
+        // 获取logo和平台名
         getSystemDetail () {
             this.$get(this.api.logoDetail).then(({ data }) => {
                 if (data) {
@@ -74,6 +75,7 @@ export default {
                 }
             }).catch(res => {});
         },
+        // 获取用户信息
         getUserInfo() {
             this.$get(this.api.queryUserInfoDetails).then(res => {
                 const {userAvatars, userName} = res.result.hrUserInfo || {}
@@ -89,25 +91,28 @@ export default {
         // 用户名下拉回调
         menuChange(e) {
           if (e === 'index') {
-            window.open(this.$router.resolve('/station').href)
+            this.toNew('/station')
           } else if (e === 'info') {
             window.open(this.$router.resolve('/setting/person').href)
           } else if (e === 'logout') {
             this.logout()
           }
         },
+        // 前往首页
         toIndex() {
             this.$refs.nav.jump({
                 index: this.isIndex ? '/index/list' : '/station/list'
             })
         },
-        toLogin() {
+        // 打开新tab
+        toNew(path) {
+          // 如果缓存里有教师端的标识，则前往教师端，否则，打开学生端
           if (util.cookies.get('serverLogin') === 'true' && util.local.get('oc_server_token')) {
             window.open(process.env.NODE_ENV === 'development' ?
               'http://192.168.31.125:8081/#/index' :
               `${location.origin}/admin/#/index`)
           } else {
-            window.open(this.$router.resolve('/login').href)
+            window.open(this.$router.resolve(path).href)
           }
         }
     }

src/pages/course/list/index.vue

@@ -206,6 +206,7 @@ export default {
             img {
                 width: 100%;
                 height: 165px;
+                transition: .3s;
             }
 
             .title {
@@ -242,6 +243,9 @@ export default {
 
             &:hover {
                 box-shadow: 0px 5px 12px 4px rgba(142, 123, 253, 0.09), 0px 3px 6px 0px rgba(142, 123, 253, 0.12), 0px 1px 2px -2px rgba(142, 123, 253, 0.16);
+                img {
+                  transform: scale(1.05);
+                }
             }
         }
     }

src/pages/match/details/index.vue

@@ -263,7 +263,7 @@ export default {
                   this.$message.success('报名成功')
                   this.status = 1;
               }).catch(res => {})
-            } else if (status === 1) {
+            } else if (status == 1) {
               // 已报名，点击取消报名
               this.$confirm('是否要取消报名？', '提示', {
                 type: 'success'

src/pages/match/list/index.vue

@@ -135,6 +135,7 @@
 </template>
 
 <script>
+import { mapState, mapMutations } from "vuex";
 import { Loading } from "element-ui";
 import Setting from "@/setting"
 import util from "@/libs/util"
@@ -226,6 +227,11 @@ export default {
             timerList: [],
         };
     },
+    computed: {
+        ...mapState('match', [
+          'eventType'
+        ])
+    },
     watch: {
         keyword: function(val) {
             clearTimeout(this.searchTimer);
@@ -235,13 +241,18 @@ export default {
         }
     },
     mounted() {
-        this.getProvince()
+      this.form.eventType = this.eventType
-        this.getData()
+      this.SET_TYPE(1)
-        this.$once('hook:beforeDestroy', function() {
+      this.getProvince()
-          clearInterval(this.timer)
+      this.getData()
-        })
+      this.$once('hook:beforeDestroy', function() {
+        clearInterval(this.timer)
+      })
     },
     methods: {
+        ...mapMutations('match', [
+          'SET_TYPE'
+        ]),
         getList() {
           const { form } = this
           const { eventType, competitionScope } = form
@@ -362,7 +373,8 @@ export default {
             this.initData()
         },
         toDetail(item) {
-            this.$router.push(`/match/details?id=${item.id}&status=${item.status}&end=${item.end}`);
+          this.SET_TYPE(this.form.eventType)
+          this.$router.push(`/match/details?id=${item.id}&status=${item.status}${item.end ? '&end=' + item.end : ''}`);
         },
         handleCurrentChange(val) {
             this.page = val;

src/pages/station/preview/index.vue

@@ -81,14 +81,12 @@
 
         
         <el-dialog title="请选择项目" :visible.sync="projectVisible" width="828px" custom-class="project-dia" :close-on-click-modal="false">
-          <div class="project">
+          <ul class="projects">
-            <ul class="projects">
+            <li v-for="(item, i) in projects" :key="i" :class="{active: curProject == item.projectId}" @click="selectProject(item)">
-              <li v-for="(item, i) in projects" :key="i" :class="{active: curProject == item.projectId}" @click="selectProject(item)">
+              <img src="@/assets/img/project.png" alt="">
-                <img src="@/assets/img/project.png" alt="">
+              <span>{{ item.projectName }}</span>
-                <span>{{ item.projectName }}</span>
+            </li>
-              </li>
+          </ul>
-            </ul>
-          </div>
           
           <span slot="footer" class="dialog-footer">
             <el-button size="small" @click="projectVisible = false">取 消</el-button>
@@ -318,6 +316,7 @@ export default {
         },
         // 进入实验
         entry() {
+          // 查询上次做的项目
           this.$get(this.api.getTheMostRecentlyRunProject, {
             cid: this.courseId
           }).then(({ data }) => {
@@ -339,6 +338,7 @@ export default {
             this.queryProject()
           })
         },
+        // 进入python系统
         toPython(projectId) {
           const id = this.systemIds
           let token = util.local.get(Setting.tokenKey);
@@ -352,7 +352,7 @@ export default {
           util.cookies.set('systemId', id)
           // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
           location.href = process.env.NODE_ENV === 'development' ?
-            `http://${location.hostname}:8080/#/` :
+            `http://${location.hostname}:8085/#/` :
             Setting.isPro ?
               'https://www.occupationlab.com/pyTrials' :
               `${location.origin}/pyTrials`
@@ -619,46 +619,42 @@ $height: 700px;
     padding: 28px 32px;
   }
 }
-.project {
+.projects {
-  .title {
+  display: flex;
-    font-size: 14px;
+  flex-wrap: wrap;
-    color: #333;
+  max-height: 400px;
-  }
+  overflow: auto;
-  .projects {
+  li {
-    display: flex;
+    display: inline-flex;
-    flex-wrap: wrap;
+    justify-content: center;
-    li {
+    align-items: center;
-      display: inline-flex;
+    width: 238px;
-      justify-content: center;
+    padding: 16px 0;
-      align-items: center;
+    margin: 0 20px 20px 0;
-      width: 240px;
+    background-color: #F6F8FA;
-      padding: 16px 0;
+    border-radius: 16px;
-      margin: 0 20px 20px 0;
+    cursor: pointer;
-      background-color: #F6F8FA;
+    &:hover {
-      border-radius: 16px;
+      span {
-      cursor: pointer;
+        color: #007EFF;
-      &:hover {
-        span {
-          color: #007EFF;
-        }
-      }
-      &:nth-child(3n) {
-        margin-right: 0;
-      }
-      &.active {
-        background-color: #f2f7ff;
-        span {
-          color: #3988ff;
-        }
       }
     }
-    span {
+    &:nth-child(3n) {
-      max-width: 140px;
+      margin-right: 0;
-      margin-left: 14px;
+    }
-      font-size: 14px;
+    &.active {
-      color: #333;
+      background-color: #f2f7ff;
+      span {
+        color: #3988ff;
+      }
     }
   }
+  span {
+    max-width: 140px;
+    margin-left: 14px;
+    font-size: 14px;
+    color: #333;
+  }
 }
 @media (max-width: 1430px) {
     .wrap {

src/pages/touristMatch/list/index.vue

@@ -342,7 +342,7 @@ export default {
             this.initData()
         },
         toDetail(item) {
-            this.$router.push(`/touristMatch/details?id=${item.id}&status=${item.status}&end=${item.end}`);
+            this.$router.push(`/touristMatch/details?id=${item.id}&status=${item.status}${item.end ? '&end=' + item.end : ''}`);
         },
         handleCurrentChange(val) {
             this.page = val;

src/setting.js

@@ -21,7 +21,7 @@ if (isPro) {
     // 本地
     systemPath = `http://${location.hostname}:8093`
     host = "http://121.37.12.51/"; // 中台测试服
-    host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.137:9000/"; // 赓
 }
 

src/store/modules/match.js

@@ -4,11 +4,15 @@
 export default {
     namespaced: true,
     state: {
-      toMatch: ''
+      toMatch: '',
+      eventType: 1 // 赛事类型
     },
     mutations: {
       SET_SOURCE: (state, id) => {
         state.toMatch = id
+      },
+      SET_TYPE: (state, eventType) => {
+        state.eventType = eventType
       }
     },
     actions: {