20240205
e 3 years ago
parent 56c429050b
commit 8d3994ac25
  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

@ -2,10 +2,10 @@ import axios from 'axios';
import router from '../router'; import router from '../router';
// 创建axios实例 // 创建axios实例
const service = axios.create({ 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.137:9000/", // 赓
// baseURL: "http://192.168.31.151: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', // baseURL: 'http://39.108.250.202:9000',
timeout: 30000 // 请求超时时间 timeout: 30000 // 请求超时时间
}) })

@ -37,7 +37,7 @@
v-show="projectPermissions == 0" v-show="projectPermissions == 0"
@click="reload" @click="reload"
>重新开始</el-button> >重新开始</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>
</div> </div>
</el-header> </el-header>
@ -64,9 +64,9 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-card shadow="hover"> <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 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>
<el-table-column prop="right" label="完成结果" align="center"> <el-table-column prop="right" label="完成结果" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -118,6 +118,7 @@
<img src="../../assets/img/case/right.png" alt v-else /> <img src="../../assets/img/case/right.png" alt v-else />
</div> </div>
</div> </div>
<div class='popContainer' v-if='popContainer'></div>
</div> </div>
</template> </template>
@ -179,6 +180,9 @@ export default {
projectManage:{}, projectManage:{},
requires:[], requires:[],
projectName:'', projectName:'',
loading:false,
sss:1,
popContainer:false
} }
}, },
watch: { watch: {
@ -241,14 +245,8 @@ export default {
sessionStorage.setItem('systemId', systemId) sessionStorage.setItem('systemId', systemId)
} }
let tokens = sessionStorage.getItem('token') let tokens = sessionStorage.getItem('token')
console.log(tokens) if(tokens || token){
if(tokens){
this.projectPermissions = this.projectId ? 1 : 0 this.projectPermissions = this.projectId ? 1 : 0
if(this.projectId){
this.getQueryProject();
}else{
this.getProjects();
}
this.assessmentId && this.projectId && this.checkVer() this.assessmentId && this.projectId && this.checkVer()
this.codeId && this.codeIds.push(this.codeId) this.codeId && this.codeIds.push(this.codeId)
this.getData() this.getData()
@ -274,11 +272,26 @@ export default {
} }
getProjectBySystemId(params).then((data)=>{ getProjectBySystemId(params).then((data)=>{
if(data.status == 200){ 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.topicList = data.data.projects;
this.projectId = this.topicList[0].projectId; this.projectId = this.topicList[0].projectId;
getQueryCache(params).then((data)=>{ getQueryCache(params).then((data)=>{
if(data.data.status == 200){ if(data.data.status == 200){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { this.$confirm('有项目未做完,是否回到未做完的项目?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
@ -291,21 +304,6 @@ export default {
let params = { let params = {
"projectId":data.data.projectId, "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) sessionStorage.setItem('projectId', data.data.projectId)
this.selectProjects(params) this.selectProjects(params)
}).catch(() => { }).catch(() => {
@ -317,24 +315,31 @@ export default {
}).catch(() => { }).catch(() => {
}) })
sessionStorage.setItem('projectId', this.topicList[0].projectId)
this.projectId = this.topicList[0].projectId
let params = { let params = {
"projectId":this.projectId, "projectId":this.topicList[0].projectId,
} }
this.selectProjects(params) this.selectProjects(params)
}); });
}else{ }else{
sessionStorage.setItem('projectId', this.topicList[0].projectId)
let params = {
"projectId":this.topicList[0].projectId,
}
this.selectProjects(params)
} }
}).catch((error)=>{ }).catch((error)=>{
}) })
// //
let startTime = new Date().getTime(); this.globalTimer = "";
sessionStorage.setItem('startTime', startTime) this.countVal = "";
this.day = '00'; this.day = "00";
this.hour = '00'; this.seconds = "00";
this.minutes = '00'; this.minutes = "00";
this.seconds = '00'; this.hour = "00";
this.getClearTime(); // this.getClearTime();
this.sss = 1
this.startCountFn(); this.startCountFn();
} }
}).catch((error)=>{ }).catch((error)=>{
@ -358,14 +363,15 @@ export default {
sessionStorage.setItem('projectId', this.projectId) sessionStorage.setItem('projectId', this.projectId)
getProjectDetail(params).then((data)=>{ getProjectDetail(params).then((data)=>{
if(data.status == 200){ if(data.status == 200){
this.popContainer = false
let token = sessionStorage.getItem('token') let token = sessionStorage.getItem('token')
let cid = sessionStorage.getItem('cid') let cid = sessionStorage.getItem('cid')
let systemId = sessionStorage.getItem('systemId') let systemId = sessionStorage.getItem('systemId')
this.projectName = data.data.projectManage.projectName; this.projectName = data.data.projectManage.projectName;
this.projectManage = data.data.projectManage; this.projectManage = data.data.projectManage;
this.requires = data.data.projectJudgmentVos; this.requires = data.data.projectJudgmentVos;
// location.href = 'http://39.108.250.202/banksystem/#/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 // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
} }
}).catch((error)=>{ }).catch((error)=>{
}) })
@ -385,11 +391,14 @@ export default {
s = s < 10 ? ('0' + s) : s; s = s < 10 ? ('0' + s) : s;
let startTime = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s; let startTime = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
sessionStorage.setItem('startTime', startTime) sessionStorage.setItem('startTime', startTime)
this.day = '00'; this.globalTimer = "";
this.hour = '00'; this.countVal = "";
this.minutes = '00'; this.day = "00";
this.seconds = '00'; this.seconds = "00";
this.getClearTime(); this.minutes = "00";
this.hour = "00";
// this.getClearTime();
this.sss = 1
this.startCountFn(); this.startCountFn();
}, },
// //
@ -412,9 +421,6 @@ export default {
let systemId = sessionStorage.getItem('systemId') let systemId = sessionStorage.getItem('systemId')
let cid = sessionStorage.getItem('cid') let cid = sessionStorage.getItem('cid')
let params = { let params = {
// "accountId": 0,
// "classId": 0,
// "className":0,
"curriculumId":+cid, "curriculumId":+cid,
"endTime": this.actEndTime, "endTime": this.actEndTime,
"lcId": lcld, "lcId": lcld,
@ -422,11 +428,11 @@ export default {
"projectName":this.projectName, "projectName":this.projectName,
"purpose":this.projectManage.experimentTarget, "purpose":this.projectManage.experimentTarget,
"ruleReqs": ruleReqsList, "ruleReqs": ruleReqsList,
"startTime": +startTime, "startTime": startTime,
"submitTime": this.actEndTime, "submitTime": this.actEndTime,
"systemId": systemId, "systemId": systemId,
// "timeSum": 0
} }
this.loading = true;
submit(params).then((data)=>{ submit(params).then((data)=>{
if(data.status == 200){ if(data.status == 200){
let datas= data.data.retMap.scoreInfo; 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 this.requires = list
} }
console.log(this.requires) this.loading = false
}).catch((error)=>{ }).catch((error)=>{
this.loading = false
}) })
this.getClearTime(); // this.getClearTime();
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: "info", type: "info",
@ -462,10 +480,15 @@ export default {
startCountFn() { startCountFn() {
if (!this.isStart) { if (!this.isStart) {
this.countVal = this.countVal ? this.countVal : 0; this.countVal = this.countVal ? this.countVal : 0;
let timer = setInterval(() => { this.globalTimer = setInterval(() => {
this.counterFn(this.countVal++); if(this.sss == 0){
this.globalTimer = null;
clearInterval(this.globalTimer);
}else{
this.counterFn(this.countVal++);
}
}, 1000); }, 1000);
this.globalTimer = timer;
this.isStart = true; this.isStart = true;
} }
}, },
@ -488,18 +511,38 @@ export default {
}, },
// //
reload() { 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() { // getClearTime() {
clearInterval(this.countVal); //
this.globalTimer = ""; // },
this.countVal = "";
this.day = "00";
this.seconds = "00";
this.minutes = "00";
this.hour = "00";
},
checkVer() { checkVer() {
let data = { let data = {
userId: this.userId, userId: this.userId,
@ -519,97 +562,12 @@ export default {
toggleCase() { toggleCase() {
this.caseVisible = !this.caseVisible this.caseVisible = !this.caseVisible
}, },
handleData(project,type){ // getProjects(){
if(!this.isSelected){ // let data = {
this.value = project; // systemId: this.systemId,
this.projectId = project[0].projectId; // schoolId: ''
} // }
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 //01
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 => {});
},
collapse(){ collapse(){
}, },
@ -639,6 +597,17 @@ export default {
</script> </script>
<style lang="scss" scoped> <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 { /deep/.el-container {
height: 80%; height: 80%;
@ -650,7 +619,7 @@ export default {
width: 85%; width: 85%;
height: 70%; height: 70%;
background-color: #f5f5f5; background-color: #f5f5f5;
z-index: 999; z-index: 1001;
} }
.el-header { .el-header {
@ -805,9 +774,29 @@ export default {
font-weight: 100; font-weight: 100;
} }
th,tr{ 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{ .el-collapse-item__content{
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
@ -869,9 +858,12 @@ export default {
} }
.panel{ .panel{
position: fixed; position: fixed;
z-index: 1001;
top: 50%; top: 50%;
&.active{ &.active{
//z-index: 10;
left: 85%; left: 85%;
z-index: 1001;
} }
img{ img{
height: 150px; height: 150px;

@ -33,7 +33,8 @@ export default {
}) })
}, },
exit(){ 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=银行项目'
}, },
}, },
}; };

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

@ -202,14 +202,7 @@ export default {
formThree:false, formThree:false,
count:0, count:0,
currencySelectList:[ currencySelectList:[
{
options:'jk',
itemId:'12'
},
{
options:'出生',
itemId:'13'
}
], ],
goldLogoSelectList:[], goldLogoSelectList:[],
accountQualitySelectList:[], accountQualitySelectList:[],
@ -319,11 +312,18 @@ export default {
}, },
openAccount(){ openAccount(){
this.count = this.count+1; this.count = this.count+1;
console.log(this.count) if (this.count > 2){
if (this.count > 2){this.count = 2} this.count = 2
this.$message({
type: 'error',
message: '最多只能添加三个!'
});
}
console.log(this.count) console.log(this.count)
if(this.count == 1 || this.count == 2){this.formTwo = true} 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(){ formSubmit(){
@ -334,23 +334,40 @@ export default {
this.visible = false this.visible = false
let formList = []; let formList = [];
let formLists = []; let formLists = [];
let voucherNumber = []
let voucherNumberTwo = []
let voucherNumberThree = []
let projectId = sessionStorage.getItem('projectId') let projectId = sessionStorage.getItem('projectId')
let startTime = sessionStorage.getItem('startTime') let startTime = sessionStorage.getItem('startTime')
let accountVoucher = sessionStorage.getItem('accountVoucher') let accountVoucher = sessionStorage.getItem('accountVoucher')
let formExternalDataList = JSON.parse(accountVoucher); let formExternalDataList = JSON.parse(accountVoucher);
let voucherNumber = formExternalDataList if (formExternalDataList){
voucherNumber = formExternalDataList
}else{
voucherNumber = []
}
let accountVoucherTwo = sessionStorage.getItem('accountVoucherTwo') let accountVoucherTwo = sessionStorage.getItem('accountVoucherTwo')
let formExternalDataListTwo = JSON.parse(accountVoucherTwo); let formExternalDataListTwo = JSON.parse(accountVoucherTwo);
let voucherNumberTwo = formExternalDataListTwo if (formExternalDataListTwo){
voucherNumberTwo = formExternalDataListTwo
}else{
voucherNumberTwo = []
}
let accountVoucherThree = sessionStorage.getItem('accountVoucherThree') let accountVoucherThree = sessionStorage.getItem('accountVoucherThree')
let formExternalDataListThree = JSON.parse(accountVoucherThree); let formExternalDataListThree = JSON.parse(accountVoucherThree);
let voucherNumberThree = formExternalDataListThree if (formExternalDataListThree){
voucherNumberThree = formExternalDataListThree
}else{
voucherNumberThree = []
}
let accountPassword = sessionStorage.getItem('accountPassword') let accountPassword = sessionStorage.getItem('accountPassword')
let accountPasswordTwo = sessionStorage.getItem('accountPasswordTwo') let accountPasswordTwo = sessionStorage.getItem('accountPasswordTwo')
let accountPasswordThree = sessionStorage.getItem('accountPasswordThree') let accountPasswordThree = sessionStorage.getItem('accountPasswordThree')
let paymentCode = accountPassword; let paymentCode = accountPassword;
let paymentCodeTwo = accountPasswordTwo; let paymentCodeTwo = accountPasswordTwo;
let paymentCodeThree = accountPasswordThree; 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){ 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++){ 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": ""}) 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{ .add{
position: relative; position: relative;
.el-col{
padding: 10px 0;
}
&::after{ &::after{
content: ''; content: '';
display: block; display: block;
@ -490,7 +510,7 @@ export default {
top: -4%; top: -4%;
border: 1px dashed #CFDDFF; border: 1px dashed #CFDDFF;
width: 88%; width: 88%;
height: 268px; height: 200px;
} }
.addBtn{ .addBtn{
position: absolute; position: absolute;

Loading…
Cancel
Save