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

src/components/page/ClientLogin.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="wrap">
+        <el-button type="primary" class="back_index" round @click="backIndex">返回主页</el-button>
         <div class="left">
             <img src="../../assets/img/logo.png" alt="">
             <div class="text">
@@ -53,28 +54,6 @@
                     <el-button type="text" class="ques" @click="toReg(true)">前往注册</el-button>
                     <el-button type="text" class="forget" @click="forget">忘记密码？</el-button>
                 </div>
-                <!-- <h2>密码登录</h2>
-                <el-form :model="loginForm" :rules="loginRules" ref="login" label-width="0px">
-                    <el-form-item prop="username">
-                        <p class="label">用户名</p>
-                        <el-input v-model="loginForm.username" placeholder="请输入账号/手机号" @keyup.enter.native="submitForm()"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="password">
-                        <p class="label">密码</p>
-                        <el-input
-                            type="password"
-                            placeholder="请输入密码"
-                            v-model="loginForm.password"
-                            @keyup.enter.native="getSchool()"
-                        >
-                        </el-input>
-                    </el-form-item>
-                    <el-button class="submit" type="primary" @click="getSchool">登录</el-button>
-                    <div class="links flex-between">
-                        <el-button type="text" class="ques" @click="toReg(true)">前往注册</el-button>
-                        <el-button type="text" class="forget" @click="forget">忘记密码？</el-button>
-                    </div>
-                </el-form> -->
             </div>
             <register v-else :isReg.sync="isReg" @updateInfo="updateInfo"></register>
         </div>
