Merge branch 'chengdu' of ssh://git.czcyedu.com:222/huoran/FE_kd_client into chengdu

src/components/page/Index.vue

@@ -5,7 +5,9 @@
             <div class="button_item" @click="toNext"><i class="iconfont icon-arrowRight"></i></div>
         </div>
         <div class="notice">
-            注：期货交易虚拟仿真实验已经通过2019年四川省级虚拟仿真实验认定
+            <div>注：</div>
+            <div>期货交易虚拟仿真实验已经通过2019年四川省级虚拟仿真实验认定</div>
+            
         </div>
     </div>
 </template>
@@ -33,6 +35,7 @@ export default {
     height: 100%;
     position: fixed;
     background: url('../../assets/img/indexBg.jpg');
+    background-size: 100%;
     .button_wrap{
         width: 900px;
         height: 60px;
@@ -59,7 +62,9 @@ export default {
         width: 600px;
         margin-top: 180px;
         margin-left: 250px;
-        color: #002E66;
+        display: flex;
+        // color: #002E66;
+        color: white;
         font-size: 27px;
         letter-spacing:4px;
         line-height:1.5

src/components/page/ProjectIntro.vue

@@ -56,13 +56,13 @@ export default {
     width: 100%;
     height: 100%;
     position: fixed;
-    background: url('../../assets/img/2.jpg') no-repeat;
+    background: url('../../assets/img/introBg.jpg') no-repeat;
+    background-size: 100% 100%;
 }
 .nav_wrap{
-    margin-top: 60px;
-    // width: 400px;
+    // margin-left: 20px;
+    // margin-top: 60px;
     height: 50px;
-    // background: red;
     display: flex;
     justify-content: center;
     color: white;
@@ -78,7 +78,7 @@ export default {
     }
 }
 .project_wrap{
-    width: 100%;
+        width: 100%;
         padding-left: 250px;
         box-sizing: border-box;
     .project_title{
@@ -128,6 +128,7 @@ export default {
    
 }
 .select_wrap{
+    // margin-left: 10px;
     width: 100%;
     height: 60px;
     display: flex;

src/components/page/ProjectPattern.vue

@@ -49,11 +49,13 @@ export default {
             pattern: this.$route.query.pattern,
             projectList:[{
                 title:'期权套期保值实验',
+                url:'http://122.9.154.146/kd/#/Dashboard',
                 principle:'本实验根据《期货、期权及其它衍生品》等理论课程的大纲要求，将期权基础知识考核、期权实战规则、模拟开户和期权策略设计等内容融会贯通于十个步骤，考察学生利用期权策略减少价格波动对企业经营影响的能力。',
                 step:'1. 试验背景介绍；2. 期权实战规则；3. 模拟开户；4. 银期转账；5. 试验角色选择；6. 行情查看与期权选择；7. 期权开仓；8. 期权平仓；9. 核算损益；10. 填写实验报告',
                 prepare:'完成此实验前，应该了解期货期权的相关定义、期权的交易规则、期权交易的核算规则等相关知识点。'
             },{
                 title:'期权组合保险实验',
+                url:'http://122.9.154.146/kdChallenge/#/Dashboard',
                 principle:'本实验根据《期货、期权及其它衍生品》等理论课程的大纲要求，将期权delta风险中性策略、交叉对冲和期权组合策略设计等知识点融会贯通于十个步骤，考察学生利用期权组合策略减少价格波动对企业经营影响的能力。',
                 step:'1.关于delta动态调仓的实验背景；2.关于交叉对冲的实验背景；3.实验案例；4.最优对冲比率计算；5.合约选择；6.期权组合开仓；7.期权组合调仓；8.期权组合平仓；9.核算损益；10.填写实验报告；',
                 prepare:'开始实验前，应了解期权定义、期权交易规则、希腊字母delta、交叉对冲和不同期权组合策略的盈亏图。'
@@ -62,7 +64,7 @@ export default {
         };
     },
     mounted(){
-        
+        this.patternId = this.$route.query.type
     },
     methods: {
         toNext(index) {
@@ -73,6 +75,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
 .wrap{
     width: 100%;
     height: 100%;
@@ -80,12 +83,12 @@ export default {
     font-family: '微软雅黑';
 }
 .content_one{
-    margin-top: 60px;
+    // margin-top: 60px;
     width: 100%;
     height: 900px;
     // background: red;
     background: url('../../assets/img/content.jpg');
-    background-size: 100%;
+    background-size: 100% 100%;
     .content_one_title{
         width: 100%;
         height: 130px;

src/utils/api.js

@@ -54,6 +54,7 @@ export default {
   experimentRemaining: `${host}/evaluation/tms/evaluationrecord/remaining`, //获取测评剩余时间
   experimentStart: `${host}/evaluation/tms/evaluationrecord/start`, //开始测评
   experimentSubmit: `${host}/evaluation/tms/evaluationrecord/submit`, //提交测评
+  queryProjectIdAndPattenById: `${host}/evaluation/tms/exp/queryProjectIdAndPattenById`,//基于考核id查询项目id
 
   // 实验记录
   fictitiousRecord: `${host}/evaluation/fictitious/projectrecord/user/kdRecord`, //用户端实验记录

src/utils/core.js

@@ -1,6 +1,5 @@
 import config from '@/config'
 import store from '@/store'
-
 const pad2 = str => ('0' + str).substr(-2)
 
 function fMoney (s, n) {
@@ -167,6 +166,27 @@ function toSubSystem(className = '',id = '',classId = ''){
   sessionStorage.setItem("tmsTeachId",id);//考核id
   sessionStorage.setItem("kdAssessmentId",id);//竞赛id
   sessionStorage.setItem("classId",classId);//班级id
+  sessionStorage.setItem("userId",store.state.userId);//用户id
+  if(sessionStorage.getItem('id') != ''){
+    //如果班级id不为空，即为考核模式，否则为竞赛模式
+    let source = ''
+    if(sessionStorage.getItem('classId') != ''){
+        sessionStorage.setItem("tmsTeachId",'');
+        source = 1 
+    }else{
+        sessionStorage.setItem("kdAssessmentId",'');
+        source = 0
+    }
+    let params = {
+        id:sessionStorage.getItem('id'),
+        source:source
+    }
+    this.$get(this.api.queryProjectIdAndPattenById,params).then(res => {
+    let projectId = res.Info.projectId
+    let pattern = res.Info.pattern
+    sessionStorage.setItem("id",projectId)
+})            
+}
   location.href = config.subSystem
 }