fjy8018/cms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复前端下拉死循环问题

Browse Source
This commit is contained in:
F嘉阳
2018-04-05 16:55:20 +08:00
parent 0c182a4375
commit ea9aa04a20
4 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.fjy</groupId> <groupId>com.fjy</groupId>
<artifactId>spring</artifactId> <artifactId>spring</artifactId>
<version>V2.6.7</version> <version>V2.6.8</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>spring</name> <name>spring</name>

1
src/main/resources/static/js/common.js
View File

@@ -28,4 +28,5 @@ function compareTime(startTime,endTime) {
} else { } else {
return '异常'; return '异常';
} }
} }

64
src/main/resources/static/js/homepage.js
View File

@@ -66,7 +66,7 @@ var Main = {
colrealname: '', colrealname: '',
colemail: '' colemail: ''
}, },
isShow:true, iShow:true,
rules2: { rules2: {
colpassword: [ colpassword: [
{required: true, validator: validatePass, trigger: 'blur'} {required: true, validator: validatePass, trigger: 'blur'}
@@ -232,27 +232,8 @@ var Main = {
}); });
}, },
uploadURL(row) { uploadURL(row) {
let that = this;
console.log(row.worktime+"||"+row.workid);
if (compareTime(cur,row.worktime)){
that.isShow = true;
console.log("Show"+that.isShow);
//提交时间合法
//document.getElementById("btn-group").style.display="";
//displayStyle("btn-show"+row.workid,"none");
//displayStyle("btn-group"+row.workid,"");
return getRootPath_web()+"/home/moreUpload?courseName=" + row.coursename + "&folder=" + row.workfolder+"&rename=true"; return getRootPath_web()+"/home/moreUpload?courseName=" + row.coursename + "&folder=" + row.workfolder+"&rename=true";
}else{
that.isShow = false;
console.log("EShow"+that.isShow);
//提交时间不合法
//displayStyle("btn-show"+row.workid,"");
//displayStyle("btn-group"+row.workid,"none");
//displayStyle("btn-show");
//document.getElementById("btn-show").style.display="";
return 0;
}
}, },
limitTime(row) { limitTime(row) {
return DateDiff(row.worktime.replace(/([^\s]+)\s.*/, "$1"), cur); return DateDiff(row.worktime.replace(/([^\s]+)\s.*/, "$1"), cur);
@@ -360,8 +341,47 @@ var Main = {
that.openNotiError("错误", "服务器错误！"); that.openNotiError("错误", "服务器错误！");
}); });
}, },
handlePreview(file) { isShow(row){
console.log(file); let that = this;
console.log(row.worktime+"||"+row.workid);
if (compareTime(cur,row.worktime)){
console.log("true");
return true;
//提交时间合法
//document.getElementById("btn-group").style.display="";
//displayStyle("btn-show"+row.workid,"none");
//displayStyle("btn-group"+row.workid,"");
}else {
console.log("false");
return false;
//提交时间不合法
//displayStyle("btn-show"+row.workid,"");
//displayStyle("btn-group"+row.workid,"none");
//displayStyle("btn-show");
//document.getElementById("btn-show").style.display="";
}
},
handlePreview(row) {
console.log(row);
/* let that = this;
console.log(row.worktime+"||"+row.workid);
if (compareTime(cur,row.worktime)){
that.isShow = true;
console.log("Show"+that.isShow);
//提交时间合法
//document.getElementById("btn-group").style.display="";
//displayStyle("btn-show"+row.workid,"none");
//displayStyle("btn-group"+row.workid,"");
}
if (!compareTime(cur,row.worktime)){
that.isShow = false;
console.log("EShow"+that.isShow);
//提交时间不合法
//displayStyle("btn-show"+row.workid,"");
//displayStyle("btn-group"+row.workid,"none");
//displayStyle("btn-show");
//document.getElementById("btn-show").style.display="";
}*/
}, },
handleExceed(files, fileList) { handleExceed(files, fileList) {
this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);

6
src/main/resources/templates/home/home.html
View File

@@ -127,11 +127,11 @@
<el-form-item label="提交作业"> <el-form-item label="提交作业">
<el-upload class="upload-demo" ref="upload" <el-upload class="upload-demo" ref="upload"
:action="uploadURL(props.row)" :action="uploadURL(props.row)"
:on-preview="handlePreview" :on-preview="handlePreview(props.row)"
:on-remove="handleRemove" :file-list="fileList" :on-remove="handleRemove" :file-list="fileList"
:auto-upload="false" :auto-upload="false"
name="imageFile"> name="imageFile">
<div id="btn-group" v-show="isShow"> <div id="btn-group" v-show="isShow(props.row)">
<el-button slot="trigger" size="small" type="primary"> <el-button slot="trigger" size="small" type="primary">
选取文件 选取文件
</el-button> </el-button>
@@ -143,7 +143,7 @@
<div slot="tip" class="el-upload__tip">上传文件大小不能超过100Mb <div slot="tip" class="el-upload__tip">上传文件大小不能超过100Mb
</div> </div>
</div> </div>
<div id="btn-show" v-show="!isShow"> <div id="btn-show" v-show="!isShow(props.row)">
<el-alert <el-alert
title="作业提交已截止" title="作业提交已截止"
type="error" type="error"