bugfix
This commit is contained in:
@ -69,7 +69,7 @@ router.beforeEach((to, from, next) => {
|
|||||||
useUserStore()
|
useUserStore()
|
||||||
.logOut()
|
.logOut()
|
||||||
.then(() => {
|
.then(() => {
|
||||||
ElMessage.error(err);
|
// ElMessage.error(err);
|
||||||
next({path: "/"});
|
next({path: "/"});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import Cookies from "js-cookie";
|
import Cookies from "js-cookie";
|
||||||
|
|
||||||
const TokenKey = "Admin-Token";
|
const TokenKey = "Web-Token";
|
||||||
|
|
||||||
export function getToken() {
|
export function getToken() {
|
||||||
return Cookies.get(TokenKey);
|
return Cookies.get(TokenKey);
|
||||||
|
@ -20,43 +20,43 @@
|
|||||||
// 学历
|
// 学历
|
||||||
export const educationOptions = [
|
export const educationOptions = [
|
||||||
{
|
{
|
||||||
key: 1,
|
key: "1",
|
||||||
text: "小学",
|
text: "小学",
|
||||||
zh: "小学",
|
zh: "小学",
|
||||||
ru: "Начальная школа",
|
ru: "Начальная школа",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 2,
|
key: "2",
|
||||||
text: "初中",
|
text: "初中",
|
||||||
zh: "初中",
|
zh: "初中",
|
||||||
ru: "Средняя школа",
|
ru: "Средняя школа",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 3,
|
key: "3",
|
||||||
text: "高中",
|
text: "高中",
|
||||||
zh: "高中",
|
zh: "高中",
|
||||||
ru: "Старшая школа",
|
ru: "Старшая школа",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 4,
|
key: "4",
|
||||||
text: "大专",
|
text: "大专",
|
||||||
zh: "大专",
|
zh: "大专",
|
||||||
ru: "Колледж",
|
ru: "Колледж",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 5,
|
key: "5",
|
||||||
text: "本科",
|
text: "本科",
|
||||||
zh: "本科",
|
zh: "本科",
|
||||||
ru: "Бакалавр",
|
ru: "Бакалавр",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 6,
|
key: "6",
|
||||||
text: "研究生",
|
text: "研究生",
|
||||||
zh: "研究生",
|
zh: "研究生",
|
||||||
ru: "Аспирант",
|
ru: "Аспирант",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 7,
|
key: "7",
|
||||||
text: "博士",
|
text: "博士",
|
||||||
zh: "博士",
|
zh: "博士",
|
||||||
ru: "Доктор",
|
ru: "Доктор",
|
||||||
|
@ -22,7 +22,7 @@ const statisticsList = ref([
|
|||||||
key: "orderTotal",
|
key: "orderTotal",
|
||||||
label: computed(() => t("admin.statistics.orderCount")),
|
label: computed(() => t("admin.statistics.orderCount")),
|
||||||
value: 0,
|
value: 0,
|
||||||
unit: "元",
|
unit: "万元",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: "demandCount",
|
key: "demandCount",
|
||||||
|
@ -140,7 +140,7 @@
|
|||||||
<section style="text-indent: 2em">
|
<section style="text-indent: 2em">
|
||||||
<div>
|
<div>
|
||||||
<ul class="patent-list">
|
<ul class="patent-list">
|
||||||
<li v-for="patent in state.expertDetail.patentList??[]" :key="patent.id" class="patent-item">
|
<li v-for="patent in patentList??[]" :key="patent.id" class="patent-item">
|
||||||
{{ patent.title }}
|
{{ patent.title }}
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -151,10 +151,10 @@
|
|||||||
<div style="padding: 20px 0">
|
<div style="padding: 20px 0">
|
||||||
<div class="pointTit">{{ t("admin.common.achievement") }}</div>
|
<div class="pointTit">{{ t("admin.common.achievement") }}</div>
|
||||||
</div>
|
</div>
|
||||||
<section>
|
<section style="text-indent: 2em">
|
||||||
<div>
|
<div>
|
||||||
<ul class="patent-list">
|
<ul class="patent-list">
|
||||||
<li v-for="achievement in state.expertDetail.achievementList" :key="achievement.id"
|
<li v-for="achievement in achievementList" :key="achievement.id"
|
||||||
class="patent-item">
|
class="patent-item">
|
||||||
{{ achievement.title }}
|
{{ achievement.title }}
|
||||||
</li>
|
</li>
|
||||||
@ -167,7 +167,7 @@
|
|||||||
<section style="text-indent: 2em">
|
<section style="text-indent: 2em">
|
||||||
<div>
|
<div>
|
||||||
<ul class="patent-list">
|
<ul class="patent-list">
|
||||||
<li v-for="paper in state.expertDetail.paperList" :key="paper.id"
|
<li v-for="paper in papersList" :key="paper.id"
|
||||||
class="patent-item">
|
class="patent-item">
|
||||||
{{ paper.title }}
|
{{ paper.title }}
|
||||||
</li>
|
</li>
|
||||||
@ -479,6 +479,9 @@ const showDocking = ref(false);
|
|||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const loading = ref(true);
|
const loading = ref(true);
|
||||||
|
const patentList = ref([])
|
||||||
|
const achievementList = ref([])
|
||||||
|
const papersList = ref([])
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 4,
|
pageSize: 4,
|
||||||
@ -564,18 +567,18 @@ function getDataList() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
expertPatentList(id).then(resp => {
|
expertPatentList(id).then(resp => {
|
||||||
state.expertDetail.patentList = resp.rows
|
patentList.value = resp.rows
|
||||||
})
|
})
|
||||||
|
|
||||||
expertAchievementList({
|
expertAchievementList({
|
||||||
expertId: id
|
expertId: id
|
||||||
}).then(resp => {
|
}).then(resp => {
|
||||||
state.expertDetail.achievementList = resp.rows
|
achievementList.value = resp.rows
|
||||||
console.log(state.expertDetail.achievementList)
|
// console.log(state.expertDetail.achievementList)
|
||||||
})
|
})
|
||||||
|
|
||||||
paperList({uid: id}).then(resp => {
|
paperList({uid: id}).then(resp => {
|
||||||
state.expertDetail.paperList = resp.rows
|
papersList.value = resp.rows
|
||||||
})
|
})
|
||||||
// companyProduct(id).then(res => {
|
// companyProduct(id).then(res => {
|
||||||
// if (200 == res.code) {
|
// if (200 == res.code) {
|
||||||
|
Reference in New Issue
Block a user