@@ -200,6 +179,10 @@ export default {
         })
     },
     methods: {
+        backIndex(){
+            // this.$router.go(-1);
+            this.$router.push('login');
+        },
         getSchool(form) {
             this.$refs[form].validate(valid => {
                 if (valid) {
@@ -573,4 +556,12 @@ export default {
         color: #ffa94e;
         font-size: 14px;
     }
+    .back_index{
+        position: fixed;
+        width: 150px;
+        height: 60px;
+        // z-index: 200;
+        bottom: 80px;
+        right: 80px;
+    }
 </style>

src/components/page/Index.vue

@@ -64,7 +64,7 @@ export default {
         margin-left: 250px;
         display: flex;
         // color: #002E66;
-        color: white;
+        color: #7AA0B7;
         font-size: 27px;
         letter-spacing:4px;
         line-height:1.5

src/components/page/Login.vue

@@ -5,7 +5,7 @@
             <div class="icon_wrap">
                 <img src="../../assets/img/logo.png" alt="">
             </div>
-            <div class="bar_name">经济与管理学院虚拟仿真实验教学中心</div>
+            <div class="bar_name">经济与管理学院虚拟仿真实验教学中心-金融交易虚拟仿真实验系统</div>
         </div>
         <!-- 标题+实验入口 -->
         <div class="content">
@@ -27,9 +27,9 @@
         <div class="count_wrap">
             <div class="count_title">访问统计</div>
             <div>
-                <div class="count_current">当前访问：&nbsp;87</div>
-                <div class="count_history">历史访问：&nbsp;468427</div>
-                <div class="count_people">实验人数：&nbsp;1059</div>
+                <div class="count_current">当前访问：&nbsp;{{proAccessNum.currentNum}}</div>
+                <div class="count_history">历史访问：&nbsp;{{proAccessNum.historyNUm}}</div>
+                <div class="count_people">实验人数：&nbsp;{{proAccessNum.testNum}}</div>
             </div>
         </div>
     </div>
@@ -40,6 +40,11 @@ import { Loading } from 'element-ui'
 export default {
    data() {
        return {
+           proAccessNum:{
+               currentNum:'',
+               historyNum:'',
+               testNum:''
+           },
            userId: '',
            studentId: '',
            schoolId: '',
@@ -48,9 +53,16 @@ export default {
        }
     },
     mounted(){
-
+        this.accessNum()
     },
     methods:{
+        accessNum(){
+            this.$get(this.api.getAccessNum).then(res =>{
+                this.proAccessNum.currentNum = res.currentNum,
+                this.proAccessNum.historyNUm = res.historyNUm,
+                this.proAccessNum.testNum = res.experimentNum
+            }).catch(err=>{})
+        },
         toClient(){
             location.href = location.host.includes('116.63.168.79') ? 'http://116.63.168.79/kdclient/#/clientLogin' : 'http://122.9.154.146/kdclient/#/clientLogin'
         },

src/components/page/ProjectPattern.vue

@@ -5,19 +5,19 @@
                 {{projectList[pattern].title}}
             </div>
             <div class="content_one_text">
-                <div class="principle_wrap">
+                <div class="principle_wrap text_wrap">
                     <div class="one_title">实验原理：</div>
                     <div class="one_text">
                         {{projectList[pattern].principle}}
                     </div>
                 </div>
-                <div class="step_wrap">
+                <div class="step_wrap text_wrap">
                     <div class="one_title">实验步骤：</div>
                     <div class="one_text">
                         {{projectList[pattern].step}}
                     </div>
                 </div>
-                <div class="prepare_wrap">
+                <div class="prepare_wrap text_wrap">
                     <div class="one_title">实验准备：</div>
                     <div class="one_text">
                         {{projectList[pattern].prepare}}
@@ -63,7 +63,7 @@ export default {
         };
     },
     mounted(){
-        this.patternId = this.$route.query.type
+        
     },
     methods: {
         toIndex() {
@@ -104,71 +104,85 @@ export default {
 .wrap{
     width: 100%;
     height: 100%;
-    display: flex;
+    // display: flex;
     font-family: '微软雅黑';
 }
 .content_one{
     // margin-top: 60px;
     width: 100%;
-    height: 900px;
+    background: white;
+    // height: 600px;
     // background: red;
-    background: url('../../assets/img/content.jpg');
-    background-size: 100% 100%;
+    
+    
     .content_one_title{
         width: 100%;
-        height: 130px;
-        line-height: 130px;
+        height: 100px;
+        line-height: 100px;
         text-align: center;
         font-size: 50px;
         letter-spacing:8px;
         font-weight: 550;
-        color: white;
+        color: #FF5288;
+    }
+    .content_one_text{
+        padding: 0px 60px;
+        width: 95%;
+        margin: auto;
+        background-size: 100% 100%;
+        border-radius: 20px;
+        height: 400px;
+        overflow: hidden;
+        background: url('../../assets/img/content.jpg') no-repeat;
     }
 }
-.one_title{
+.text_wrap{
+    display: flex;
+    .one_title{
         width: 280px;
-    height: 40px;
-    line-height: 40px;
-    font-size: 25px;
+        height: 130px;
+        line-height: 130px;
+        font-size: 28px;
         color: #FF5288;
         letter-spacing:4px;
-    padding-left: 100px;
         box-sizing: border-box;
         font-weight: 550;
-    border-radius: 0px 20px 20px 0px;
-    background: white;
-}
-.one_text{
-    width: 900px;
-    height: 200px;
-    padding: 45px 60px;
+        // border-radius: 0px 20px 20px 0px;
+        // background: white;
+        }
+    .one_text{
+        width: 2300px;
+        height: 130px;
+        padding: 45px 0px;
         box-sizing: border-box;
         // background: red;
         font-size: 23px;
-    line-height: 1.5;
-    color: white;
+        line-height: 2;
+        color: #4D4D4F;
         letter-spacing:2px;
         font-weight: 60;
+        }
 }
+
 .pattern_wrap{
     width: 100%;
     // height: 150px;
     // background: red;
-    border-top: 2px solid #FF5288;
+    // border-top: 2px solid #FF5288;
     padding: 0px 100px;
     display: flex;
     justify-content: space-between;
     box-sizing: border-box;
-    margin-top: 80px;
+    // margin-top: 20px;
     .img_wrap{
         margin-top: 30px;
         width: 500px;
-        height: 380px;
+        height: 370px;
         text-align: center;
         box-shadow: -2px 6px 10px -4px rgba(136,80,98,0.75);
         -webkit-box-shadow: -2px 6px 10px -4px rgba(136,80,98,0.75);
         -moz-box-shadow: -2px 6px 10px -4px rgba(136,80,98,0.75);
-        margin-bottom: 80px;
+        // margin-bottom: 10px;
         font-size: 23px;
         color: #FF5288;
         font-weight: 550;
@@ -178,6 +192,7 @@ export default {
         box-shadow: -2px 6px 10px -6px rgba(136,80,98,0.75);
         -webkit-box-shadow: -2px 6px 10px -6px rgba(136,80,98,0.75);
         -moz-box-shadow: -2px 6px 10px -6px rgba(136,80,98,0.75);
+        cursor: pointer;
         img{
             opacity: 0.9;
             

src/utils/api.js

@@ -34,6 +34,8 @@ export default {
   checkCode: `${host}/evaluation/tms/userInfo/checkCode`,
   getCoursevideo:`${host}/evaluation/tms/classTech/simulationPlayList`,//开始课程-课程视频 
   queryPersonalCenter:`${host}/evaluation/personalCenter/queryPersonalCenter`,
+  getAccessNum:`${host}/evaluation/tms/userInfo/getAccessNum`,//获取项目访问量
+
   
   examinePassword:`${host}/evaluation/tms/user/examinePassword`,//更换密码
   userinfoUpdate:`${host}/evaluation/tms/user/update`,//个人中心信息修改