From f7162594bdf65054ebe07b495ac692c761f261d9 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Mon, 8 Feb 2021 11:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=AF=95=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/wmeimob/bjyy/common/SumScore.java | 16 +-
.../WEB-INF/pages/mental/mental_result.jsp | 10 +-
.../src/main/webapp/static/exam1/test18.html | 15 +-
.../src/main/webapp/static/exam1/test19.html | 12 +-
.../src/main/webapp/static/exam1/test28.html | 7 +-
.../src/main/webapp/static/exam1/test29.html | 2 +-
.../src/main/webapp/static/exam1/test30.html | 5 +-
.../src/main/webapp/static/exam2/test18.html | 12 +-
.../src/main/webapp/static/exam2/test19.html | 12 +-
.../src/main/webapp/static/exam2/test24.html | 73 ++++---
.../src/main/webapp/static/exam2/test29.html | 4 +-
.../src/main/webapp/static/exam2/test30.html | 5 +-
.../src/main/webapp/static/exam3/test18.html | 12 +-
.../src/main/webapp/static/exam3/test19.html | 12 +-
.../src/main/webapp/static/exam3/test24.html | 69 ++++---
.../src/main/webapp/static/exam3/test29.html | 4 +-
.../src/main/webapp/static/exam3/test30.html | 5 +-
.../src/main/webapp/static/exam3/test4.html | 185 +++++++++---------
.../src/main/webapp/static/exam4/test16.html | 2 +-
.../src/main/webapp/static/exam4/test18.html | 12 +-
.../src/main/webapp/static/exam4/test19.html | 12 +-
.../src/main/webapp/static/exam4/test21.html | 10 +-
.../src/main/webapp/static/exam4/test24.html | 1 -
.../src/main/webapp/static/exam4/test28.html | 4 +-
.../src/main/webapp/static/exam4/test29.html | 2 +-
.../src/main/webapp/static/exam4/test30.html | 5 +-
.../main/webapp/static/images/4-16脚印.jpeg | Bin 60141 -> 37626 bytes
.../src/main/webapp/static/images/4-21-0.jpeg | Bin 48135 -> 0 bytes
.../src/main/webapp/static/images/4-21-0.jpg | Bin 0 -> 112351 bytes
.../src/main/webapp/static/images/4-21-3.jpeg | Bin 48135 -> 0 bytes
.../src/main/webapp/static/images/4-21-3.jpg | Bin 0 -> 80631 bytes
31 files changed, 249 insertions(+), 259 deletions(-)
delete mode 100644 bjyy-weixin/src/main/webapp/static/images/4-21-0.jpeg
create mode 100644 bjyy-weixin/src/main/webapp/static/images/4-21-0.jpg
delete mode 100644 bjyy-weixin/src/main/webapp/static/images/4-21-3.jpeg
create mode 100644 bjyy-weixin/src/main/webapp/static/images/4-21-3.jpg
diff --git a/bjyy-core/src/main/java/com/wmeimob/bjyy/common/SumScore.java b/bjyy-core/src/main/java/com/wmeimob/bjyy/common/SumScore.java
index 514f2b1..419bd09 100644
--- a/bjyy-core/src/main/java/com/wmeimob/bjyy/common/SumScore.java
+++ b/bjyy-core/src/main/java/com/wmeimob/bjyy/common/SumScore.java
@@ -3,20 +3,20 @@ package com.wmeimob.bjyy.common;
@SuppressWarnings("unused")
public class SumScore {
- public static final String memoryScore = "55";
+ public static final String memoryScore = "54";
- public static final String expressScore = "61";
+ public static final String expressScore = "53";
- public static final String viewScore = "42";
+ public static final String viewScore = "29";
- public static final String attentionScore = "73";
+ public static final String attentionScore = "66";
- public static final String directionScore = "18";
+ public static final String directionScore = "11";
- public static final String countScore = "48";
+ public static final String countScore = "41";
- public static final String logicScore ="41";
+ public static final String logicScore ="37";
- public static final String sumScore = "338";
+ public static final String sumScore = "291";
}
diff --git a/bjyy-weixin/src/main/webapp/WEB-INF/pages/mental/mental_result.jsp b/bjyy-weixin/src/main/webapp/WEB-INF/pages/mental/mental_result.jsp
index 2c6117c..f19ed44 100644
--- a/bjyy-weixin/src/main/webapp/WEB-INF/pages/mental/mental_result.jsp
+++ b/bjyy-weixin/src/main/webapp/WEB-INF/pages/mental/mental_result.jsp
@@ -41,7 +41,7 @@
-
+
@@ -66,11 +66,17 @@
$(".result em").append("
");
$(".result em").append("
");
$(".result em").append("
");
- }else{
+ }else if(${mentalTest.gradeResult==4}){
$(".result em").append("
");
$(".result em").append("
");
$(".result em").append("
");
$(".result em").append("
");
+ }else{
+ $(".result em").append("
");
+ $(".result em").append("
");
+ $(".result em").append("
");
+ $(".result em").append("
");
+ $(".result em").append("
");
}
});
diff --git a/bjyy-weixin/src/main/webapp/static/exam1/test18.html b/bjyy-weixin/src/main/webapp/static/exam1/test18.html
index ef66ca2..d4f9b96 100644
--- a/bjyy-weixin/src/main/webapp/static/exam1/test18.html
+++ b/bjyy-weixin/src/main/webapp/static/exam1/test18.html
@@ -23,7 +23,6 @@






3 8 4
+384
3 7 1 5
+3715