diff --git a/src/api/admin/laboratory/expert.js b/src/api/admin/laboratory/expert.js
index b144458..735f0df 100644
--- a/src/api/admin/laboratory/expert.js
+++ b/src/api/admin/laboratory/expert.js
@@ -45,3 +45,28 @@ export const deleteLabPatentByIds = (ids) => {
method: "DELETE",
});
};
+
+/**
+ * 实验室未绑定专家列表
+ * @param params
+ * @return {*}
+ */
+export const selectNotBindLaboratory = (params) => {
+ return request({
+ url: `/app/laboratory/selectNotBindLaboratory`,
+ method: "GET",
+ params,
+ });
+};
+
+/**
+ * 实验室专家绑定
+ * @param expertId
+ * @return {*}
+ */
+export const bindExpert = (expertId) => {
+ return request({
+ url: `/app/laboratory/bindExpert/${expertId}`,
+ method: "GET",
+ });
+};
diff --git a/src/api/common.js b/src/api/common.js
index 5038e92..a291548 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -1,9 +1,9 @@
import request from "@/utils/request";
export const upload = (data) => {
- return request({
- url: "/common/upload",
- method: "post",
- data: data,
- });
-}
\ No newline at end of file
+ return request({
+ url: "/common/upload",
+ method: "post",
+ data: data,
+ });
+};
diff --git a/src/api/login.js b/src/api/login.js
index 13db493..575abca 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,72 +2,72 @@ import request from "@/utils/request";
// 登录方法
export function login(username, password, code, uuid) {
- const data = {
- username,
- password,
- code,
- uuid,
- };
- return request({
- url: "/app/login",
- headers: {
- isToken: false,
- },
- method: "post",
- data: data,
- });
+ const data = {
+ username,
+ password,
+ code,
+ uuid,
+ };
+ return request({
+ url: "/app/login",
+ headers: {
+ isToken: false,
+ },
+ method: "post",
+ data: data,
+ });
}
// 注册方法
export function register(data) {
- return request({
- url: "/app/register",
- headers: {
- isToken: false,
- },
- method: "post",
- data: data,
- });
+ return request({
+ url: "/app/register",
+ headers: {
+ isToken: false,
+ },
+ method: "post",
+ data: data,
+ });
}
// 获取用户详细信息
export function getInfo() {
- return request({
- url: "/app/info",
- method: "get",
- });
+ return request({
+ url: "/app/info",
+ method: "get",
+ });
}
// 退出方法
export function logout() {
- return request({
- url: "/logout",
- method: "post",
- });
+ return request({
+ url: "/logout",
+ method: "post",
+ });
}
// 获取验证码
export function getCodeImg() {
- return request({
- url: "/app/captchaImage",
- headers: {
- isToken: false,
- },
- method: "get",
- timeout: 20000,
- });
+ return request({
+ url: "/app/captchaImage",
+ headers: {
+ isToken: false,
+ },
+ method: "get",
+ timeout: 20000,
+ });
}
// 重置密码
export function resetPassword() {
- return request({
- url: "/captchaImage",
- headers: {
- isToken: false,
- },
- method: "get",
- timeout: 20000,
- });
+ return request({
+ url: "/captchaImage",
+ headers: {
+ isToken: false,
+ },
+ method: "get",
+ timeout: 20000,
+ });
}
/**
@@ -76,9 +76,9 @@ export function resetPassword() {
* @return {*}
*/
export function updateAvatar(data) {
- return request({
- url: "/app/updateAvatar",
- method: "put",
- data: data,
- });
-}
\ No newline at end of file
+ return request({
+ url: "/app/updateAvatar",
+ method: "put",
+ data: data,
+ });
+}
diff --git a/src/components/WebsiteHeader/index.vue b/src/components/WebsiteHeader/index.vue
index 0ceda14..280404c 100644
--- a/src/components/WebsiteHeader/index.vue
+++ b/src/components/WebsiteHeader/index.vue
@@ -118,8 +118,8 @@
@@ -193,7 +193,7 @@ let state = reactive({});
let pagePath = ref("");
const route = useRoute();
const router = useRouter();
-const baseUrl =ref(import.meta.env.VITE_APP_BASE_API);
+const baseUrl = ref(import.meta.env.VITE_APP_BASE_API);
const categoryList = ref([]);
// 当前的语言
const currentLocale = ref("zh");
diff --git a/src/i18n/message/admin/index.js b/src/i18n/message/admin/index.js
index 6782704..87c4cac 100644
--- a/src/i18n/message/admin/index.js
+++ b/src/i18n/message/admin/index.js
@@ -14,25 +14,25 @@ import statistics_zh from "./statistics/zh";
import statistics_ru from "./statistics/ru";
export const admin_zh = {
- identity: {
- entrance: entrance_zh,
- },
- common: common_zh,
- form: form_zh,
- broker: broker_zh,
- table: table_zh,
- validation: validation_zh,
- statistics: statistics_zh,
+ identity: {
+ entrance: entrance_zh,
+ },
+ common: common_zh,
+ form: form_zh,
+ broker: broker_zh,
+ table: table_zh,
+ validation: validation_zh,
+ statistics: statistics_zh,
};
export const admin_ru = {
- identity: {
- entrance: entrance_ru,
- },
- common: common_ru,
- form: form_ru,
- broker: broker_ru,
- table: table_ru,
- validation: validation_ru,
- statistics: statistics_ru,
+ identity: {
+ entrance: entrance_ru,
+ },
+ common: common_ru,
+ form: form_ru,
+ broker: broker_ru,
+ table: table_ru,
+ validation: validation_ru,
+ statistics: statistics_ru,
};
diff --git a/src/i18n/message/admin/statistics/ru.js b/src/i18n/message/admin/statistics/ru.js
index 860d352..3b09e09 100644
--- a/src/i18n/message/admin/statistics/ru.js
+++ b/src/i18n/message/admin/statistics/ru.js
@@ -1,26 +1,26 @@
const statistics = {
- // 企业数量, 正在服务需求数, 订单总数, 需求总数
- enterpriseCount: "Количество предприятий",
- serviceDemandCount: "Количество обслуживаемых потребностей",
- orderCount: "Количество заказов",
- demandCount: "Количество потребностей",
- // 专利数量 成果数量 专家数量 实验室数量
- patentCount: "Количество патентов",
- achievementCount: "Количество достижений",
- expertCount: "Количество экспертов",
- laboratoryCount: "Количество лабораторий",
- // 论文数量
- paperCount: "Количество статей",
- unit: {
- enterprise: "шт",
- serviceDemand: "шт",
- order: "шт",
- demand: "шт",
- patent: "шт",
- achievement: "шт",
- expert: "шт",
- laboratory: "шт",
- paper: "шт",
- }
-}
-export default statistics;
\ No newline at end of file
+ // 企业数量, 正在服务需求数, 订单总数, 需求总数
+ enterpriseCount: "Количество предприятий",
+ serviceDemandCount: "Количество обслуживаемых потребностей",
+ orderCount: "Количество заказов",
+ demandCount: "Количество потребностей",
+ // 专利数量 成果数量 专家数量 实验室数量
+ patentCount: "Количество патентов",
+ achievementCount: "Количество достижений",
+ expertCount: "Количество экспертов",
+ laboratoryCount: "Количество лабораторий",
+ // 论文数量
+ paperCount: "Количество статей",
+ unit: {
+ enterprise: "шт",
+ serviceDemand: "шт",
+ order: "шт",
+ demand: "шт",
+ patent: "шт",
+ achievement: "шт",
+ expert: "шт",
+ laboratory: "шт",
+ paper: "шт",
+ },
+};
+export default statistics;
diff --git a/src/i18n/message/admin/statistics/zh.js b/src/i18n/message/admin/statistics/zh.js
index 0e960fd..f8fd17c 100644
--- a/src/i18n/message/admin/statistics/zh.js
+++ b/src/i18n/message/admin/statistics/zh.js
@@ -1,27 +1,26 @@
const statistics = {
-// 企业数量, 正在服务需求数, 订单总数, 需求总数
- enterpriseCount: "企业数量",
- serviceDemandCount: "正在服务需求数",
- orderCount: "订单总数",
- demandCount: "需求总数",
- // 专利数量 成果数量 专家数量 实验室数量
- patentCount: "专利数量",
- achievementCount: "成果数量",
- expertCount: "专家数量",
- laboratoryCount: "实验室数量",
- // 论文数量
- paperCount: "论文数量",
- unit: {
- enterprise: "家",
- serviceDemand: "个",
- order: "个",
- demand: "个",
- patent: "项",
- achievement: "项",
- expert: "位",
- laboratory: "个",
- paper: "篇",
- }
-
-}
-export default statistics;
\ No newline at end of file
+ // 企业数量, 正在服务需求数, 订单总数, 需求总数
+ enterpriseCount: "企业数量",
+ serviceDemandCount: "正在服务需求数",
+ orderCount: "订单总数",
+ demandCount: "需求总数",
+ // 专利数量 成果数量 专家数量 实验室数量
+ patentCount: "专利数量",
+ achievementCount: "成果数量",
+ expertCount: "专家数量",
+ laboratoryCount: "实验室数量",
+ // 论文数量
+ paperCount: "论文数量",
+ unit: {
+ enterprise: "家",
+ serviceDemand: "个",
+ order: "个",
+ demand: "个",
+ patent: "项",
+ achievement: "项",
+ expert: "位",
+ laboratory: "个",
+ paper: "篇",
+ },
+};
+export default statistics;
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index dc056c6..a4f9a52 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -42,7 +42,11 @@
trigger="click"
>
-
![]()
+
@@ -104,13 +108,13 @@ import useUserStore from "@/store/modules/user";
import useSettingsStore from "@/store/modules/settings";
import { useI18n } from "vue-i18n";
import { ref } from "vue";
-import defaultAvatar from '@/assets/logo/avatar.png'
+import defaultAvatar from "@/assets/logo/avatar.png";
const appStore = useAppStore();
const userStore = useUserStore();
const settingsStore = useSettingsStore();
const { t, locale } = useI18n();
const avatarRef = ref();
-const baseUrl =ref(import.meta.env.VITE_APP_BASE_API);
+const baseUrl = ref(import.meta.env.VITE_APP_BASE_API);
function toggleSideBar() {
appStore.toggleSideBar();
}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c65d894..a6ce81e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -43,9 +43,9 @@ const useUserStore = defineStore("user", {
const enterprise = res.data.enterprise;
const userId = user.userId;
const avatar =
- /* user.avatar == "" || user.avatar == null
+ /* user.avatar == "" || user.avatar == null
? defAva
- : import.meta.env.VITE_APP_BASE_API + */user.avatar;
+ : import.meta.env.VITE_APP_BASE_API + */ user.avatar;
if (res.roles && res.roles.length > 0) {
// 验证返回的roles是否是一个非空数组
diff --git a/src/views/admin/agent/bill/bill-list/index.vue b/src/views/admin/agent/bill/bill-list/index.vue
index 1f8edc1..be14eb7 100644
--- a/src/views/admin/agent/bill/bill-list/index.vue
+++ b/src/views/admin/agent/bill/bill-list/index.vue
@@ -1,16 +1,16 @@
-
diff --git a/src/views/admin/laboratory/index.vue b/src/views/admin/laboratory/index.vue
index 62f633c..6bed88f 100644
--- a/src/views/admin/laboratory/index.vue
+++ b/src/views/admin/laboratory/index.vue
@@ -1,32 +1,28 @@