diff --git a/src/main/java/com/fjy/spring/controller/DataController.java b/src/main/java/com/fjy/spring/controller/DataController.java index 4c6f1f6..8ee4de0 100644 --- a/src/main/java/com/fjy/spring/controller/DataController.java +++ b/src/main/java/com/fjy/spring/controller/DataController.java @@ -6,6 +6,7 @@ import com.fjy.spring.exception.UserException; import com.fjy.spring.service.WorkDetailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -25,4 +26,9 @@ public class DataController { new UserException(ResultEnum.EMPTY_DATA); return null; } + + @PostMapping("/home/dofeedback") + public void doFeedback(){ + + } } diff --git a/src/main/java/com/fjy/spring/controller/NavController.java b/src/main/java/com/fjy/spring/controller/NavController.java index 107dc65..f37469e 100644 --- a/src/main/java/com/fjy/spring/controller/NavController.java +++ b/src/main/java/com/fjy/spring/controller/NavController.java @@ -24,4 +24,19 @@ public class NavController { public String toHomePage(){ return "/home/home"; } + + @GetMapping(value = {"/feedback"}) + public String toFeedbackPage(){ + return "/home/feedback"; + } + + @GetMapping(value = {"/about"}) + public String toAboutPage(){ + return "/home/about"; + } + + @GetMapping(value = {"/user"}) + public String toUserPage(){ + return "/home/user"; + } } diff --git a/src/main/java/com/fjy/spring/controller/UpLoadController.java b/src/main/java/com/fjy/spring/controller/UpLoadController.java index 1294502..4bc0dde 100644 --- a/src/main/java/com/fjy/spring/controller/UpLoadController.java +++ b/src/main/java/com/fjy/spring/controller/UpLoadController.java @@ -122,7 +122,9 @@ public class UpLoadController { * @return */ @RequestMapping("/moreUpload") - public void moreUpload(HttpServletRequest request) { + public void moreUpload(HttpServletRequest request, + @RequestParam(value = "courseName",required = false) String courseName, + @RequestParam(value = "folder",required = false) String folder) { MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest) request; Map files = multipartHttpServletRequest.getFileMap(); @@ -132,7 +134,7 @@ public class UpLoadController { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String dateNowStr = sdf.format(date); //String uploadUrl = request.getSession().getServletContext().getRealPath("/") + "upload/"; - String uploadUrl = serverProperties.getFilePath()+ "upload/"; + String uploadUrl = serverProperties.getFilePath()+ "upload/"+courseName+"/"+folder+"/"; File dir = new File(uploadUrl); if (!dir.exists()) { diff --git a/src/main/resources/static/js/homePage.js b/src/main/resources/static/js/homePage.js index 2c4dcd4..b4d69b3 100644 --- a/src/main/resources/static/js/homePage.js +++ b/src/main/resources/static/js/homePage.js @@ -1,3 +1,17 @@ +var dt = new Date(); +var month = dt.getMonth()+1; +var day = dt.getDate(); +var year = dt.getFullYear(); +var cur = year + '-' + month + '-' + day; +function DateDiff(sDate1, sDate2){ //sDate1和sDate2是2002-12-18格式 + var aDate, oDate1, oDate2, iDays + aDate = sDate1.split("-") + oDate1 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]) //转换为12-18-2002格式 + aDate = sDate2.split("-") + oDate2 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]) + iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 /24) //把相差的毫秒数转换为天数 + return iDays +} var Main = { data() { var checkName = (rule, value, callback) => { @@ -35,6 +49,9 @@ var Main = { } }; return { + feedbackForm: { + content: '' + }, activeIndex: '1', dialogVisible: false, ruleForm2: { @@ -73,7 +90,28 @@ var Main = { activeName:'login', fileList: [], DownloadList: [], - tableHomeworkData: [], + tableHomeworkData: [ + { + workid: 1, + colfileid: 56, + workname: "实验报告", + worktime: "2018-02-06 20:44:08.0", + colfilename: "2018 服务器装机.xlsx", + coursename: "信息安全", + workremark: "3000字以上", + workfolder: "第一次作业" + }, + { + workid: 1, + colfileid: 56, + workname: "实验报告2", + worktime: "2018-02-08 20:44:08.0", + colfilename: "2018 服务器装机.xlsx", + coursename: "决策支持系统", + workremark: "3000字以上", + workfolder: "第一次作业" + } + ], tableData2: [{ date: '2016-05-02', }, { @@ -113,6 +151,7 @@ var Main = { .then(function (response) { console.log(response.data); that.tableHomeworkData = response.data; + //that.limitTime = response.data; }) .catch(function (error) { console.log(error); @@ -121,6 +160,12 @@ var Main = { }, methods: { + uploadURL(row){ + return "http://localhost:8080/cms/moreUpload?courseName="+row.coursename+"&folder="+row.workfolder; + }, + limitTime(row){ + return DateDiff(row.worktime.replace(/([^\s]+)\s.*/, "$1"), cur); + }, submitForm(formName) { this.$refs[formName].validate((valid) => { if (valid) { diff --git a/src/main/resources/templates/home/about.html b/src/main/resources/templates/home/about.html new file mode 100644 index 0000000..2d54fb3 --- /dev/null +++ b/src/main/resources/templates/home/about.html @@ -0,0 +1,26 @@ + + + + + +
+
+ + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/home/feedback.html b/src/main/resources/templates/home/feedback.html new file mode 100644 index 0000000..b547d0c --- /dev/null +++ b/src/main/resources/templates/home/feedback.html @@ -0,0 +1,40 @@ + + + + + +
+
+ + + + + + + + + + + + + + 提交 + 重置 + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html index 3d1855f..f8fb1da 100644 --- a/src/main/resources/templates/home/home.html +++ b/src/main/resources/templates/home/home.html @@ -5,7 +5,6 @@
- - 用户名
- - -
- 首页
- 个人中心
- 关于
- 意见反馈 -
- + - +
@@ -137,6 +124,20 @@ {{ props.row.colfilename }} + + + 选取文件 + + 上传到服务器 + + + + @@ -146,14 +147,14 @@ - + - @@ -186,7 +187,7 @@
@@ -204,7 +205,7 @@ 取 消 确 定 - + -->
diff --git a/src/main/resources/templates/home/home2.html b/src/main/resources/templates/home/home2.html index 000b244..7f519cb 100644 --- a/src/main/resources/templates/home/home2.html +++ b/src/main/resources/templates/home/home2.html @@ -16,6 +16,7 @@ +
+ + - + - + - +