众筹加测试服标识

src/api/index.js

@@ -18,6 +18,7 @@ export default {
     getUserRolesPermissionMenu: `${host}users/users/user-role/getUserRolesPermissionMenu`,
     fileUploadNakadai: `${host}nakadai/nakadai/oss/fileUpload`,
     refreshPageNotification : `nakadai/message/refreshPageNotification`,
+    getUserInfo : `users/users/userInfo/getUserInfo`,
 
     platformLogList: `nakadai/nakadai/log/platformLogList`,
     logNotification: `nakadai/nakadai/log/logNotification`,

src/layouts/header/index.vue

@@ -3,7 +3,14 @@
     <a class="logo"
        @click="toIndex">
       <template v-if="isIndex">
-        <img v-if="!isZxy"
+        <img v-if="isZj"
+             src="/images/4.png"
+             alt="">
+        <img v-else-if="isSq"
+             style="max-height: 100%"
+             src="/images/1.png"
+             alt="">
+        <img v-else-if="!isZxy"
              src="@/assets/img/logo.png"
              alt="">
         <img v-else
@@ -11,7 +18,15 @@
              alt="">
       </template>
       <template v-else>
-        <img :style="{maxWidth: title ? '200px' : '300px'}"
+        <img v-if="isZj"
+             src="/images/4.png"
+             alt="">
+        <img v-else-if="isSq"
+             style="max-height: 100%"
+             src="/images/1.png"
+             alt="">
+        <img v-else
+             :style="{maxWidth: title ? '200px' : '300px'}"
              :src="logoUrl"
              height="50" />
         <span class="title">{{title}}</span>
@@ -85,6 +100,8 @@ import Bus from '@/libs/bus'
 export default {
   data () {
     return {
+      isZj: location.host === '10.60.32.76', // 浙江万里
+      isSq: Setting.isSq,
       token: util.local.get(Setting.tokenKey), // 学生端token
       serverToken: util.local.get('oc_server_token'), // 教师端token
       cName: util.cookies.get('customerName'),
@@ -335,9 +352,12 @@ $height: 64px;
     .rounded {
         border-radius: 6px;
     }
-    .trial:hover {
-        background-color: #48cafd;
-        border-color: #48cafd;
+    .trial {
+        margin-left: 10px;
+        &:hover {
+            background-color: #48cafd;
+            border-color: #48cafd;
+        }
     }
 }
 @media (max-width: 1870px) {

src/pages/ass/list/index.vue

@@ -515,7 +515,7 @@ export default {
         href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&mallId=${mallId}&assessmentId=${this.assessmentId}&classId=${classId}&stopTime=${this.stopTime}`;
       } else if (curriculumId == 12) {
         // 众筹系统
-        window.open(`http://120.78.139.126:8879?systemId=${this.systemId}&courseId=${this.cid}&projectId=${this.projectId}&token=${token}&userId=${this.userId}&assessmentId=${this.assessmentId}&classId=${classId}&mallId=${mallId}`);
+        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 (process.env.NODE_ENV === 'development') {
           href = 'http://192.168.31.125:8085/#/'

src/pages/match/details/index.vue

@@ -1478,7 +1478,7 @@ export default {
         location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true`
       } else if (systemId == 12) {
         // 众筹系统
-        window.open(`http://120.78.139.126:8879?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}`);
+        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 {
         // python系统
         this.toPython(this.curProject)

src/pages/match/list/index.vue

@@ -815,7 +815,7 @@ export default {
         location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true`
       } else if (systemId == 12) {
         // 众筹系统
-        window.open(`http://120.78.139.126:8879?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}`);
+        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 {
         // python系统
         this.toPython()

src/pages/record/show/index.vue

@@ -137,6 +137,7 @@
                     header-align="center">
             <el-table-column type="index"
                              label="序号"
+                             :key="1"
                              align="center"
                              width="60">
               <template slot-scope="scope">
@@ -151,6 +152,7 @@
                              prop="judgmentName"
                              label="考核点"
                              align="center"
+                             :key="2"
                              width="150">
               <template slot-scope="scope">
                 <div v-for="(item, index) in scope.row.lcRuleRecords"
@@ -163,6 +165,7 @@
             </el-table-column>
             <el-table-column prop="ruleAnswer"
                              label="参考答案"
+                             :key="3"
                              style='word-wrap: break-word'>
               <template slot-scope="scope">
                 <div v-if='scope.row.lcRuleRecords'>
@@ -178,6 +181,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="userAnswer"
+                             :key="4"
                              label="学生答案">
               <template slot-scope="scope">
                 <div v-if='scope.row.lcRuleRecords'>
@@ -199,6 +203,7 @@
             <el-table-column v-if="!project"
                              prop="runResult"
                              label="学生运行结果"
+                             :key="5"
                              align="center">
               <template slot-scope="scope">
                 <div class="m-b-20"
@@ -215,11 +220,13 @@
               </template>
             </el-table-column>
             <el-table-column prop="quesScore"
+                             :key="6"
                              label="分值"
                              width="80"
                              align="center"></el-table-column>
             <el-table-column prop="score"
                              label="得分"
+                             :key="7"
                              width="80"
                              align="center"></el-table-column>
           </el-table>

src/pages/station/list/index.vue

@@ -22,14 +22,18 @@
         </div>
         <div class="curs">
           <template v-if="curriculumList.length">
-            <template v-for="(item,index) in curriculumList">
+            <template v-for="(item,i) in curriculumList">
               <div class="item"
                    :title="item.curriculumName"
                    @click="goPreview(item)"
-                   :key="index"
+                   :key="i"
                    v-if="!keyword || item.curriculumName.includes(keyword)">
-                <img :src="item.coverUrl"
-                     alt="">
+                <div v-if="isZj || isSq"
+                     class="cover"
+                     :style="{backgroundImage: 'url(/images/' + i + '.png)'}"></div>
+                <div v-else
+                     class="cover"
+                     :style="{backgroundImage: 'url(' + item.coverUrl + ')'}"></div>
                 <div class="bottom">
                   <p class="text"><span>{{ item.goodsName ||  item.curriculumName }}</span></p>
                   <a>进入实验</a>
@@ -52,10 +56,13 @@
 </template>
 
 <script>
-import axios from 'axios'
+import Setting from "@/setting";
+import axios from "axios"
 export default {
   data () {
     return {
+      isZj: location.host === '10.60.32.76', // 浙江万里
+      isSq: Setting.isSq,
       keyword: "",
       active: 0,
       tabs: [
@@ -72,6 +79,16 @@ export default {
     }
   },
   mounted () {
+
+    axios.get(`https://www.occupationlab.com/users/users/userInfo/getUserInfo`, {
+      headers: {
+        token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjk5NDE3OTMzLCJleHAiOjE2OTk0NjExMzMsImFjY291bnRJZCI6IjMwIn0.UeUcT8K5t6o5_Vsr58v9-P6KiOmf44TLJwXU61GzZ4Y'
+      }
+    }).then(({ data }) => {
+
+    }).catch(res => { })
+
+
     this.getschoolCourse();
   },
   methods: {
@@ -175,11 +192,14 @@ export default {
             &:hover {
                 opacity: 0.9;
             }
-            img {
+            .cover {
                 width: 215px;
                 height: 118px;
                 margin-top: -20px;
                 border-radius: 12px;
+                background-size: 100% 100%;
+                background-position: 0 0;
+                background-repeat: no-repeat;
             }
             .bottom {
                 display: flex;

src/pages/station/preview/index.vue

@@ -966,7 +966,10 @@ export default {
         location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true`
       } else if (systemId == 12) {
         // 众筹系统
-        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1&mallId=${this.mallId}`);
+        window.open(`http://${Setting.zcPath}?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1&mallId=${this.mallId}${Setting.isTest ? '&beta=1' : ''}`);
+      } else if (systemId == 19) {
+        // 沙盘
+        location.href = `${Setting.sandPath}/#/?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&referrer=${encodeURIComponent(location.href)}`
       } else if (systemId == 21) {
         window.open(`http://121.37.29.24:80/yyyflogin?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=3989a0ad671849b99dcbdcc208782333&caseId=9681f86902314b10bc752909121f9ab9&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=7ff5d4715b114b7398b6f26c20fac460`);
       } else if (systemId == 22) {

src/router/modules/activity.js

@@ -16,34 +16,42 @@ export default {
         {
             path: `list`,
             component: () => import("@/pages/activity/list"),
+            meta: { title: "创业活动" }
         },
         {
             path: `details`,
             component: () => import("@/pages/activity/details"),
+            meta: { title: "创业活动" }
         },
         {
             path: `noticeDetail`,
             component: () => import("@/pages/activity/manage/manage/noticeDetail"),
+            meta: { title: "创业活动" }
         },
         {
             path: `manage`,
             component: () => import("@/pages/activity/manage/list"),
+            meta: { title: "创业活动" }
         },
         {
             path: `add`,
             component: () => import("@/pages/activity/manage/add"),
+            meta: { title: "创业活动" }
         },
         {
             path: `manageDetail`,
             component: () => import("@/pages/activity/manage/manage"),
+            meta: { title: "创业活动" }
         },
         {
             path: `preview`,
             component: () => import("@/pages/activity/manage/preview"),
+            meta: { title: "创业活动" }
         },
         {
             path: `notice`,
             component: () => import("@/pages/activity/noticeDetail"),
+            meta: { title: "创业活动" }
         }
     ]
 };

src/router/permission.js

@@ -4,7 +4,7 @@ import util from "@/libs/util";
 
 const whiteList = Setting.whiteList // 白名单
 router.beforeEach((to, from, next) => {
-    document.title = Setting.titleSuffix;
+    document.title = Setting.titleSuffix + '-' + to.meta.title
     const role = util.local.get(Setting.tokenKey);
     if (!role && !whiteList.includes(to.path)) {
         next('/login')

src/setting.js

@@ -8,8 +8,11 @@ const isCH = url.includes("124.71.12.62"); //是否巢湖版本
 const isPro = url.includes("occupationlab.com"); //是否职站生产
 const isTest = url.includes('121.37.12.51'); //是否中台测试服
 const isZxy = url.includes('izhixinyun'); //是否是智信云
+const isSq = url.includes('10.20.100.204'); // 商丘
 
+let zcPath = `120.78.139.126:8879` // 众筹
 let systemPath = `${location.origin}/banksystem`
+let sandPath = `${location.origin}/sandbox` // 沙盘地址
 let host = `${location.origin}/`
 let uploadURL = `${location.origin}/`
 let title = isZxy ?
@@ -25,11 +28,14 @@ if (isPro) {
 } else if (isDev) {
     // 本地
     systemPath = `http://${location.hostname}:8093`
+    sandPath = `http://${location.hostname}:9520`
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 测试服
     // host = 'https://www.occupationlab.com/' // 正式服
     // host = "http://192.168.31.217:9000/"; // 榕
     // host = "http://192.168.31.51:9000/"; // 赓
+} else if (isSq) {
+	zcPath = `10.20.100.204:8883`
 }
 
 const Setting = {
@@ -44,6 +50,7 @@ const Setting = {
     apiBaseURL: host, // 接口请求地址
     uploadURL, // 阿里云oss域名
     systemPath, // 子系统地址前缀
+		sandPath,
     autoLogoutTime: 3600000000, // 长时间未操作，自动退出登录时间
     modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒
     errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
@@ -56,6 +63,8 @@ const Setting = {
     isTest,
     isPro,
     isZxy,
+		isSq,
+		zcPath,
     /**
      * 路由白名单
      * */