From 48b5944d28a598a8979ad29183de4df9d5838b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= Date: Fri, 23 Feb 2018 21:57:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=AF=B9=E6=9C=AA=E4=BA=A4?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BA=BA=E5=91=98=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=92=8C=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fjy/spring/service/VUserfileService.java | 2 + src/main/resources/application-dev.yml | 3 + src/main/resources/static/js/home.js | 7 +- src/main/resources/static/js/homePage.js | 5 +- src/main/resources/static/js/homework.js | 36 ++++++++++ src/main/resources/templates/home/about.html | 2 +- src/main/resources/templates/home/admin.html | 4 +- src/main/resources/templates/home/home.html | 2 +- .../resources/templates/home/homework.html | 68 +++++++------------ 9 files changed, 75 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/fjy/spring/service/VUserfileService.java b/src/main/java/com/fjy/spring/service/VUserfileService.java index ee0ee58..21896c7 100644 --- a/src/main/java/com/fjy/spring/service/VUserfileService.java +++ b/src/main/java/com/fjy/spring/service/VUserfileService.java @@ -20,4 +20,6 @@ public class VUserfileService { public List findStudentNoByWorkFolderAndCourseName(String workFolder, String courseName){ return vUserfileRepository.findStudentNoByWorkFolderAndCourseName(workFolder,courseName); } + + } \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 03239bf..5f4f096 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,6 +9,9 @@ serverproperties: spring: thymeleaf: prefix: classpath:/templates/ + cache: false + check-template: true + datasource: driver-class-name: com.mysql.jdbc.Driver url: jdbc:mysql://localhost:3306/db_imis2?useUnicode=true&characterEncoding=utf-8&useSSL=true diff --git a/src/main/resources/static/js/home.js b/src/main/resources/static/js/home.js index 44a6d8e..6888970 100644 --- a/src/main/resources/static/js/home.js +++ b/src/main/resources/static/js/home.js @@ -314,7 +314,6 @@ var Main = { }) }, methods: { - openNotiSuccess(title, content) { this.$notify({ title: title, @@ -378,15 +377,15 @@ var Main = { console.log(file, fileList); }, ClickToJump(targe) { - window.location.href = "http://localhost:8080/cms/" + targe; + window.location.href = getRootPath_web()+"/" + targe; }, handleDownload(row) { /*var url = window.location.protocol+"://"+window.location.host+":"+window.location.port+"/"*/ - window.open("http://localhost:8080/cms/download/dodownload?fileId=" + row.colfileid); + window.open(getRootPath_web()+"/download/dodownload?fileId=" + row.colfileid); }, handleDelete(row) { axios({ - url: 'http://localhost:8080/cms/home/filedelete', + url: getRootPath_web()+'/home/filedelete', method: 'post', data: { fileid: row.colfileid diff --git a/src/main/resources/static/js/homePage.js b/src/main/resources/static/js/homePage.js index 284587b..7322012 100644 --- a/src/main/resources/static/js/homePage.js +++ b/src/main/resources/static/js/homePage.js @@ -314,7 +314,6 @@ var Main = { }) }, methods: { - openNotiSuccess(title, content) { this.$notify({ title: title, @@ -329,7 +328,7 @@ var Main = { }); }, uploadURL(row) { - return "http://localhost:8080/cms/moreUpload?courseName=" + row.coursename + "&folder=" + row.workfolder; + return getRootPath_web()+"/moreUpload?courseName=" + row.coursename + "&folder=" + row.workfolder; }, limitTime(row) { return DateDiff(row.worktime.replace(/([^\s]+)\s.*/, "$1"), cur); @@ -338,7 +337,7 @@ var Main = { this.$refs[formName].validate((valid) => { if (valid) { axios({ - url: 'http://localhost:8080/cms/' + url, + url: getRootPath_web()+'/' + url, method: 'post', data: { content: this.$refs.content.value diff --git a/src/main/resources/static/js/homework.js b/src/main/resources/static/js/homework.js index 31e476f..6f752ae 100644 --- a/src/main/resources/static/js/homework.js +++ b/src/main/resources/static/js/homework.js @@ -2,12 +2,21 @@ var Main = { data() { return { activeIndex: '1', + dialogTableVisible: false, formInline: { name:'', name2:'', content: '', folder: '' }, + UncommittedPersonList:[ + { + listid: 1, + colstudentno:'15251101238', + colrealname:'符嘉阳', + sex:'男' + } + ], homeworkData: [ { fileid: 56, @@ -53,6 +62,25 @@ var Main = { }) }, methods: { + findUncommitStudent(row){ + var that = this; + this.dialogTableVisible = true; + axios.get(getRootPath_web()+'/home/findStudentInCourseFile', + { + params: { + Folder: row.folder, + CourseName:row.courseName + } + } + ) + .then(function (response) { + console.log(response.data); + that.UncommittedPersonList = response.data; + }) + .catch(function (error) { + console.log(error); + }) + }, togglePost(url){ axios({ url: getRootPath_web()+url, @@ -73,6 +101,14 @@ var Main = { } }) }, + dialogClose(done) { + this.$confirm('确认关闭？') + .then(_ => { + done(); + }) + .catch(_ => { + }); + }, handleSelect(key, keyPath) { console.log(key, keyPath); }, diff --git a/src/main/resources/templates/home/about.html b/src/main/resources/templates/home/about.html index 421a7c8..2ccf26b 100644 --- a/src/main/resources/templates/home/about.html +++ b/src/main/resources/templates/home/about.html @@ -64,6 +64,6 @@ - + \ No newline at end of file diff --git a/src/main/resources/templates/home/admin.html b/src/main/resources/templates/home/admin.html index 0f40d78..b1d1db0 100644 --- a/src/main/resources/templates/home/admin.html +++ b/src/main/resources/templates/home/admin.html @@ -1,9 +1,7 @@ - - - +
diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html index bae0fea..17ed046 100644 --- a/src/main/resources/templates/home/home.html +++ b/src/main/resources/templates/home/home.html @@ -304,6 +304,6 @@
- + \ No newline at end of file diff --git a/src/main/resources/templates/home/homework.html b/src/main/resources/templates/home/homework.html index 0dcb8fe..20e307b 100644 --- a/src/main/resources/templates/home/homework.html +++ b/src/main/resources/templates/home/homework.html @@ -1,50 +1,18 @@ - - - - - 作业管理 - - - + + + - - - - - - +
- - - 首页 - - - 选项1 - 选项2 - 选项3 - - 关于 - 意见反馈 - 登出 - - + - -
- 用户名
- 学号 -
-
- 首页
- 个人中心
- 关于
- 意见反馈 -
- + + @@ -72,8 +40,25 @@ + + + + + + + + + +

添加作业

@@ -114,7 +99,6 @@
- - +