diff --git a/src/aiService-sub/index/index.vue b/src/aiService-sub/index/index.vue
index 2b6a7c3..381f913 100644
--- a/src/aiService-sub/index/index.vue
+++ b/src/aiService-sub/index/index.vue
@@ -3,14 +3,26 @@
style: {
navigationBarTitleText: '小纬',
},
- needLogin: true,
}
-
+
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
new file mode 100644
index 0000000..3364cbc
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
@@ -0,0 +1,125 @@
+
+{
+ style: {
+ navigationStyle: 'custom',
+ },
+}
+
+
+
+
+
+
+ 职业锚测评报告
+
+
+
+
+
+
+
+ 您的职业价值观
+ {{ studyRecord.tag }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/components/AbilityDimension.vue b/src/pages-evaluation-sub/evaluate/components/AbilityDimension.vue
index 17f70f3..7ee627b 100644
--- a/src/pages-evaluation-sub/evaluate/components/AbilityDimension.vue
+++ b/src/pages-evaluation-sub/evaluate/components/AbilityDimension.vue
@@ -5,7 +5,9 @@
{{ item.title }}
- {{ item.resolving }}
+
+ {{ item.resolving || item.description }}
+
diff --git a/src/pages-evaluation-sub/evaluate/components/CharacterTable.vue b/src/pages-evaluation-sub/evaluate/components/CharacterTable.vue
new file mode 100644
index 0000000..f51d8dd
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/components/CharacterTable.vue
@@ -0,0 +1,37 @@
+
+
+
+ 类型
+ 详解
+
+
+
+ {{ item.tag }}
+ {{ item.title }}
+
+ {{ item.resolving }}
+
+
+
+
+
+
+
diff --git a/src/pages-evaluation-sub/evaluate/components/interestChart/OpinionChart.vue b/src/pages-evaluation-sub/evaluate/components/interestChart/OpinionChart.vue
new file mode 100644
index 0000000..5a5bb39
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/components/interestChart/OpinionChart.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages-sub/home/wishesList/components/SortCollege.vue b/src/pages-sub/home/wishesList/components/SortCollege.vue
index 44605e3..9cda6e9 100644
--- a/src/pages-sub/home/wishesList/components/SortCollege.vue
+++ b/src/pages-sub/home/wishesList/components/SortCollege.vue
@@ -65,7 +65,6 @@
diff --git a/src/pages-sub/home/wishesList/wishesList.vue b/src/pages-sub/home/wishesList/wishesList.vue
index b4164fc..166f3d0 100644
--- a/src/pages-sub/home/wishesList/wishesList.vue
+++ b/src/pages-sub/home/wishesList/wishesList.vue
@@ -8,9 +8,11 @@
-
-
+
+
+
@@ -159,14 +160,8 @@ const addWishList = () => {
}
saveWishList(params).then((res) => {
if (res.code === 200) {
- uni.showToast({
- title: '保存成功',
- icon: 'success',
- })
userStore.clearWishList()
- uni.switchTab({
- url: '/pages/home/index/index',
- })
+ vTbId.value = res.result as number
} else {
uni.showToast({
title: res.message || '保存失败',
@@ -179,9 +174,16 @@ const addWishList = () => {
let typeName = ''
let editType = ''
+let vTbId = ref(0)
+let webUrl = computed(() => {
+ return `http://localhost:3001/sort-college?id=${vTbId.value}&token=${userStore.userInfo.token}&score=${userStore.userInfo.estimatedAchievement.expectedScore}&batchName=${userStore.userInfo.batchName}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&location=${userStore.userInfo.estimatedAchievement.provinceCode}`
+})
+const handleMessage = () => {}
+
onLoad((options) => {
typeName = options.typeName
editType = options.editType
+ addWishList()
})
diff --git a/src/pages-sub/ucenter/evaluate/evaluateList.vue b/src/pages-sub/ucenter/evaluate/evaluateList.vue
index 5d4b783..d5fcd89 100644
--- a/src/pages-sub/ucenter/evaluate/evaluateList.vue
+++ b/src/pages-sub/ucenter/evaluate/evaluateList.vue
@@ -50,11 +50,13 @@ const toDetail = (item: any) => {
let url = ''
if (item.type === 0) {
- url = `/pages-evaluation-sub/evaluate/academicReport/InterestReport?id=${item.reportsId}&type=${item.type}`
+ url = `/pages-evaluation-sub/evaluate/academicReport/interestReport?id=${item.reportsId}&type=${item.type}`
} else if (item.type === 1) {
- url = `/pages-evaluation-sub/evaluate/academicReport/CharacterReport?id=${item.reportsId}&type=${item.type}`
+ url = `/pages-evaluation-sub/evaluate/academicReport/characterReport?id=${item.reportsId}&type=${item.type}`
} else if (item.type === 2) {
- url = `/pages-evaluation-sub/evaluate/academicReport/CapabilityReport?id=${item.reportsId}&type=${item.type}`
+ url = `/pages-evaluation-sub/evaluate/academicReport/capabilityReport?id=${item.reportsId}&type=${item.type}`
+ } else if (item.type === -1) {
+ url = `/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport?id=${item.reportsId}&type=${item.type}`
}
uni.navigateTo({
url,
diff --git a/src/pages.json b/src/pages.json
index e4cd407..7d7c678 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -348,21 +348,28 @@
}
},
{
- "path": "evaluate/academicReport/CapabilityReport",
+ "path": "evaluate/academicReport/capabilityReport",
"type": "page",
"style": {
"navigationStyle": "custom"
}
},
{
- "path": "evaluate/academicReport/CharacterReport",
+ "path": "evaluate/academicReport/characterReport",
"type": "page",
"style": {
"navigationStyle": "custom"
}
},
{
- "path": "evaluate/academicReport/InterestReport",
+ "path": "evaluate/academicReport/interestReport",
+ "type": "page",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "evaluate/academicReport/opinionAboutReport",
"type": "page",
"style": {
"navigationStyle": "custom"
@@ -378,8 +385,7 @@
"type": "page",
"style": {
"navigationBarTitleText": "小纬"
- },
- "needLogin": true
+ }
}
]
}
diff --git a/src/service/index/api.ts b/src/service/index/api.ts
index bede426..42a19c3 100644
--- a/src/service/index/api.ts
+++ b/src/service/index/api.ts
@@ -403,7 +403,7 @@ export const getMySpecialList = (params: { openId: string }) => {
}
export const getMyBusReports = (params: { CustomId: number }) => {
- return http.get('/api/busScale/GetBusCustomReports', params)
+ return http.get('/api/busScale/GetBusCustomReports/v2', params)
}
export const deleteMyAppointment = (params: { id: number }) => {
@@ -429,3 +429,7 @@ export const getMBTIDimension = (params: { ScaleId: number }) => {
export const getAbilityDimension = (params: { ScaleId: number }) => {
return http.get('/api/busscale/GetAbilityDimension', params)
}
+
+export const getOpinionAbout = (params: { ScaleId: number }) => {
+ return http.get('/api/busScale/GetOpinionAbout', params)
+}
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 1c84383..80f0ae4 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -40,9 +40,10 @@ interface NavigateToOptions {
"/login-sub/index" |
"/pages-evaluation-sub/aiAutoFill/index" |
"/pages-evaluation-sub/rank/index" |
- "/pages-evaluation-sub/evaluate/academicReport/CapabilityReport" |
- "/pages-evaluation-sub/evaluate/academicReport/CharacterReport" |
- "/pages-evaluation-sub/evaluate/academicReport/InterestReport" |
+ "/pages-evaluation-sub/evaluate/academicReport/capabilityReport" |
+ "/pages-evaluation-sub/evaluate/academicReport/characterReport" |
+ "/pages-evaluation-sub/evaluate/academicReport/interestReport" |
+ "/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport" |
"/aiService-sub/index/index";
}
interface RedirectToOptions extends NavigateToOptions {}
diff --git a/uno.config.ts b/uno.config.ts
index 1c15aad..9b984b1 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -40,13 +40,6 @@ export default defineConfig({
'vertical-align': 'middle',
},
}),
- // 将颜色函数 (rgb()和hsl()) 从空格分隔转换为逗号分隔,更好的兼容性app端,example:
- // `rgb(255 0 0)` -> `rgb(255, 0, 0)`
- // `rgba(255 0 0 / 0.5)` -> `rgba(255, 0, 0, 0.5)`
- // 与群友的正常写法冲突,先去掉!(2024-05-25)
- // presetLegacyCompat({
- // commaStyleColorFunction: true,
- // }) as Preset,
],
/**
* 自定义快捷语句