diff --git a/.env.development b/.env.development
index 2ed34b8..ea88cf7 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 智慧幼儿体质评估与促进系统
ENV = 'development'
# 智慧幼儿体质评估与促进系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.16.62:8080'
+VUE_APP_BASE_API = 'http://192.168.16.81:8081'
#'/dev-api'
# 路由懒加载
diff --git a/src/api/system/testItemScore.js b/src/api/system/testItemScore.js
index d540986..f4291fb 100644
--- a/src/api/system/testItemScore.js
+++ b/src/api/system/testItemScore.js
@@ -105,4 +105,12 @@ export function getStudentFraction(studentId, itemId, itemScore) {
url: `system/testItemScore/getStudentFraction?studentId=${studentId}&itemId=${itemId}&itemScore=${itemScore}`,
method: 'get'
})
+}
+
+// 获取个人成绩得分
+export function WgetStudentFraction(studentId, itemId, itemScore, hwfFraction) {
+ return request({
+ url: `system/testItemScore/getStudentFraction?studentId=${studentId}&itemId=${itemId}&itemScore=${itemScore}&hwfFraction=${hwfFraction}`,
+ method: 'get'
+ })
}
\ No newline at end of file
diff --git a/src/assets/images/bg1.png b/src/assets/images/bg1.png
index 14bb3cc..de90ea5 100644
Binary files a/src/assets/images/bg1.png and b/src/assets/images/bg1.png differ
diff --git a/src/assets/images/bg2.png b/src/assets/images/bg2.png
deleted file mode 100644
index 84fbdc2..0000000
Binary files a/src/assets/images/bg2.png and /dev/null differ
diff --git a/src/assets/images/bj.png b/src/assets/images/bj.png
new file mode 100644
index 0000000..50a777c
Binary files /dev/null and b/src/assets/images/bj.png differ
diff --git a/src/assets/images/rw1.png b/src/assets/images/rw1.png
deleted file mode 100644
index 453c3b3..0000000
Binary files a/src/assets/images/rw1.png and /dev/null differ
diff --git a/src/assets/images/rw2.png b/src/assets/images/rw2.png
index 0514f00..17e9f50 100644
Binary files a/src/assets/images/rw2.png and b/src/assets/images/rw2.png differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index e263760..9c8e497 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
index c44eff5..8a5508c 100644
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -27,7 +27,7 @@ export default {
name: 'HeaderSearch',
data() {
return {
- search: '',
+ search: '搜索',
options: [],
searchPool: [],
show: false,
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 0c6f4b7..c42b492 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,5 +1,5 @@
-
+
@@ -10,19 +10,26 @@
diff --git a/src/views/index.vue b/src/views/index.vue
index 0b15b69..5ecaa97 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,7 +1,7 @@
-
-
+
+
+
+
diff --git a/src/views/login.vue b/src/views/login.vue
index 5dc46bf..afd78c4 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -81,7 +81,7 @@
diff --git a/src/views/system/comprehensive/index.vue b/src/views/system/comprehensive/index.vue
index 23cdd71..263823d 100644
--- a/src/views/system/comprehensive/index.vue
+++ b/src/views/system/comprehensive/index.vue
@@ -186,12 +186,13 @@
-
+