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

修复前端上传文件两次弹框

Browse Source
This commit is contained in:
F嘉阳
2018-04-25 21:43:08 +08:00
parent 53989d5502
commit 681bcdbc6e
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/fjy/spring/controller/LoginController.java
View File

@@ -53,11 +53,21 @@ public class LoginController {
Date date = new Date(); Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateNowStr = sdf.format(date); String dateNowStr = sdf.format(date);
//System.out.println("当前时间："+dateNowStr); //System.out.println("当前时间："+dateNowStr);
TbLog log = new TbLog(); TbLog log = new TbLog();
log.setUserid(user.getColuserid()); log.setUserid(user.getColuserid());
log.setColtime(dateNowStr); log.setColtime(dateNowStr);
log.setColheader(request.getHeader("user-agent")); log.setColheader(request.getHeader("user-agent"));
System.out.println("【request】"+request.getRequestURI());
System.out.println("【request】"+request.getContextPath());
System.out.println("【request】"+request.getPathInfo());
System.out.println("【request】"+request.getAuthType());
System.out.println("【request】"+request.getRequestURL());
System.out.println("【request】"+request.getPathTranslated());
System.out.println("【request】"+request.getQueryString());
//解决nginx代理后IP地址获取问题 //解决nginx代理后IP地址获取问题
//log.setColip(request.getRemoteAddr()); //log.setColip(request.getRemoteAddr());
log.setColip(GetIPAddrUtil.getIpAddr(request)); log.setColip(GetIPAddrUtil.getIpAddr(request));

3
src/main/java/com/fjy/spring/controller/UpLoadController.java
View File

@@ -83,7 +83,8 @@ public class UpLoadController {
String uploadUrl = serverProperties.getFilePath() + "upload/"; String uploadUrl = serverProperties.getFilePath() + "upload/";
String filename = imageFile.getOriginalFilename(); String filename = imageFile.getOriginalFilename();
File dir = new File(uploadUrl); File dir = new File(uploadUrl);
if (!dir.exists()) {//判断目录是否存在，否则自动创建 //判断目录是否存在，否则自动创建
if (!dir.exists()) {
dir.mkdirs(); dir.mkdirs();
} }
/** /**

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

@@ -348,7 +348,7 @@ var Main = {
}, },
isShow(row) { isShow(row) {
let that = this; let that = this;
console.log(row.worktime + "||" + row.workid); // console.log(row.worktime + "||" + row.workid);
if (compareTime(cur, row.worktime)) { if (compareTime(cur, row.worktime)) {
console.log("true"); console.log("true");
return true; return true;

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

@@ -130,19 +130,21 @@
:on-preview="handlePreview(props.row)" :on-preview="handlePreview(props.row)"
:on-remove="handleRemove" :file-list="fileList" :on-remove="handleRemove" :file-list="fileList"
:auto-upload="false" :auto-upload="false"
v-show="isShow(props.row)"
name="imageFile"> name="imageFile">
<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>
<el-button style="margin-left: 10px;" size="small" <el-button style="margin-left: 10px;" size="small"
type="success" type="success"
@click="submitUpload"> @click="submitUpload" >
上传到服务器 上传到服务器
</el-button> </el-button>
<div slot="tip" class="el-upload__tip">上传文件大小不能超过100Mb <div slot="tip" class="el-upload__tip">上传文件大小不能超过100Mb
</div> </div>
</div>
</el-upload>
<div id="btn-show" v-show="!isShow(props.row)"> <div id="btn-show" v-show="!isShow(props.row)">
<el-alert <el-alert
title="作业提交已截止" title="作业提交已截止"
@@ -151,7 +153,6 @@
show-icon> show-icon>
</el-alert> </el-alert>
</div> </div>
</el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>