时间单位

chengdu
yujialong 4 years ago
parent 765e8f9595
commit fab38bb5c5
  1. 6
      src/components/common/Studentcommon/FictitiousList.vue
  2. 6
      src/components/common/Studentcommon/TeachingList.vue
  3. 48
      src/components/page/PersonalCenter.vue
  4. 2
      src/components/page/Record.vue
  5. 2
      src/utils/api.js

@ -10,7 +10,11 @@
<el-table-column prop="id" label="次序" width="120" align="center" type="index"></el-table-column>
<el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
<el-table-column prop="score" label="得分" align="center"></el-table-column>
<el-table-column prop="timeConsuming" label="耗时" align="center"></el-table-column>
<el-table-column prop="timeConsuming" label="耗时" align="center">
<template slot-scope="scope">
{{scope.row.timeConsuming}}
</template>
</el-table-column>
<el-table-column prop="startTime" label="起始时间" align="center"></el-table-column>
<el-table-column prop="endTime" label="结束时间" align="center"></el-table-column>
<el-table-column label="操作" align="center">

@ -11,7 +11,11 @@
<el-table-column prop="experimentalClassName" label="班级" align="center"></el-table-column>
<el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
<el-table-column prop="score" label="得分" align="center"></el-table-column>
<el-table-column prop="timeConsuming" label="耗时" align="center"></el-table-column>
<el-table-column prop="timeConsuming" label="耗时" align="center">
<template slot-scope="scope">
{{scope.row.timeConsuming}}
</template>
</el-table-column>
<el-table-column prop="startTime" label="起始时间" align="center"></el-table-column>
<el-table-column prop="endTime" label="结束时间" align="center"></el-table-column>
<el-table-column label="操作" align="center">

@ -111,7 +111,7 @@
</div>
<div class="item">
<span>证件</span>
<input id="idnumber" class="idnumber" placeholder="请输入姓名" type="text" v-model="personalInformation.idNumber"/>
<input id="idnumber" class="idnumber" placeholder="请输入证件" type="text" v-model="personalInformation.idNumber"/>
</div>
</div>
<div class="line">
@ -270,36 +270,35 @@
</div>
<div class="item">
<span>手机号</span>
<div class="btns">
{{personalInformation.phone}}
<el-button v-if="personalInformation.phone" style="margin-left: 5px;width:100%;" size="small" @click="bindPhone">更换</el-button>
<el-button v-else style="width:100%;" size="small" @click="bindPhone">绑定</el-button>
<div class="btns flex-between">
<span>{{personalInformation.phone}}</span>
<el-button v-if="personalInformation.phone" type="primary" size="small" @click="bindPhone">更换</el-button>
<el-button v-else type="primary" size="small" @click="bindPhone">绑定</el-button>
</div>
</div>
</div>
<div class="line">
<div class="item">
<span>邮箱</span>
<div class="btns">
{{personalInformation.email}}
<el-button v-if="personalInformation.email" style="margin-left: 5px;width:100%;" size="small" @click="bindEmail">更换</el-button>
<el-button v-else style="width:100%;" size="small" @click="bindEmail">绑定</el-button>
<div class="btns flex-between">
<span>{{personalInformation.email}}</span>
<el-button v-if="personalInformation.email" type="primary" size="small" @click="bindEmail">更换</el-button>
<el-button v-else type="primary" size="small" @click="bindEmail">绑定</el-button>
</div>
</div>
<div class="item">
<!-- <div class="item">
<span>微信</span>
<!-- <div class="read">{{personalInformation.weChatID}}</div> -->
<input id="weChat" class="weChat" disabled placeholder="微信" type="text" v-model="personalInformation.weChatID"/>
</div>
</div>
<div class="line">
<div class="item">
<span>密码</span>
<div class="btns">
<el-button size="small" style="width:100%;" @click="bindPassword">更换密码</el-button>
</div> -->
<div class="line">
<div class="item">
<span>密码</span>
<div class="btns flex-end-content">
<el-button type="primary" size="small" @click="bindPassword">更换</el-button>
</div>
</div>
<!-- <div class="item"></div> -->
</div>
<div class="item"></div>
</div>
</div>
</div>
@ -1216,6 +1215,8 @@ input:focus {
.btns{
display: inline-flex;
align-items: center;
border-bottom: 1px solid #b5b5b5;
padding: 5px 0;
}
.selects{
display: inline-flex;
@ -1242,11 +1243,14 @@ input:focus {
}
/deep/.el-input__inner {
color: #656565;
font-size: 16px;
font-size: 14px;
border-radius: 0 !important;
border: 0px;
border-bottom: 1px solid #b5b5b5;
}
/deep/.el-input--prefix .el-input__inner{
padding-left: 15px;
}
/deep/.el-input__icon {
color: #9278ff;
&.el-icon-date{
@ -1320,5 +1324,9 @@ input:focus {
font-size: 14px;
color: #c0c0c0;
}
/deep/ .el-button--primary{
background-color: #9278ff;
border-color: #9278ff;
}
}
</style>

@ -17,7 +17,7 @@
<div class="newPractice-card-other">
<p style="font-size:18px">实验总时长</p>
<p style="font-size:36px">{{overview.totalTime ? overview.totalTime : 0}}</p>
<p style="font-size:36px">{{overview.totalTime ? overview.totalTime : 0}}小时</p>
<!-- <p style="font-size:36px">94</p> -->
</div>

@ -10,7 +10,7 @@ if(process.env.NODE_ENV === 'development'){
export default {
logins: `${host}/liuwanr/userInfo/logins`, //登录 
updateLogInNumber: `http://116.63.168.79/liuwanr/userInfo/updateLogInNumber`, //用户登录修改登录次数和登陆时间
updateLogInNumber: `${host}/liuwanr/userInfo/updateLogInNumber`, //用户登录修改登录次数和登陆时间
uploadUserAvatars: `${host}/liuwanr/userInfo/uploadUserAvatars`, //上传头像
loginSchool: `${host}/liuwanr/userInfo/loginSchoolClient`, //登陆查询学校
loginRole: `${host}/liuwanr/userInfo/loginRole`, //登陆查询角色

Loading…
Cancel
Save