From c936338e257887fc0fb437a7a200e2a27733f14d Mon Sep 17 00:00:00 2001
From: "liangliang.Li" <1561596308@qq.com>
Date: Mon, 21 Jun 2021 10:45:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=9B=B4=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/Index.vue          | 51 ++++++++++++++++++++++++--
 src/components/page/RegisterForm.vue   |  4 +-
 src/components/page/ShowExperiment.vue | 46 +++++++++++++----------
 src/router/index.js                    |  1 +
 src/utils/api.js                       |  2 +
 5 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/src/components/page/Index.vue b/src/components/page/Index.vue
index 1e5518b..db2c91f 100644
--- a/src/components/page/Index.vue
+++ b/src/components/page/Index.vue
@@ -10,8 +10,20 @@
                 <div>此处期货交易虚拟实验为2020新版本</div> 
                 <div>2019旧版本入口为：<a href="http://www.jgsyzx.uestc.cn/">http://www.jgsyzx.uestc.cn/</a></div> 
             </div>
-            
         </div>
+        <el-dialog :visible.sync="changeVisible"  width="30%" :modal-append-to-body="false" :close-on-click-modal="false" :show-close="false" center title="更改密码">
+            <el-form label-width="80px" :model="regForm" :rules="regRules">
+                 <el-form-item prop="password" label="新密码">
+                    <el-input type="password" v-model="regForm.password" placeholder="请输入密码"></el-input>
+                </el-form-item>
+                <el-form-item prop="rePassword" label="确认密码">
+                    <el-input type="password" v-model="regForm.rePassword" placeholder="请再次输入密码"></el-input>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" center class="dialog-footer">
+              <el-button type="primary"  @click="setPassword">确 定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -19,13 +31,46 @@ export default {
     name: 'project',
     data() {
         return {
-            
+            changeVisible:false,
+            regForm:{
+                password:'',
+                rePassword:''
+            },
+            regRules: {
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'blur' },
+                    { pattern: /^.{8,}$/, message: '请输入8位数以上的密码', trigger: 'blur' }
+                ],
+                rePassword: [
+                    { required: true, message: '请再次输入密码', trigger: 'blur' },
+                    { pattern: /^.{8,}$/, message: '请输入6位数以上的密码', trigger: 'blur' }
+                ]
+            },
         };
     },
     mounted() {
-        
+        // this.showChangePass()
     },
     methods: {
+        setPassword(){
+            if(this.regForm.password !== this.regForm.rePassword){
+                return this.$message.warning('两次输入的密码不一致，请重新输入')
+            }else{
+                this.$post(this.api.resetUserPwd,{password:this.regForm.password}).then(res =>{
+                    this.changeVisible = false
+                    return this.$message.success('更改成功')
+
+                }).catch(err=>{
+                    return this.$message.error(err.errmessage)
+                })
+            }
+            
+        },
+        showChangePass(){
+            this.$get(this.api.isRequiredReset).then(res =>{
+                if(res.message) this.changeVisible = true
+            }).catch(err=>{})
+        },
         toFuture(){
             sessionStorage.setItem("model",0);//期货模式
             this.core.toSubSystem('','','',0)
diff --git a/src/components/page/RegisterForm.vue b/src/components/page/RegisterForm.vue
index a6e82e6..b219ee0 100644
--- a/src/components/page/RegisterForm.vue
+++ b/src/components/page/RegisterForm.vue
@@ -116,11 +116,11 @@ export default {
                 ],
                 password: [
                     { required: true, message: '请输入密码', trigger: 'blur' },
-                    { pattern: /^.{6,}$/, message: '请输入6位数以上的密码', trigger: 'blur' }
+                    { pattern: /^.{8,}$/, message: '请输入8位数以上的密码', trigger: 'blur' }
                 ],
                 rePassword: [
                     { required: true, message: '请再次输入密码', trigger: 'blur' },
-                    { pattern: /^.{6,}$/, message: '请输入6位数以上的密码', trigger: 'blur' }
+                    { pattern: /^.{8,}$/, message: '请输入6位数以上的密码', trigger: 'blur' }
                 ]
             },
             provinceList: this.$store.state.provinceList, //省份
diff --git a/src/components/page/ShowExperiment.vue b/src/components/page/ShowExperiment.vue
index 28744b1..f28f965 100644
--- a/src/components/page/ShowExperiment.vue
+++ b/src/components/page/ShowExperiment.vue
@@ -116,28 +116,34 @@
                         <div class="meta-title-wrap">
                             <p class="meta-title"><i class="el-icon-discount"></i> 实验数据及结果分析</p>
                         </div>
-                        <div class="data-wrap">
-                            <el-table :data="goodsData" :span-method="objectSpanMethod" stripe header-align="center" style="flex: 1;margin-right: 10px">
-                                <el-table-column prop="name" label="现货" align="center"></el-table-column>
-                                <el-table-column prop="num" label="数量" align="center"></el-table-column>
-                                <el-table-column prop="time"  label="时间" align="center"></el-table-column>
-                                <el-table-column prop="price" label="价格" align="center"></el-table-column>
-                                <el-table-column prop="marketValue" label="现货市值" align="center"></el-table-column>
-                                <el-table-column prop="proftAndLoss" label="累计盈亏" align="center"></el-table-column>
-                            </el-table>
-                            <el-table :data="futuresData" :span-method="objectSpanMethod1" stripe header-align="center" style="flex: 1;margin-right: 10px">
-                                <el-table-column prop="name" label="期权名称" align="center"></el-table-column>
-                                <el-table-column prop="dir" label="交易方向" align="center"></el-table-column>
-                                <el-table-column prop="num"  label="数量" align="center"></el-table-column>
-                                <el-table-column prop="time" label="时间" align="center"></el-table-column>
-                                <el-table-column prop="price" label="价格" align="center"></el-table-column>
-                                <el-table-column prop="marketValue" label="期权市值" align="center"></el-table-column>
-                                <el-table-column prop="proftAndLoss" label="累计盈亏" align="center"></el-table-column>
-                            </el-table>
-                            <div style="width: 150px;">
+                        <div >
+                            <div class="data-wrap">
+                                <el-table :data="goodsData" :span-method="objectSpanMethod" stripe header-align="center" style="flex: 1;margin-right: 10px">
+                                    <el-table-column prop="name" label="现货" align="center"></el-table-column>
+                                    <el-table-column prop="num" label="数量" align="center"></el-table-column>
+                                    <el-table-column prop="time"  label="时间" align="center"></el-table-column>
+                                    <el-table-column prop="price" label="价格" align="center"></el-table-column>
+                                    <el-table-column prop="marketValue" label="现货市值" align="center"></el-table-column>
+                                    <el-table-column prop="proftAndLoss" label="累计盈亏" align="center"></el-table-column>
+                                </el-table>
+                                <el-table :data="futuresData" :span-method="objectSpanMethod1" stripe header-align="center" style="flex: 1;margin-right: 10px">
+                                    <el-table-column prop="name" label="期权名称" align="center"></el-table-column>
+                                    <el-table-column prop="dir" label="交易方向" align="center"></el-table-column>
+                                    <el-table-column prop="num"  label="数量" align="center"></el-table-column>
+                                    <el-table-column prop="time" label="时间" align="center"></el-table-column>
+                                    <el-table-column prop="price" label="价格" align="center"></el-table-column>
+                                    <el-table-column prop="marketValue" label="期权市值" align="center"></el-table-column>
+                                    <el-table-column prop="proftAndLoss" label="累计盈亏" align="center"></el-table-column>
+                                </el-table>
+                            </div>
+                            
+                            <div class="data-wrap">
                                 <el-table :data="futuresLoss" stripe header-align="center">
                                     <el-table-column prop="futuresLoss" label="策略总盈亏" align="center"></el-table-column>
                                 </el-table>
+                                <el-table :data="hisPositionData1" stripe header-align="center" class="mat20">
+                                    <el-table-column prop="percent" label="套期保值率"  align="center"></el-table-column>
+                                </el-table>
                             </div>
                         </div>
                         <el-input style="margin-top: 20px" v-model="form.analysis" type="textarea" :disabled="true" rows="5"></el-input>
@@ -226,6 +232,7 @@
                 goodsData: [],
                 futuresData: [],
                 futuresLoss: [],
+                hisPositionData1:[]
             }
         },
         mounted(){
@@ -250,6 +257,7 @@
                         this.goodsData = steps9.goodsData ? steps9.goodsData: []
                         this.futuresData = steps9.futuresData ? steps9.futuresData: []
                         this.futuresLoss = steps9.futuresLoss ? steps9.futuresLoss: []
+                        this.hisPositionData1 = steps9.hisPositionData1 ? steps9.hisPositionData1: []
                     }
                     
                     let score = res.data.score
diff --git a/src/router/index.js b/src/router/index.js
index 2a09c7f..c7deb4a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@ export default new Router({
     {
         path: '/',
         redirect: '/login'
+        // redirect: '/index'
     },
     {
         path: '/teachingVideo',
diff --git a/src/utils/api.js b/src/utils/api.js
index dc34fcf..4cdc158 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -12,6 +12,8 @@ if(process.env.NODE_ENV === 'development'){
 
 export default {
   logins: `${host}/liuwanr/userInfo/logins`, //登录 
+  resetUserPwd: `${host}/liuwanr/userInfo/resetUserPwd`, //更改密码
+  isRequiredReset: `${host}/liuwanr/userInfo/isRequiredReset`, //密码是否为默认密码
   getAccountPassword: `${host}/evaluation/tms/userInfo/getAccountPassword`, //获取账号密码
   queryToken: `${host}/liuwanr/userInfo/queryToken`,
   save: `${host}/evaluation/tms/userInfo/add`, //注册