huoran
/
FE_bankTeaching
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

修改bug

Browse Source
20240205
e 3 years ago
parent 56c429050b
commit 8d3994ac25
5 changed files with 191 additions and 174 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/api/api.js
  2. 302
      src/components/case/index.vue
  3. 3
      src/layouts/header/index.vue
  4. 6
      src/pages/counter/list/index.vue
  5. 50
      src/pages/manage/list/personal/currentAccount/openAccount.vue

4
src/api/api.js
Unescape View File

@ -2,10 +2,10 @@ import axios from 'axios';
import router from '../router';
// 创建axios实例
const service = axios.create({
// baseURL: "http://39.108.250.202:9000/", // 中台测试服
baseURL: "http://39.108.250.202:9000/", // 中台测试服
// baseURL: "http://192.168.31.137:9000/", // 赓
// baseURL: "http://192.168.31.151:9000/", // 榕
baseURL: "http://192.168.31.125:9000/", // 坤
// baseURL: "http://192.168.31.125:9000/", // 坤
// baseURL: 'http://39.108.250.202:9000',
timeout: 30000 // 请求超时时间
})

302
src/components/case/index.vue
Unescape View File

@ -37,7 +37,7 @@
v-show="projectPermissions == 0"
@click="reload"
>重新开始</el-button>
<el-button class="submit-btn" style="margin-right:7px" @click="Submit()" :disabled="isSubmit">提交</el-button>
<el-button class="submit-btn" style="margin-right:7px" @click="Submit()" :disabled="popContainer">提交</el-button>
</div>
</div>
</el-header>
@ -64,9 +64,9 @@
<el-row>
<el-col :span="24">
<el-card shadow="hover">
<el-table :data="requires" stripe height="405">
<el-table :data="requires" stripe height="405" v-loading="loading">
<el-table-column type="index"></el-table-column>
<el-table-column prop="name" label="判分标准" align="center" width="180">
<el-table-column prop="name" label="判分标准" align="center">
</el-table-column>
<el-table-column prop="right" label="完成结果" align="center">
<template slot-scope="scope">
@ -118,6 +118,7 @@
<img src="../../assets/img/case/right.png" alt v-else />
</div>
</div>
<div class='popContainer' v-if='popContainer'></div>
</div>
</template>
@ -179,6 +180,9 @@ export default {
projectManage:{},
requires:[],
projectName:'',
loading:false,
sss:1,
popContainer:false
}
},
watch: {
@ -241,14 +245,8 @@ export default {
sessionStorage.setItem('systemId', systemId)
}
let tokens = sessionStorage.getItem('token')
console.log(tokens)
if(tokens){
if(tokens || token){
this.projectPermissions = this.projectId ? 1 : 0
if(this.projectId){
this.getQueryProject();
}else{
this.getProjects();
}
this.assessmentId && this.projectId && this.checkVer()
this.codeId && this.codeIds.push(this.codeId)
this.getData()
@ -274,11 +272,26 @@ export default {
}
getProjectBySystemId(params).then((data)=>{
if(data.status == 200){
let dates = new Date().getTime();
let date = new Date(dates)
let y = date.getFullYear();
let MM = date.getMonth() + 1;
MM = MM < 10 ? ('0' + MM) : MM;
let d = date.getDate();
d = d < 10 ? ('0' + d) : d;
let h = date.getHours();
h = h < 10 ? ('0' + h) : h;
let m = date.getMinutes();
m = m < 10 ? ('0' + m) : m;
let s = date.getSeconds();
s = s < 10 ? ('0' + s) : s;
let startTime = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
sessionStorage.setItem('startTime', startTime)
this.topicList = data.data.projects;
this.projectId = this.topicList[0].projectId;
getQueryCache(params).then((data)=>{
if(data.data.status == 200){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
this.$confirm('有项目未做完,是否回到未做完的项目?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -291,21 +304,6 @@ export default {
let params = {
"projectId":data.data.projectId,
}
let dates = new Date().getTime();
let date = new Date(dates)
let y = date.getFullYear();
let MM = date.getMonth() + 1;
MM = MM < 10 ? ('0' + MM) : MM;
let d = date.getDate();
d = d < 10 ? ('0' + d) : d;
let h = date.getHours();
h = h < 10 ? ('0' + h) : h;
let m = date.getMinutes();
m = m < 10 ? ('0' + m) : m;
let s = date.getSeconds();
s = s < 10 ? ('0' + s) : s;
let startTime = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
sessionStorage.setItem('startTime', startTime)
sessionStorage.setItem('projectId', data.data.projectId)
this.selectProjects(params)
}).catch(() => {
@ -317,24 +315,31 @@ export default {
}).catch(() => {
})
sessionStorage.setItem('projectId', this.topicList[0].projectId)
this.projectId = this.topicList[0].projectId
let params = {
"projectId":this.projectId,
"projectId":this.topicList[0].projectId,
}
this.selectProjects(params)
});
}else{
sessionStorage.setItem('projectId', this.topicList[0].projectId)
let params = {
"projectId":this.topicList[0].projectId,
}
this.selectProjects(params)
}
}).catch((error)=>{
})
//获取当前时间
let startTime = new Date().getTime();
sessionStorage.setItem('startTime', startTime)
this.day = '00';
this.hour = '00';
this.minutes = '00';
this.seconds = '00';
this.getClearTime();
this.globalTimer = "";
this.countVal = "";
this.day = "00";
this.seconds = "00";
this.minutes = "00";
this.hour = "00";
// this.getClearTime();
this.sss = 1
this.startCountFn();
}
}).catch((error)=>{
@ -358,14 +363,15 @@ export default {
sessionStorage.setItem('projectId', this.projectId)
getProjectDetail(params).then((data)=>{
if(data.status == 200){
this.popContainer = false
let token = sessionStorage.getItem('token')
let cid = sessionStorage.getItem('cid')
let systemId = sessionStorage.getItem('systemId')
this.projectName = data.data.projectManage.projectName;
this.projectManage = data.data.projectManage;
this.requires = data.data.projectJudgmentVos;
// location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
// location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
}
}).catch((error)=>{
})
@ -385,11 +391,14 @@ export default {
s = s < 10 ? ('0' + s) : s;
let startTime = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
sessionStorage.setItem('startTime', startTime)
this.day = '00';
this.hour = '00';
this.minutes = '00';
this.seconds = '00';
this.getClearTime();
this.globalTimer = "";
this.countVal = "";
this.day = "00";
this.seconds = "00";
this.minutes = "00";
this.hour = "00";
// this.getClearTime();
this.sss = 1
this.startCountFn();
},
//提交
@ -412,9 +421,6 @@ export default {
let systemId = sessionStorage.getItem('systemId')
let cid = sessionStorage.getItem('cid')
let params = {
// "accountId": 0,
// "classId": 0,
// "className":0,
"curriculumId":+cid,
"endTime": this.actEndTime,
"lcId": lcld,
@ -422,11 +428,11 @@ export default {
"projectName":this.projectName,
"purpose":this.projectManage.experimentTarget,
"ruleReqs": ruleReqsList,
"startTime": +startTime,
"startTime": startTime,
"submitTime": this.actEndTime,
"systemId": systemId,
// "timeSum": 0
}
this.loading = true;
submit(params).then((data)=>{
if(data.status == 200){
let datas= data.data.retMap.scoreInfo;
@ -445,12 +451,24 @@ export default {
}
}
}
this.sss = 0;
this.popContainer = true;
// this.countVal = "";
// this.day = "00";
// this.seconds = "00";
// this.minutes = "00";
// this.hour = "00";
this.$message({
type: 'success',
message: '提交成功'
});
this.requires = list
}
console.log(this.requires)
this.loading = false
}).catch((error)=>{
this.loading = false
})
this.getClearTime();
// this.getClearTime();
}).catch(() => {
this.$message({
type: "info",
@ -462,10 +480,15 @@ export default {
startCountFn() {
if (!this.isStart) {
this.countVal = this.countVal ? this.countVal : 0;
let timer = setInterval(() => {
this.counterFn(this.countVal++);
this.globalTimer = setInterval(() => {
if(this.sss == 0){
this.globalTimer = null;
clearInterval(this.globalTimer);
}else{
this.counterFn(this.countVal++);
}
}, 1000);
this.globalTimer = timer;
this.isStart = true;
}
},
@ -488,18 +511,38 @@ export default {
},
//重新开始
reload() {
this.getClearTime()
let token = sessionStorage.getItem('token')
let cid = sessionStorage.getItem('cid')
let systemId = sessionStorage.getItem('systemId')
let projectId = sessionStorage.getItem('projectId')
let params = {
"projectId":projectId,
}
this.selectProjects(params)
this.popContainer = false
this.sss = 1
this.startCountFn();
deleteCache().then((data)=>{
}).catch(() => {
})
this.globalTimer = "";
this.countVal = "";
this.day = "00";
this.seconds = "00";
this.minutes = "00";
this.hour = "00";
this.grade = '00'
location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
// location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
// this.getClearTime()
},
// 清除时间
getClearTime() {
clearInterval(this.countVal);
this.globalTimer = "";
this.countVal = "";
this.day = "00";
this.seconds = "00";
this.minutes = "00";
this.hour = "00";
},
// getClearTime() {
//
// },
checkVer() {
let data = {
userId: this.userId,
@ -519,97 +562,12 @@ export default {
toggleCase() {
this.caseVisible = !this.caseVisible
},
handleData(project,type){
if(!this.isSelected){
this.value = project;
this.projectId = project[0].projectId;
}
this.projectId = type == 2 ? project[0].projectId : this.projectId
if(type == 2) this.getQueryProject(0,1)
this.projectPermissions = type == 1 ? project[0].projectPermissions : this.projectPermissions
this.experimentalGoal = project[0].experimentalGoal;
this.caseDescription = project[0].caseDescription;
this.experimentSuggests = project[0].experimentSuggests;
this.actEndTime = project[0].endTime;
},
getQueryProject(projectId,type) {
//项目名称+实验目标+案例描述+实验提示+实验要求
this.$get(this.api.QueryProject, {
// studentId: 54,
// projectId: 305,
// assessmentId: 1,
studentId: this.studentId,
projectId: projectId ? projectId : this.projectId,
assessmentId: this.assessmentId
}).then(res => {
if(!type){
this.handleData(res.message.project,1)
this.projectId = res.message.project[0].projectId
}
this.points = res.message.points;
this.tableData = res.message.points;
let arr1 = this.tableData;
let result1 = arr1.map(e => e.judgmentPointsId);
this.judgmentPointsIds = this.judgmentPointsIds.concat(result1);
this.isstartexperimentSuggests = !res.message.project[0].isstartexperimentSuggests //0显示，1不显示
if (this.projectPermissions == "1") {
this.text = "剩余";
var interval = setInterval(() => {
// 获取当前时间，同时得到活动结束时间数组
let newTime = new Date().getTime();
// 对结束时间进行处理渲染到页面
let endTime = new Date(this.actEndTime).getTime();
let obj = null; // 如果活动未结束，对时间进行处理
if (endTime - newTime > 0) {
let time = (endTime - newTime) / 1000; // 获取天、时、分、秒
let day = parseInt(time / (60 * 60 * 24));
let hou = parseInt((time % (60 * 60 * 24)) / 3600);
let min = parseInt(((time % (60 * 60 * 24)) % 3600) / 60);
let sec = parseInt(((time % (60 * 60 * 24)) % 3600) % 60);
obj = {
day: this.timeFormat(day),
hou: this.timeFormat(hou),
min: this.timeFormat(min),
sec: this.timeFormat(sec)
};
} else {
// 活动已结束，全部设置为'00'
obj = {
day: "00",
hou: "00",
min: "00",
sec: "00"
};
clearInterval(interval);
}
this.day = obj.day;
this.hour = obj.hou;
this.minutes = obj.min;
this.seconds = obj.sec;
}, 1000);
} else if (this.projectPermissions == "0") {
this.text = "已用";
// 获取当前时间
this.createTime = new Date().getTime();
//自动开始
if (this.autoStart) {
this.startCountFn();
}
}
})
.catch(err => {});
},
getProjects(){
let data = {
systemId: this.systemId,
// schoolId: this.schoolId
schoolId: ''
}
// this.$get(`${this.api.queryTestProject}`,data).then(res => {
// this.handleData(res.message,2)
// }).catch(res => {});
},
// getProjects(){
// let data = {
// systemId: this.systemId,
// schoolId: ''
// }
// },
collapse(){
},
@ -639,6 +597,17 @@ export default {
</script>
<style lang="scss" scoped>
.popContainer {
position: absolute;
width:100%; /*宽度设置为100%，这样才能使隐藏背景层覆盖原页面*/
height:100%;
z-index: 1000;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.3);
}
/deep/.el-container {
height: 80%;
@ -650,7 +619,7 @@ export default {
width: 85%;
height: 70%;
background-color: #f5f5f5;
z-index: 999;
z-index: 1001;
}
.el-header {
@ -805,9 +774,29 @@ export default {
font-weight: 100;
}
th,tr{
background-color: #badfff;
background-color: #fff;
}
}
.el-table__header-wrapper{
thead{
color: #ffffff;
font-size: 10px;
th{
padding: 5px 0;
}
}
th > .cell{
font-weight: 100;
}
th,tr{
background-color: #badfff;
}
}
.el-table__row--striped {
td{
background-color: #badfff!important;
}
}
.el-collapse-item__content{
padding-left: 10px;
padding-right: 10px;
@ -869,9 +858,12 @@ export default {
}
.panel{
position: fixed;
z-index: 1001;
top: 50%;
&.active{
//z-index: 10;
left: 85%;
z-index: 1001;
}
img{
height: 150px;

3
src/layouts/header/index.vue
Unescape View File

@ -33,7 +33,8 @@ export default {
})
},
exit(){
window.location = 'http://39.108.250.202/student/#/station/preview?courseId=6&curriculumName=%E9%93%B6%E8%A1%8C%E7%BB%BC%E5%90%88'
let cid = sessionStorage.getItem('cid')
window.location = 'http://39.108.250.202/student/#/station/preview?courseId='+cid+'&curriculumName=银行项目'
},
},
};

6
src/pages/counter/list/index.vue
Unescape View File

@ -353,7 +353,7 @@ export default {
if(this.$store.state.system.popText == '密码器'){
let accountPasswordAll = sessionStorage.getItem('accountPasswordAll');
this.passwordForm.password = accountPasswordAll
this.passwordForm.passwordAgain = accountPasswordAll
// this.passwordForm.passwordAgain = accountPasswordAll
}
if(!this.showGoods) this.showGoods = this.$store.state.system.showPop
if(!this.showGoods) this.checkList = []
@ -669,6 +669,10 @@ export default {
clickList.length = 0
}else{
if (this.id == '62,1'){
let accountVouchers = sessionStorage.getItem('accountVoucher')
let accountPasswords = sessionStorage.getItem('accountPassword')
console.log(accountVouchers)
console.log(accountPasswords)
this.goodsShelfTotalData = this.auditGoodsShelf
let accountVoucher = [];
let accountPassword = '';

50
src/pages/manage/list/personal/currentAccount/openAccount.vue
Unescape View File

@ -202,14 +202,7 @@ export default {
formThree:false,
count:0,
currencySelectList:[
{
options:'jk',
itemId:'12'
},
{
options:'出生',
itemId:'13'
}
],
goldLogoSelectList:[],
accountQualitySelectList:[],
@ -319,11 +312,18 @@ export default {
},
openAccount(){
this.count = this.count+1;
console.log(this.count)
if (this.count > 2){this.count = 2}
if (this.count > 2){
this.count = 2
this.$message({
type: 'error',
message: '最多只能添加三个!'
});
}
console.log(this.count)
if(this.count == 1 || this.count == 2){this.formTwo = true}
if (this.count == 2){this.formThree = true}
if (this.count == 2){
this.formThree = true
}
},
//点击提交表单
formSubmit(){
@ -334,23 +334,40 @@ export default {
this.visible = false
let formList = [];
let formLists = [];
let voucherNumber = []
let voucherNumberTwo = []
let voucherNumberThree = []
let projectId = sessionStorage.getItem('projectId')
let startTime = sessionStorage.getItem('startTime')
let accountVoucher = sessionStorage.getItem('accountVoucher')
let formExternalDataList = JSON.parse(accountVoucher);
let voucherNumber = formExternalDataList
if (formExternalDataList){
voucherNumber = formExternalDataList
}else{
voucherNumber = []
}
let accountVoucherTwo = sessionStorage.getItem('accountVoucherTwo')
let formExternalDataListTwo = JSON.parse(accountVoucherTwo);
let voucherNumberTwo = formExternalDataListTwo
if (formExternalDataListTwo){
voucherNumberTwo = formExternalDataListTwo
}else{
voucherNumberTwo = []
}
let accountVoucherThree = sessionStorage.getItem('accountVoucherThree')
let formExternalDataListThree = JSON.parse(accountVoucherThree);
let voucherNumberThree = formExternalDataListThree
if (formExternalDataListThree){
voucherNumberThree = formExternalDataListThree
}else{
voucherNumberThree = []
}
let accountPassword = sessionStorage.getItem('accountPassword')
let accountPasswordTwo = sessionStorage.getItem('accountPasswordTwo')
let accountPasswordThree = sessionStorage.getItem('accountPasswordThree')
let paymentCode = accountPassword;
let paymentCodeTwo = accountPasswordTwo;
let paymentCodeThree = accountPasswordThree;
console.log('voucherNumber'+voucherNumber)
console.log('accountPassword'+accountPassword)
if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType && voucherNumber.length && paymentCode){
for (var i=0;i<voucherNumber.length;i++){
formLists.push({"answerId":voucherNumber[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,62,75,"+voucherNumber[i].id,"type": ""})
@ -482,6 +499,9 @@ export default {
}
.add{
position: relative;
.el-col{
padding: 10px 0;
}
&::after{
content: '';
display: block;
@ -490,7 +510,7 @@ export default {
top: -4%;
border: 1px dashed #CFDDFF;
width: 88%;
height: 268px;
height: 200px;
}
.addBtn{
position: absolute;

Write Preview
Loading…
Cancel
Save