diff --git a/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java b/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java index 5f02093..f3f3ad8 100644 --- a/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java +++ b/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java @@ -26,7 +26,7 @@ public class WebAppConfig implements WebMvcConfigurer { public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/cms/js/**").addResourceLocations("classpath:/js/"); registry.addResourceHandler("/cms/css/**").addResourceLocations("classpath:/css/"); - registry.addResourceHandler("/css/**").addResourceLocations("classpath:/css/"); + //registry.addResourceHandler("/css/**").addResourceLocations("classpath:/css/"); registry.addResourceHandler("/cms/fonts/**").addResourceLocations("classpath:/fonts/"); registry.addResourceHandler("/cms/images/**").addResourceLocations("classpath:/images/"); } diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 242d95b..bc079a1 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -1,5 +1,6 @@ @charset "utf-8"; /* CSS Document */ +@import url("https://unpkg.com/element-ui@2.1.0/lib/theme-chalk/display.css"); @font-face { /* font-properties */ font-family: element-icons; @@ -9,3 +10,51 @@ .loginTitle{ text-align: center; } +.el-row { + margin-bottom: 20px; + &:last-child { + margin-bottom: 0; + } +} +.row-bg { + padding: 10px 0; +} +.text { + font-size: 14px; +} + +.item { + margin-bottom: 18px; +} + +.clearfix:before, +.clearfix:after { + display: table; + content: ""; +} +.clearfix:after { + clear: both +} + +.box-card { + width: 100%; +} +a{ + text-decoration: none; +} +.demo-table-expand { + font-size: 0; +} +.demo-table-expand label { + width: 90px; + color: #99a9bf; +} +.demo-table-expand .el-form-item { + margin-right: 0; + margin-bottom: 0; + width: 50%; +} +.footer{ + text-align: center; +} + diff --git a/src/main/resources/static/js/homePage.js b/src/main/resources/static/js/homePage.js index 436d18e..5373dec 100644 --- a/src/main/resources/static/js/homePage.js +++ b/src/main/resources/static/js/homePage.js @@ -1,12 +1,3 @@ -/*var data = ""; -axios.get('http://localhost:8080/cms/download/findall') - .then(function (response) { - console.log(response.data); - data = response.data; - }) - .catch(function (error) { - console.log(error); - });*/ var Main = { data() { var checkName = (rule, value, callback) => { @@ -44,6 +35,8 @@ var Main = { } }; return { + activeIndex: '1', + dialogVisible: false, ruleForm2: { colname: '', colpassword: '', @@ -78,14 +71,59 @@ var Main = { ], }, activeName:'login', - fileList: [{ - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100' + fileList: [], + DownloadList: [], + tableHomeworkData: [{ + subject: '信息安全', + date: '2018-05-02', + name: '实验报告', + content: '实验报告', + remark:'3000字以上', + tempfile:'15251101238.docx' }, { - name: 'food2.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100' + subject: '信息安全', + date: '2018-05-02', + name: '实验报告', + content: '实验报告', + remark:'3000字以上', + tempfile:'15251101238.docx' + }, { + subject: '信息安全', + date: '2018-05-02', + name: '实验报告', + content: '实验报告', + remark:'3000字以上', + tempfile:'15251101238.docx' + }, { + subject: '信息安全', + date: '2018-05-02', + name: '实验报告', + content: '实验报告', + remark:'3000字以上', + tempfile:'15251101238.docx' }], - DownloadList: [] + tableData2: [{ + date: '2016-05-02', + }, { + date: '2016-05-04', + }, { + date: '2016-05-01', + }, { + date: '2016-05-03', + }], + tableData3: [{ + date: '2016-05-02', + name: '王小虎' + }, { + date: '2016-05-04', + name: '王小虎' + }, { + date: '2016-05-01', + name: '王小虎' + }, { + date: '2016-05-03', + name: '王小虎' + }] }; }, mounted() { @@ -125,6 +163,9 @@ var Main = { handleRemove(file, fileList) { console.log(file, fileList); }, + ClickToJump(targe){ + window.open("http://localhost:8080/cms/" + 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); @@ -147,6 +188,13 @@ var Main = { handleClose(key, keyPath) { console.log(key, keyPath); }, + dialogClose(done) { + this.$confirm('确认关闭？') + .then(_ => { + done(); + }) + .catch(_ => {}); + }, showMsg(msg) { this.$message({ message: msg, diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html index 71d78c7..d11166f 100644 --- a/src/main/resources/templates/home/home.html +++ b/src/main/resources/templates/home/home.html @@ -6,7 +6,7 @@
-
+ +
+ + + + + + + 首页 + + + 选项1 + 选项2 + 选项3 + + 关于 + 意见反馈 + 登出 + + + + + +
+ 用户名
+ 学号 +
+
+ 首页
+ 个人中心
+ 关于
+ 意见反馈 +
+ + + + + +
+ + + + + 上传文件 + + + + + +
+ + 选取文件 + + 上传到服务器 + +
只能上传jpg/png文件，且不超过500kb
+ +
+ + + + 取 消 + 确 定 + + +
+ + + + + +
+ + + + + + + + + + + + + +
+ + + + + + +
+ +
+ 作业提交倒计时 +
+
+ {{'倒计时 ' + o }} +
+ + +
+ + + + +
+ 公告 +
+
+ {{'公告内容 ' + o }} +
+ + + + + + +
+ © 2018 作业提交系统 +
+ +
- diff --git a/src/main/resources/templates/home/home2.html b/src/main/resources/templates/home/home2.html index e00ef0c..d5b2259 100644 --- a/src/main/resources/templates/home/home2.html +++ b/src/main/resources/templates/home/home2.html @@ -7,6 +7,7 @@ --> + @@ -17,7 +18,7 @@
- + + - 处理中心 + 首页 - + 选项1 选项2 选项3 - 登出 + 关于 + 意见反馈 + 登出 - - -
- - 选取文件 - - 上传到服务器 - -
只能上传jpg/png文件，且不超过500kb
- + + +
+ 用户名
+ 学号
- - - - -
- - +
+ 首页
+ 个人中心
+ 关于
+ 意见反馈 +
+ + + + + +
+ + + + + 上传文件 + + + + + +
+ + 选取文件 + + 上传到服务器 + +
只能上传jpg/png文件，且不超过500kb
+ +
+ + + + 取 消 + 确 定 + + +
+ + + + + +
+ + + + + + + + + + + + + +
+ + + + + + +
+ +
+ 作业提交倒计时 +
+
+ {{'倒计时 ' + o }} +
+ + +
+ + + + +
+ 公告 +
+
+ {{'公告内容 ' + o }} +
+ + + + + +
+ © 2018 作业提交系统 +