diff --git a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
index ca7b8ce..053c297 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
@@ -16,7 +16,7 @@
bg-color="transparent"
>
- 性格测评报告
+ 能力测评报告
diff --git a/src/pages-evaluation-sub/evaluate/components/Dashboard.vue b/src/pages-evaluation-sub/evaluate/components/Dashboard.vue
deleted file mode 100644
index 18e0475..0000000
--- a/src/pages-evaluation-sub/evaluate/components/Dashboard.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue b/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue
new file mode 100644
index 0000000..04e1cb6
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+ {{ item.title }}
+ {{ item.description }}
+
+
+
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/components/StatusCard.vue b/src/pages-evaluation-sub/evaluate/components/StatusCard.vue
new file mode 100644
index 0000000..e05e45c
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/components/StatusCard.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+ {{ tagName }}
+
+
+
+
+
+
+
+
+ {{ description }}
+
+
+
+ {{ tip }}
+
+
+
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/components/SuggestionCard.vue b/src/pages-evaluation-sub/evaluate/components/SuggestionCard.vue
new file mode 100644
index 0000000..a253637
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/components/SuggestionCard.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+ 生活建议
+
+
+ 保持规律作息,早睡早起,避免熬夜。 每天适当运动(如散步、跑步),保持精力充沛。
+ 避免过度放松,保持适度的学习节奏。
+
+
+
+
+
+ 饮食建议
+
+
+ 保持规律作息,早睡早起,避免熬夜。 每天适当运动(如散步、跑步),保持精力充沛。
+ 避免过度放松,保持适度的学习节奏。
+
+
+
+
+
+ 学习建议
+
+
+ 保持规律作息,早睡早起,避免熬夜。 每天适当运动(如散步、跑步),保持精力充沛。
+ 避免过度放松,保持适度的学习节奏。
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/components/interestChart/LineReport.vue b/src/pages-evaluation-sub/evaluate/components/interestChart/LineReport.vue
index 98e3db0..71a6862 100644
--- a/src/pages-evaluation-sub/evaluate/components/interestChart/LineReport.vue
+++ b/src/pages-evaluation-sub/evaluate/components/interestChart/LineReport.vue
@@ -66,7 +66,7 @@ const updateChart = () => {
containLabel: true,
},
legend: {
- data: ['我的数据', '平均数据'],
+ data: ['我的数据', '平均水平'],
right: 'auto',
left: 'center',
top: 0,
@@ -80,7 +80,7 @@ const updateChart = () => {
{
type: 'category',
data: (props.echartData[1] as { name: string[] })?.name.map((item) =>
- item.replace('智能', ''),
+ item.replace('智能', '').replace(/(.{2})/g, '$1\n'),
),
axisLine: {
lineStyle: {
@@ -91,14 +91,6 @@ const updateChart = () => {
color: '#666',
fontSize: 12,
interval: 0,
- rotate: 45,
- formatter: function (value) {
- // 处理长文本
- if (value.length > 4) {
- return value.replace('智能', '')
- }
- return value
- },
},
axisTick: {
show: false,
@@ -144,7 +136,7 @@ const updateChart = () => {
data: (props.echartData[1] as { value: number[] })?.value,
},
{
- name: '平均数据',
+ name: '平均水平',
type: 'line',
smooth: true,
symbol: 'circle',
diff --git a/src/pages-evaluation-sub/evaluate/components/psychologicalReportItem/Dashboard.vue b/src/pages-evaluation-sub/evaluate/components/psychologicalReportItem/Dashboard.vue
new file mode 100644
index 0000000..eb11fd2
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/components/psychologicalReportItem/Dashboard.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+ {{ score }}
+ 分
+
+
+
+
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/components/psychologicalReportItem/MhtLineReport.vue b/src/pages-evaluation-sub/evaluate/components/psychologicalReportItem/MhtLineReport.vue
new file mode 100644
index 0000000..40d4b34
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/components/psychologicalReportItem/MhtLineReport.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/components/psychologicalReportItem/ScoreCard.vue b/src/pages-evaluation-sub/evaluate/components/psychologicalReportItem/ScoreCard.vue
new file mode 100644
index 0000000..a4af3c2
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/components/psychologicalReportItem/ScoreCard.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 当前
+
+
+
+
+
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue b/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue
new file mode 100644
index 0000000..0c159ee
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue
@@ -0,0 +1,86 @@
+
+{
+ style: {
+ navigationStyle: 'custom',
+ },
+}
+
+
+
+
+
+
+ MHT心理健康自评
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue b/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue
index 31a79e1..688f052 100644
--- a/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue
+++ b/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue
@@ -7,7 +7,7 @@
-
+
-
+
-
-
+
+
+
+
+
-
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport.vue b/src/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport.vue
new file mode 100644
index 0000000..9a6ecdd
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport.vue
@@ -0,0 +1,152 @@
+
+{
+ style: {
+ navigationStyle: 'custom',
+ },
+}
+
+
+
+
+
+
+ 学习技能报告
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport.vue b/src/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport.vue
new file mode 100644
index 0000000..fceffa7
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport.vue
@@ -0,0 +1,135 @@
+
+{
+ style: {
+ navigationStyle: 'custom',
+ },
+}
+
+
+
+
+
+
+ 考试焦虑测评报告
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages-sub/home/major/components/MajorList.vue b/src/pages-sub/home/major/components/MajorList.vue
index c717cdb..e314b88 100644
--- a/src/pages-sub/home/major/components/MajorList.vue
+++ b/src/pages-sub/home/major/components/MajorList.vue
@@ -5,7 +5,7 @@
v-for="item in menus"
:key="item.key"
:class="[
- 'flex items-center view-block pl-[32rpx] h-[96rpx] text-[28rpx] font-semibold',
+ 'flex items-center view-block pl-[32rpx] min-h-[96rpx] h-[96rpx] text-[28rpx] text-[#666] font-semibold',
currentMenuObj?.key === item.key ? 'active' : '',
]"
@click="changeMenu(item)"
diff --git a/src/pages-sub/home/major/index.vue b/src/pages-sub/home/major/index.vue
index 2535d3c..06cdfd3 100644
--- a/src/pages-sub/home/major/index.vue
+++ b/src/pages-sub/home/major/index.vue
@@ -37,19 +37,19 @@
class="h-full"
:type="1050"
:keyword="searchValue"
- v-if="currentTab === 0"
+ v-show="currentTab === 0"
>
diff --git a/src/pages-sub/ucenter/evaluate/evaluateList.vue b/src/pages-sub/ucenter/evaluate/evaluateList.vue
index aa53d4f..6119c36 100644
--- a/src/pages-sub/ucenter/evaluate/evaluateList.vue
+++ b/src/pages-sub/ucenter/evaluate/evaluateList.vue
@@ -59,6 +59,19 @@ const toDetail = (item: any) => {
url = `/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport?id=${item.reportsId}&type=${item.type}`
} else if (item.type === 6) {
url = `/pages-evaluation-sub/evaluate/psychologicalReport/sasReport?id=${item.reportsId}&type=${item.type}`
+ } else if (item.type === 7) {
+ url = `/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport?id=${item.reportsId}&type=${item.type}`
+ } else if (item.type === 9) {
+ // url = `/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport?id=${item.reportsId}&type=${item.type}`
+ uni.showToast({
+ title: '开发中....',
+ icon: 'none',
+ })
+ return
+ } else if (item.type === 4) {
+ url = `/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport?id=${item.reportsId}&type=${item.type}`
+ } else if (item.type === 5) {
+ url = `/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport?id=${item.reportsId}&type=${item.type}`
} else {
uni.showToast({
title: '开发中....',
diff --git a/src/pages.json b/src/pages.json
index 01e51e4..e64fe79 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -371,12 +371,40 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "evaluate/psychologicalReport/mhtReport",
+ "type": "page",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "evaluate/psychologicalReport/sasReport",
"type": "page",
"style": {
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "evaluate/psychologicalReport/sdsReport",
+ "type": "page",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "evaluate/studyReport/LearnSkillReport",
+ "type": "page",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "evaluate/studyReport/LearnStudyReport",
+ "type": "page",
+ "style": {
+ "navigationStyle": "custom"
+ }
}
]
},
diff --git a/src/service/index/api.ts b/src/service/index/api.ts
index 5c2c722..43d6022 100644
--- a/src/service/index/api.ts
+++ b/src/service/index/api.ts
@@ -449,3 +449,7 @@ export const downloadPDF = (params: { id: number; location: string }) => {
export const getBatchDynamicData = (params: { LocationCode: string; Course: string }) => {
return http.get('/api/busBatchBase/batch', params)
}
+
+export const getCustomScaleExplains = (params: { CustomScaleId: number }) => {
+ return http.get('/api/busScale/GetCustomScaleExplains', params)
+}
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 2457538..4471e4d 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -43,7 +43,11 @@ interface NavigateToOptions {
"/pages-evaluation-sub/evaluate/academicReport/characterReport" |
"/pages-evaluation-sub/evaluate/academicReport/interestReport" |
"/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport" |
+ "/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport" |
"/pages-evaluation-sub/evaluate/psychologicalReport/sasReport" |
+ "/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport" |
+ "/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport" |
+ "/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport" |
"/aiService-sub/index/index";
}
interface RedirectToOptions extends NavigateToOptions {}