- Hello World!
+
+
diff --git a/System/src/components/page/overview/Horizontal.vue b/System/src/components/page/overview/Horizontal.vue
new file mode 100644
index 0000000..7b578ad
--- /dev/null
+++ b/System/src/components/page/overview/Horizontal.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/System/src/components/page/overview/Index.vue b/System/src/components/page/overview/Index.vue
new file mode 100644
index 0000000..99fa23c
--- /dev/null
+++ b/System/src/components/page/overview/Index.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/System/src/components/page/overview/Profession.vue b/System/src/components/page/overview/Profession.vue
new file mode 100644
index 0000000..67ce0d7
--- /dev/null
+++ b/System/src/components/page/overview/Profession.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/System/src/components/page/overview/Unit.vue b/System/src/components/page/overview/Unit.vue
new file mode 100644
index 0000000..91f6c9d
--- /dev/null
+++ b/System/src/components/page/overview/Unit.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/System/src/components/page/overview/Vertical.vue b/System/src/components/page/overview/Vertical.vue
new file mode 100644
index 0000000..4d334d3
--- /dev/null
+++ b/System/src/components/page/overview/Vertical.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/System/src/components/page/permission/Index.vue b/System/src/components/page/permission/Index.vue
new file mode 100644
index 0000000..3b69944
--- /dev/null
+++ b/System/src/components/page/permission/Index.vue
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/System/src/components/page/permission/IntakeData.vue b/System/src/components/page/permission/IntakeData.vue
new file mode 100644
index 0000000..465268e
--- /dev/null
+++ b/System/src/components/page/permission/IntakeData.vue
@@ -0,0 +1,114 @@
+
+
+
+
+ 选取EXCEL文件
+ 上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/System/src/components/page/personal/Analysis.vue b/System/src/components/page/personal/Analysis.vue
new file mode 100644
index 0000000..3d86a49
--- /dev/null
+++ b/System/src/components/page/personal/Analysis.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/System/src/components/page/personal/Index.vue b/System/src/components/page/personal/Index.vue
new file mode 100644
index 0000000..ef53c69
--- /dev/null
+++ b/System/src/components/page/personal/Index.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/System/src/components/page/personal/Information.vue b/System/src/components/page/personal/Information.vue
new file mode 100644
index 0000000..4c960be
--- /dev/null
+++ b/System/src/components/page/personal/Information.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+ {{name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/System/src/components/page/personal/Rules.vue b/System/src/components/page/personal/Rules.vue
new file mode 100644
index 0000000..38ca597
--- /dev/null
+++ b/System/src/components/page/personal/Rules.vue
@@ -0,0 +1,23 @@
+
+
+ kooriookami
+ 18100000000
+ 苏州市
+
+ 学校
+
+ 江苏省苏州市吴中区吴中大道 1188 号
+
+
+
+
+
+
diff --git a/System/src/components/page/personal/Statistics.vue b/System/src/components/page/personal/Statistics.vue
new file mode 100644
index 0000000..c29c0fb
--- /dev/null
+++ b/System/src/components/page/personal/Statistics.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/System/src/components/page/result/Advice.vue b/System/src/components/page/result/Advice.vue
new file mode 100644
index 0000000..ad183a3
--- /dev/null
+++ b/System/src/components/page/result/Advice.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/System/src/components/page/result/Index.vue b/System/src/components/page/result/Index.vue
new file mode 100644
index 0000000..486704c
--- /dev/null
+++ b/System/src/components/page/result/Index.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/System/src/components/page/result/Rank.vue b/System/src/components/page/result/Rank.vue
new file mode 100644
index 0000000..257a5c0
--- /dev/null
+++ b/System/src/components/page/result/Rank.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
diff --git a/System/src/router/index.js b/System/src/router/index.js
index 420e5a5..1c0c0cc 100644
--- a/System/src/router/index.js
+++ b/System/src/router/index.js
@@ -4,7 +4,6 @@ import Router from 'vue-router'
import AppIndex from '../components/home/AppIndex'
import Login from '../components/Login'
import Home from "../components/Home"
-import CombatantsIndex from "../components/combatants/CombatantsIndex";
Vue.use(Router)
@@ -26,24 +25,100 @@ export default new Router({
path: '/home',
name: 'Home',
component: Home,
- redirect: '/index',
children: [
{
- path: '/index',
+ path: '/home',
name: 'AppIndex',
component: AppIndex,
meta: {
- // 在需要拦截的路由中加一条元数据，设置一个 requireAuth 字段
requireAuth: true
}
},
{
- path: '/combatants',
- name: 'Combatants',
- component: CombatantsIndex,
+ path: '/personal',
+ name: 'PersonalCenter',
+ component: () => import('../components/page/personal/Index'),
meta: {
requireAuth: true
- }
+ },
+ redirect: '/personal/information',
+ children: [
+ {
+ path: 'information',
+ name: 'Information',
+ component: () => import('../components/page/personal/Information'),
+ },
+ {
+ path: 'statistics',
+ component: () => import('../components/page/personal/Statistics')
+ },
+ {
+ path: 'analysis',
+ component: () => import('../components/page/personal/Analysis')
+ },
+ {
+ path: 'rules',
+ component: () => import('../components/page/personal/Rules')
+ }
+ ]
+ },
+ {
+ path: '/overview',
+ name: 'OverviewData',
+ component: () => import('../components/page/overview/Index'),
+ meta: {
+ requireAuth: true
+ },
+ redirect: '/overview/unit',
+ children: [
+ {
+ path: 'unit',
+ component: () => import('../components/page/overview/Unit')
+ },
+ {
+ path: 'profession',
+ component: () => import('../components/page/overview/Profession')
+ },
+ {
+ path: 'horizontal',
+ component: () => import('../components/page/overview/Horizontal')
+ },
+ {
+ path: 'vertical',
+ component: () => import('../components/page/overview/Vertical')
+ }
+ ]
+ },
+ {
+ path: '/result',
+ name: 'Result',
+ component: () => import('../components/page/result/Index'),
+ meta: {
+ requireAuth: true
+ },
+ redirect: '/result/rank',
+ children: [
+ {
+ path: 'rank',
+ component: () => import('../components/page/result/Rank')
+ },
+ {
+ path: 'advice',
+ component: () => import('../components/page/result/Advice')
+ }
+ ]
+ },
+ {
+ path: '/permission',
+ name: 'Permission',
+ component: () => import('../components/page/permission/Index'),
+ redirect: '/permission/intake',
+ children: [
+ {
+ path: 'intake',
+ component: () => import('../components/page/permission/IntakeData')
+ }
+ ]
}
]
},
diff --git a/System/src/utils/xlsx.vue b/System/src/utils/xlsx.vue
new file mode 100644
index 0000000..b3ee82a
--- /dev/null
+++ b/System/src/utils/xlsx.vue
@@ -0,0 +1,39 @@
+
+
+
diff --git a/demo/pom.xml b/demo/pom.xml
index 9a9a930..12c2546 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -13,9 +13,15 @@
UTF-8
UTF-8
2.3.7.RELEASE
+
2.0.10
+
+ com.alibaba
+ fastjson
+ ${fastjson_version}
+
net.sf.json-lib
json-lib
diff --git a/demo/src/main/java/com/example/demo/JDBC/ConnectDB.java b/demo/src/main/java/com/example/demo/JDBC/ConnectDB.java
index 4c3e990..7d9a064 100644
--- a/demo/src/main/java/com/example/demo/JDBC/ConnectDB.java
+++ b/demo/src/main/java/com/example/demo/JDBC/ConnectDB.java
@@ -34,9 +34,9 @@ public class ConnectDB {
try
{
//根据实际情况变化
- String dbUrl = "jdbc:mysql://localhost:3306/aircraft";
- String dbUser = "JackyMa";
- String dbPass = "`1";
+ String dbUrl = "jdbc:mysql://localhost:3306/iams?serverTimezone=GMT";
+ String dbUser = "root";
+ String dbPass = "root";
conn = DriverManager.getConnection(dbUrl, dbUser, dbPass);//注意是三个参数
}
catch (SQLException e)
@@ -50,11 +50,11 @@ public class ConnectDB {
public String loginSystem(String loginname)
{
- String sql = "select * from aircraft.user where username = ?";
+ String sql = "select * from iams.user where username = ?";
String username = "";
String password = "";
- System.out.println(loginname);
+
try
{
preparedStatement = conn.prepareStatement(sql);
diff --git a/demo/src/main/java/com/example/demo/login/LoginController.java b/demo/src/main/java/com/example/demo/login/LoginController.java
index 54b261c..39e95c1 100644
--- a/demo/src/main/java/com/example/demo/login/LoginController.java
+++ b/demo/src/main/java/com/example/demo/login/LoginController.java
@@ -46,7 +46,7 @@ public class LoginController {
ConnectDB connectDB = new ConnectDB();
String pwd = connectDB.loginSystem(username);
- System.out.println(pwd);
+
if (!pwd.equals(password)) {
String message = "账号密码错误";
System.out.println(message);
diff --git a/demo/src/main/java/com/example/demo/login/LoginInterceptor.java b/demo/src/main/java/com/example/demo/login/LoginInterceptor.java
index e0f7666..feda0ad 100644
--- a/demo/src/main/java/com/example/demo/login/LoginInterceptor.java
+++ b/demo/src/main/java/com/example/demo/login/LoginInterceptor.java
@@ -46,7 +46,7 @@ public class LoginInterceptor implements HandlerInterceptor {
String page = uri;
if(begingWith(page, requireAuthPages)){
String username = (String) session.getAttribute("user");
- System.out.println(username);
+
if(username==null) {
httpServletResponse.sendRedirect("login");
return false;
diff --git a/demo/src/main/java/com/example/demo/login/User.java b/demo/src/main/java/com/example/demo/login/User.java
index 10f76a0..e375c4b 100644
--- a/demo/src/main/java/com/example/demo/login/User.java
+++ b/demo/src/main/java/com/example/demo/login/User.java
@@ -12,19 +12,11 @@ public class User {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- int id;
String username;
String password;
+ int usertype;
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
public String getUsername() {
return username;
}
diff --git a/demo/src/main/java/com/example/demo/page/UserData.java b/demo/src/main/java/com/example/demo/page/UserData.java
new file mode 100644
index 0000000..812d77a
--- /dev/null
+++ b/demo/src/main/java/com/example/demo/page/UserData.java
@@ -0,0 +1,26 @@
+package com.example.demo.page;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@CrossOrigin
+@ResponseBody
+public class UserData {
+ @Autowired
+ JdbcTemplate jdbcTemplate = new JdbcTemplate();
+ @PostMapping(value = "/personal/statistics")
+ public List> getData(@RequestBody Map data){
+ System.out.println(data);
+ String name = (String) data.get("username");
+ System.out.println(name);
+ String sql = "select * from userscoreinfo where username = ?";
+ return jdbcTemplate.queryForList(sql, name);
+ }
+
+}
diff --git a/demo/src/main/java/com/example/demo/page/data/DataNode.java b/demo/src/main/java/com/example/demo/page/data/DataNode.java
new file mode 100644
index 0000000..cc7c5da
--- /dev/null
+++ b/demo/src/main/java/com/example/demo/page/data/DataNode.java
@@ -0,0 +1,89 @@
+package com.example.demo.page.data;
+
+public class DataNode {
+ /**
+ * 大类：课程考核成绩（55.25%）
+ */
+ public static final int CourseAssessmentGrades = 1;
+ /**
+ * 大类：平时综合表现（29.75%）
+ */
+ public static final int ComprehensivePerformance = 2;
+ /**
+ * 大类：毕业联考成绩（15%）
+ */
+ public static final int GraduationJJTResults = 3;
+
+ /**
+ * 平时综合表现：思想政治（10）
+ */
+ public static final int Politics = 21;
+ /**
+ * 平时综合表现：军人气质（10）
+ */
+ public static final int Temperament = 22;
+ /**
+ * 平时综合表现：领导管理（20）
+ */
+ public static final int Leadership = 23;
+ /**
+ * 平时综合表现：领导管理起评分（5）
+ */
+ public static final int LeadershipStartScore = 230;
+ /**
+ * 平时综合表现：领导管理担任骨干（12）
+ */
+ public static final int LeadershipBackbone = 231;
+ /**
+ * 平时综合表现：领导管理组织活动（3）
+ */
+ public static final int LeadershipOrganization = 232;
+ /**
+ * 平时综合表现：领导管理扣分项（2）
+ */
+ public static final int LeadershipDeductScore = 233;
+
+ /**
+ * 平时综合表现：团队意识（10）
+ */
+ public static final int Teamwork = 24;
+ /**
+ * 平时综合表现：团队意识起评分（3）
+ */
+ public static final int TeamworkStartScore = 240;
+ /**
+ * 平时综合表现：团队意识参加集体活动（7）
+ */
+ public static final int TeamworkJoinGroupActivities = 241;
+
+ /**
+ * 平时综合表现：实践创新（20）
+ */
+ public static final int Innovation = 25;
+ /**
+ * 平时综合表现：实践创新学科竞赛（10）
+ */
+ public static final int InnovationContest = 251;
+ /**
+ * 平时综合表现：实践创新文章发表（10）
+ */
+ public static final int InnovationArticles = 252;
+ /**
+ * 平时综合表现：实践创新科技成果（10）
+ */
+ public static final int InnovationAchievement = 253;
+ /**
+ * 平时综合表现：实践创新文体特长（10）
+ */
+ public static final int InnovationSpecialty = 254;
+
+ /**
+ * 平时综合表现：表彰奖励（20）
+ */
+ public static final int Award = 26;
+
+ /**
+ * 平时综合表现：作风纪律（10）
+ */
+ public static final int Discipline = 27;
+}
diff --git a/demo/src/main/java/com/example/demo/page/data/ImportData.java b/demo/src/main/java/com/example/demo/page/data/ImportData.java
new file mode 100644
index 0000000..ad279b5
--- /dev/null
+++ b/demo/src/main/java/com/example/demo/page/data/ImportData.java
@@ -0,0 +1,37 @@
+package com.example.demo.page.data;
+
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@CrossOrigin
+@ResponseBody
+public class ImportData {
+ @Autowired
+ JdbcTemplate jdbcTemplate = new JdbcTemplate();
+ @PostMapping(value = "/permission")
+ public List> getData(@RequestBody Map postData){
+ JSONArray Datas = JSONArray.parseArray(postData.get("postData").toString());
+ for ( int i = 0; i< Datas.size(); i++){
+ JSONObject data = Datas.getJSONObject(i);
+ System.out.println(data);
+ String sql = "insert into userscoreinfo (username,parentclass,childclass,subpoint,scoringelement," +
+ "awardtime,score) values (?,?,?,?,?,?,?)";
+ jdbcTemplate.update(sql, data.get("username"), data.get("parentclass"), data.get("childclass"),
+ data.get("subpoint"), data.get("scoringelement"), data.get("awardtime"), data.get("score"));
+ }
+
+ return null;
+ }
+
+}
diff --git a/demo/src/main/resources/application.yml b/demo/src/main/resources/application.yml
index e672cf4..f124a1c 100644
--- a/demo/src/main/resources/application.yml
+++ b/demo/src/main/resources/application.yml
@@ -1,10 +1,10 @@
spring:
datasource:
- url: 'jdbc:mysql://localhost:3306/aircraft?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true'
+ url: 'jdbc:mysql://localhost:3306/iams?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&allowMultiQueries=true'
#为了防止中文乱码，在URL中默认添加了?useUnicode=true&characterEncoding=UTF-8来使用UTF8编码，
#&allowMultiQueries=true表示支持批量更新，因为我的电脑时区紊乱，无法启动项目，因此需要加&serverTimezone=GMT%2B8
- username: 'JackyMa'
- password: '`1'
+ username: 'root'
+ password: 'root'
driver-class-name: com.mysql.cj.jdbc.Driver
jpa:
hibernate:
+