From 2be4e29f37550d7fc482b4463cbc4caee54afc0f Mon Sep 17 00:00:00 2001
From: ailanyin <ailanyin4j@163.com>
Date: Fri, 21 Jul 2023 16:45:30 +0800
Subject: [PATCH] bugfix and performance improvements

---
 src/api/admin/laboratory/expert.js            |  25 ++
 src/api/common.js                             |  12 +-
 src/api/login.js                              | 104 ++++-----
 src/components/WebsiteHeader/index.vue        |   6 +-
 src/i18n/message/admin/index.js               |  36 +--
 src/i18n/message/admin/statistics/ru.js       |  50 ++--
 src/i18n/message/admin/statistics/zh.js       |  51 ++--
 src/layout/components/Navbar.vue              |  10 +-
 src/store/modules/user.js                     |   4 +-
 .../admin/agent/bill/bill-list/index.vue      | 155 ++++++------
 .../admin/agent/bill/commission/index.vue     |   2 +-
 .../agent/bill/commission/withdraw-record.vue |   4 +-
 .../admin/agent/service/enterprise/index.vue  |  20 +-
 .../service/enterprise/technology-demand.vue  |   6 +-
 .../agent/service/matching-demand/index.vue   |  16 +-
 src/views/admin/components/enterpriseItem.vue |  16 +-
 src/views/admin/laboratory/index.vue          |  36 ++-
 .../laboratory/research/expert/index.vue      | 221 +++++++++++++-----
 src/views/components/AgentForm/index.vue      | 116 +++------
 src/views/components/LaboratoryForm/index.vue | 164 +++++++------
 src/views/components/StatisticsPanel.vue      |   6 +-
 src/views/system/user/profile/userAvatar.vue  | 102 ++++----
 22 files changed, 611 insertions(+), 551 deletions(-)

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 @@
             <!-- <template #reference> -->
             <div v-else class="avatar-wrapper">
               <img
-                  :src="`${baseUrl}/file${userStore.avatar}`"
-                  class="user-avatar"
+                :src="`${baseUrl}/file${userStore.avatar}`"
+                class="user-avatar"
               />
               <i class="el-icon-caret-bottom" />
             </div>
@@ -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"
         >
           <div class="avatar-wrapper">
-            <img v-if="userStore.avatar" :src="`${baseUrl}/file${userStore.avatar}`" class="user-avatar" />
+            <img
+              v-if="userStore.avatar"
+              :src="`${baseUrl}/file${userStore.avatar}`"
+              class="user-avatar"
+            />
             <img v-else :src="defaultAvatar" class="user-avatar" />
             <el-icon>
               <caret-bottom />
@@ -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 @@
 <script setup>
-import {computed, reactive, ref, toRefs} from "vue";
+import { computed, reactive, ref, toRefs } from "vue";
 import Pagination from "@/components/Pagination/index.vue";
-import {applyBill, brokerDealLogList} from "@/api/admin/agent/order";
-import {invoiceStatusDict, orderTypeDict} from "@/constant/dict";
+import { applyBill, brokerDealLogList } from "@/api/admin/agent/order";
+import { invoiceStatusDict, orderTypeDict } from "@/constant/dict";
 import dayjs from "dayjs";
-import {ElMessage} from "element-plus";
+import { ElMessage } from "element-plus";
 import DictTag from "@/components/DictTag/index.vue";
 import RightToolbar from "@/components/RightToolbar/index.vue";
 
-import {useI18n} from "vue-i18n";
+import { useI18n } from "vue-i18n";
 
-const {t} = useI18n();
+const { t } = useI18n();
 const showSearch = ref(true);
 const tableData = ref([]); // 表格数据
 const total = ref(0); // 总条数
@@ -30,34 +30,36 @@ const data = reactive({
   },
   rules: {
     // 表单验证规则
-    orderNumber: [{
-      required: true, message: /*"请输入订单号"*/
-          computed(
-              () =>
-                  t("admin.form.placeholder", {
-                    type: t("admin.form.orderNumber"),
-                  })
-          )
-      , trigger: "blur"
-    }],
+    orderNumber: [
+      {
+        required: true,
+        /*"请输入订单号"*/
+        message: computed(() =>
+          t("admin.form.placeholder", {
+            type: t("admin.form.orderNumber"),
+          })
+        ),
+        trigger: "blur",
+      },
+    ],
     companyName: [
       {
-        required: true, message: /*"请输入公司名称"*/
-            computed(
-                () =>
-                    t("admin.form.placeholder", {
-                      type: t("admin.form.name", {
-                        type: t("admin.common.company"),
-                      }),
-                    })
-            )
-        , trigger: "blur"
+        required: true,
+        /*"请输入公司名称"*/
+        message: computed(() =>
+          t("admin.form.placeholder", {
+            type: t("admin.form.name", {
+              type: t("admin.common.company"),
+            }),
+          })
+        ),
+        trigger: "blur",
       },
     ],
     // 税号
-    taxNumber: [{required: true, message: "请输入公司税号", trigger: "blur"}],
+    taxNumber: [{ required: true, message: "请输入公司税号", trigger: "blur" }],
     email: [
-      {required: true, message: "请输入电子邮箱", trigger: "blur"},
+      { required: true, message: "请输入电子邮箱", trigger: "blur" },
       // email 正则验证
       {
         pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/,
@@ -65,10 +67,10 @@ const data = reactive({
         trigger: "blur",
       },
     ],
-    phone: [{required: true, message: "请输入电话", trigger: "blur"}],
+    phone: [{ required: true, message: "请输入电话", trigger: "blur" }],
   },
 });
-const {form, queryParams, rules} = toRefs(data); // 解构响应式对象
+const { form, queryParams, rules } = toRefs(data); // 解构响应式对象
 
 /**
  * 获取列表数据
@@ -159,25 +161,25 @@ getList();
   <div class="app-container">
     <!--   搜索 订单号 查询  -->
     <el-form
-        v-show="showSearch"
-        ref="queryRef"
-        :model="queryParams"
-        class="query-form"
-        inline
-        @keydown="handleQuery"
-        @submit.prevent
+      v-show="showSearch"
+      ref="queryRef"
+      :model="queryParams"
+      class="query-form"
+      inline
+      @keydown="handleQuery"
+      @submit.prevent
     >
       <el-form-item :label="t('admin.form.orderNumber')" prop="orderNumber">
         <el-input
-            v-model="queryParams.orderNumber"
-            :placeholder="
+          v-model="queryParams.orderNumber"
+          :placeholder="
             t('admin.form.placeholder', { type: t('admin.form.orderNumber') })
           "
         />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery"
-        >{{ t("admin.common.search") }}
+          >{{ t("admin.common.search") }}
         </el-button>
         <el-button @click="resetQuery">
           {{ t("admin.common.reset") }}
@@ -185,19 +187,19 @@ getList();
       </el-form-item>
     </el-form>
     <el-row class="mb8">
-      <right-toolbar v-model:show-search="showSearch" @query-table="getList"/>
+      <right-toolbar v-model:show-search="showSearch" @query-table="getList" />
     </el-row>
     <!--    表格数据-->
     <el-table v-loading="loading" :data="tableData">
       <el-table-column
-          :label="t('admin.form.orderNumber')"
-          align="center"
-          prop="orderNumber"
+        :label="t('admin.form.orderNumber')"
+        align="center"
+        prop="orderNumber"
       ></el-table-column>
       <el-table-column
-          :label="t('admin.form.orderType')"
-          align="center"
-          prop="orderType"
+        :label="t('admin.form.orderType')"
+        align="center"
+        prop="orderType"
       >
         <template #default="{ row }">
           {{
@@ -207,14 +209,14 @@ getList();
         </template>
       </el-table-column>
       <el-table-column
-          :label="t('admin.form.amount')"
-          align="center"
-          prop="amount"
+        :label="t('admin.form.amount')"
+        align="center"
+        prop="amount"
       ></el-table-column>
       <el-table-column
-          :label="t('admin.form.quantity')"
-          align="center"
-          prop="total"
+        :label="t('admin.form.quantity')"
+        align="center"
+        prop="total"
       ></el-table-column>
       <el-table-column :label="t('admin.form.rechargeTime')" align="center">
         <template #default="{ row }">
@@ -224,46 +226,45 @@ getList();
       <!--      状态-->
       <el-table-column :label="t('common.status')" align="center" prop="status">
         <template #default="{ row }">
-          <dict-tag :options="invoiceStatusDict" :value="row.status"/>
+          <dict-tag :options="invoiceStatusDict" :value="row.status" />
         </template>
       </el-table-column>
       <el-table-column :label="t('admin.common.operation')">
         <template #default="{ row }">
           <el-button
-              :disabled="row.status !== '0'"
-
-              type="text"
-              @click="handleApplyInvoice(row)"
-          >发票申请
+            :disabled="row.status !== '0'"
+            type="text"
+            @click="handleApplyInvoice(row)"
+            >发票申请
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <pagination
-        v-show="total > 0"
-        v-model:limit="queryParams.pageSize"
-        v-model:page="queryParams.pageNum"
-        :total="total"
-        @pagination="getList"
+      v-show="total > 0"
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      :total="total"
+      @pagination="getList"
     />
 
     <!--    申请开票dialog-->
     <el-dialog
-        v-model="dialogVisible"
-        :title="dialogTitle"
-        append-to-body
-        width="500px"
+      v-model="dialogVisible"
+      :title="dialogTitle"
+      append-to-body
+      width="500px"
     >
       <el-form
-          ref="formRef"
-          :model="form"
-          :rules="rules"
-          label-position="left"
-          label-width="100px"
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        label-position="left"
+        label-width="100px"
       >
         <el-form-item
-            :label="t('admin.form.name', { type: t('admin.common.company') })"
-            prop="companyName"
+          :label="t('admin.form.name', { type: t('admin.common.company') })"
+          prop="companyName"
         >
           <el-input v-model="form.companyName"></el-input>
         </el-form-item>
@@ -283,10 +284,10 @@ getList();
       <template #footer>
         <div class="dialog-footer">
           <el-button type="default" @click="handleCancel"
-          >{{ t("admin.common.cancel") }}
+            >{{ t("admin.common.cancel") }}
           </el-button>
           <el-button type="primary" @click="submit"
-          >{{ t("admin.common.submit") }}
+            >{{ t("admin.common.submit") }}
           </el-button>
         </div>
       </template>
diff --git a/src/views/admin/agent/bill/commission/index.vue b/src/views/admin/agent/bill/commission/index.vue
index 6a3e33b..e035408 100644
--- a/src/views/admin/agent/bill/commission/index.vue
+++ b/src/views/admin/agent/bill/commission/index.vue
@@ -133,7 +133,7 @@ const getById = (id) => {};
       ></el-table-column>
       <el-table-column :label="t('admin.common.operation')" width="180">
         <template #default="{ row }">
-          <el-button  type="primary" @click="goBack(row.id)"
+          <el-button type="primary" @click="goBack(row.id)"
             >查看详情
           </el-button>
         </template>
diff --git a/src/views/admin/agent/bill/commission/withdraw-record.vue b/src/views/admin/agent/bill/commission/withdraw-record.vue
index bf849f2..f377b88 100644
--- a/src/views/admin/agent/bill/commission/withdraw-record.vue
+++ b/src/views/admin/agent/bill/commission/withdraw-record.vue
@@ -50,7 +50,7 @@ const handleQuery = () => {
   </el-form>
 
   <!-- el-radio-group 状态切换, 已审批和待审批 -->
-  <el-radio-group v-model="queryParams.status"  style="width: 100%">
+  <el-radio-group v-model="queryParams.status" style="width: 100%">
     <el-radio label="已审批" value="1" />
     <el-radio label="待审批" value="2" />
   </el-radio-group>
@@ -78,7 +78,7 @@ const handleQuery = () => {
     >
       <template #default="{ row }">
         <!--删除-->
-        <el-button  type="text" @click="deleteRecord(row)">
+        <el-button type="text" @click="deleteRecord(row)">
           {{ t("admin.common.delete") }}
         </el-button>
       </template>
diff --git a/src/views/admin/agent/service/enterprise/index.vue b/src/views/admin/agent/service/enterprise/index.vue
index f1fd3d1..f6af745 100644
--- a/src/views/admin/agent/service/enterprise/index.vue
+++ b/src/views/admin/agent/service/enterprise/index.vue
@@ -148,21 +148,15 @@ getList();
           :placeholder="
             t('admin.form.placeholder', { type: t('admin.common.company') })
           "
-
           @keyup.enter.prevent="handleQuery"
         />
       </el-form-item>
 
       <el-form-item>
-        <el-button
-          icon="Search"
-
-          type="primary"
-          @click="handleQuery"
-        >
+        <el-button icon="Search" type="primary" @click="handleQuery">
           {{ t("admin.common.search") }}
         </el-button>
-        <el-button icon="Refresh"  @click="resetQuery">
+        <el-button icon="Refresh" @click="resetQuery">
           {{ t("admin.common.reset") }}
         </el-button>
       </el-form-item>
@@ -210,7 +204,6 @@ getList();
         <template #default="{ row }">
           <el-button
             link
-
             type="text"
             @click="handleTechDemand(row.enterpriseId)"
             >{{
@@ -219,19 +212,14 @@ getList();
               })
             }}
           </el-button>
-          <el-button link  type="text">
+          <el-button link type="text">
             {{
               t("admin.table.managementOf", {
                 type: t("admin.common.achievement"),
               })
             }}
           </el-button>
-          <el-button
-            link
-
-            type="text"
-            @click="handleDelete(row.id)"
-          >
+          <el-button link type="text" @click="handleDelete(row.id)">
             {{ t("admin.common.delete") }}
           </el-button>
         </template>
diff --git a/src/views/admin/agent/service/enterprise/technology-demand.vue b/src/views/admin/agent/service/enterprise/technology-demand.vue
index d1b7981..9b02ba7 100644
--- a/src/views/admin/agent/service/enterprise/technology-demand.vue
+++ b/src/views/admin/agent/service/enterprise/technology-demand.vue
@@ -127,13 +127,13 @@ if (route.query.id) {
       </el-table-column>
       <el-table-column align="center" label="">
         <template #default="{ row }">
-          <el-button  type="text">
+          <el-button type="text">
             {{ t("admin.common.delete") }}
           </el-button>
-          <el-button  type="text" @click="handleResults(row)"
+          <el-button type="text" @click="handleResults(row)"
             >查看匹配结果
           </el-button>
-          <el-button  type="text" @click="handleUpdateStatus(row)"
+          <el-button type="text" @click="handleUpdateStatus(row)"
             >更新状态
           </el-button>
         </template>
diff --git a/src/views/admin/agent/service/matching-demand/index.vue b/src/views/admin/agent/service/matching-demand/index.vue
index af46ba5..f7e1d18 100644
--- a/src/views/admin/agent/service/matching-demand/index.vue
+++ b/src/views/admin/agent/service/matching-demand/index.vue
@@ -113,21 +113,15 @@ getList();
           :placeholder="
             t('admin.form.placeholder', { type: t('admin.common.company') })
           "
-
           @keyup.enter="handleQuery"
         />
       </el-form-item>
 
       <el-form-item>
-        <el-button
-          icon="Search"
-
-          type="primary"
-          @click="handleQuery"
-        >
+        <el-button icon="Search" type="primary" @click="handleQuery">
           {{ t("admin.common.search") }}
         </el-button>
-        <el-button icon="Refresh"  @click="resetQuery">
+        <el-button icon="Refresh" @click="resetQuery">
           {{ t("admin.common.reset") }}
         </el-button>
       </el-form-item>
@@ -170,10 +164,8 @@ getList();
       </el-table-column>
       <el-table-column align="center" :label="t('admin.common.operation')">
         <template #default="{ row }">
-          <el-button link  type="primary" @click=""
-            >查看详情
-          </el-button>
-          <el-button link  type="primary">承接需求</el-button>
+          <el-button link type="primary" @click="">查看详情 </el-button>
+          <el-button link type="primary">承接需求</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/admin/components/enterpriseItem.vue b/src/views/admin/components/enterpriseItem.vue
index a19bc64..3bf8a76 100644
--- a/src/views/admin/components/enterpriseItem.vue
+++ b/src/views/admin/components/enterpriseItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-row type="flex" style="padding: 40px 20px">
+  <el-row style="padding: 40px 20px" type="flex">
     <div class="img">
       <el-image :src="data.image" alt />
     </div>
@@ -21,8 +21,9 @@
         >
       </div>
     </div>
-    <div class="keywords" style="flex: 1">
+    <div class="keywords" style="/*flex: 1; */ width: 360px">
       <wordcloud
+        :width="360"
         :data="createdData(data.keyword?.split(',') ?? [])"
       ></wordcloud>
     </div>
@@ -32,7 +33,7 @@
 <script setup>
 import wordcloud from "./wordcloud.vue";
 import { useRoute, useRouter } from "vue-router";
-import { addViewHistory } from "@/utils/view_history";
+
 const route = useRoute();
 const router = useRouter();
 const props = defineProps({
@@ -41,6 +42,7 @@ const props = defineProps({
     required: true,
   },
 });
+
 function createdData(arr) {
   let l = [];
   let snap = JSON.parse(JSON.stringify(arr));
@@ -50,6 +52,7 @@ function createdData(arr) {
   });
   return l;
 }
+
 function handleDetail(id) {
   let routeData = router.resolve({
     path: `/searchList/enterprise/detail/${id}`,
@@ -62,17 +65,22 @@ function handleDetail(id) {
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .img {
   width: 90px;
   margin-right: 12px;
   display: flex;
   align-items: center;
   justify-content: center;
+
   :deep(.el-image) {
     width: 90px;
     height: 90px;
     border-radius: 50%;
   }
 }
+
+.content {
+  flex: 1;
+}
 </style>
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 @@
 <script setup>
 import StatisticsPanel from "@/views/components/StatisticsPanel.vue";
-import {computed, ref} from "vue";
-import {getLaboratoryStatistic} from "@/api/admin/laboratory/home";
-import {useI18n} from "vue-i18n";
+import { computed, ref } from "vue";
+import { getLaboratoryStatistic } from "@/api/admin/laboratory/home";
+import { useI18n } from "vue-i18n";
 
-const {t} = useI18n();
+const { t } = useI18n();
 const statisticsList = ref([
   {
-    label: computed(() => t('admin.statistics.patentCount')),
+    label: computed(() => t("admin.statistics.patentCount")),
     value: 0,
     unit: "项",
   },
   {
-    label: computed(
-        () => t("admin.statistics.achievementCount")
-    ),
+    label: computed(() => t("admin.statistics.achievementCount")),
     value: 0,
     unit: "个",
   },
   {
-    label: computed(() => t('admin.statistics.demandCount')),
+    label: computed(() => t("admin.statistics.demandCount")),
     value: 0,
     unit: "个",
   },
   {
-    label: computed(
-        () => t('admin.statistics.paperCount')
-    ),
+    label: computed(() => t("admin.statistics.paperCount")),
     value: 0,
     unit: "篇",
   },
@@ -34,29 +30,25 @@ const statisticsList = ref([
 
 const loadLabStatisticsData = () => {
   getLaboratoryStatistic().then((resp) => {
-    const {data} = resp;
+    const { data } = resp;
     statisticsList.value = [
       {
-        label: computed(() => t('admin.statistics.patentCount')),
+        label: computed(() => t("admin.statistics.patentCount")),
         value: data?.patentCount ?? 0,
         unit: "项",
       },
       {
-        label: computed(
-            () => t("admin.statistics.achievementCount")
-        ),
+        label: computed(() => t("admin.statistics.achievementCount")),
         value: data?.achievementCount ?? 0,
         unit: "个",
       },
       {
-        label: computed(() => t('admin.statistics.demandCount')),
+        label: computed(() => t("admin.statistics.demandCount")),
         value: data?.demandCount ?? 0,
         unit: "个",
       },
       {
-        label: computed(
-            () => t('admin.statistics.paperCount')
-        ),
+        label: computed(() => t("admin.statistics.paperCount")),
         value: data?.paperCount ?? 0,
         unit: "篇",
       },
@@ -69,7 +61,7 @@ loadLabStatisticsData();
 
 <template>
   <div class="app-container">
-    <statistics-panel :list="statisticsList"/>
+    <statistics-panel :list="statisticsList" />
   </div>
 </template>
 
diff --git a/src/views/admin/laboratory/research/expert/index.vue b/src/views/admin/laboratory/research/expert/index.vue
index ccd18ad..fb93d4c 100644
--- a/src/views/admin/laboratory/research/expert/index.vue
+++ b/src/views/admin/laboratory/research/expert/index.vue
@@ -7,16 +7,11 @@
       :model="queryParams"
       @submit.prevent
     >
-      <el-form-item
-        :label="t('admin.form.name', { type: t('admin.common.achievement') })"
-        prop="title"
-      >
+      <el-form-item label="成果名称" prop="title">
         <el-input
           v-model="queryParams.title"
           clearable
-          :placeholder="
-            t('admin.form.placeholder', { type: t('admin.common.patent') })
-          "
+          placeholder="请输入专利名称"
           size="small"
           style="width: 240px"
           @keyup.enter="handleQuery"
@@ -28,19 +23,22 @@
           size="small"
           type="primary"
           @click="handleQuery"
-        >
-          {{ t("admin.common.search") }}
+          >搜索
         </el-button>
-        <el-button icon="Refresh" size="small" @click="resetQuery">
-          {{ t("admin.common.reset") }}
+        <el-button icon="Refresh" size="small" @click="resetQuery"
+          >重置
         </el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button icon="plus" size="small" type="primary">
-          {{ t("admin.table.relatedExperts") }}
-        </el-button>
+        <el-button
+          icon="plus"
+          size="small"
+          type="primary"
+          @click="handleAddBind"
+          >关联专家</el-button
+        >
       </el-col>
       <right-toolbar
         v-model:showSearch="showSearch"
@@ -48,25 +46,89 @@
       ></right-toolbar>
     </el-row>
 
+    <!--  关联未被关联的专家  -->
+    <el-dialog v-model="showExpertDialog" title="关联专家">
+      <el-form
+        ref="notBindExpertQueryRef"
+        :inline="true"
+        :model="notBindExpertQueryParams"
+        @submit.prevent
+      >
+        <el-form-item label="专家名称" prop="name">
+          <el-input
+            v-model="notBindExpertQueryParams.name"
+            clearable
+            placeholder="请输入专家名称"
+            size="small"
+            style="width: 240px"
+            @keyup.enter="getNotBindExpertList"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            icon="Search"
+            size="small"
+            type="primary"
+            @click="getNotBindExpertList"
+            >搜索
+          </el-button>
+          <el-button
+            icon="Refresh"
+            size="small"
+            @click="resetNotBindExpertQuery"
+            >重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="notBindExpertList">
+        <el-table-column label="数据编号" prop="id" />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          label="专家名称"
+          prop="name"
+        />
+        <el-table-column label="联系电话" prop="mobile" />
+        <el-table-column label="研究领域" prop="industryStr" />
+        <!--      <el-table-column label="申请（专利权）人" prop="applyName"/>-->
+        <el-table-column align="center" label="入驻时间" prop="workTime">
+          <template #default="{ row }">
+            <span>{{ dayjs(row.workTime).format("YYYY-MM-DD") }}</span>
+          </template>
+        </el-table-column>
+        <!--        操作-->
+        <el-table-column align="center" label="操作">
+          <template #default="{ row }">
+            <el-button
+              icon="plus"
+              size="small"
+              type="text"
+              @click="submitBind(row.id)"
+              >关联
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="notBindExpertTotal > 0"
+        v-model:limit="notBindExpertQueryParams.pageSize"
+        v-model:page="notBindExpertQueryParams.pageNum"
+        :total="notBindExpertTotal"
+        @pagination="getNotBindExpertList"
+      />
+    </el-dialog>
+
     <!-- 表格数据 -->
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column :label="t('admin.common.dataNumber')" prop="id" />
+      <el-table-column label="数据编号" prop="id" />
       <el-table-column
         :show-overflow-tooltip="true"
-        :label="t('admin.form.name', { type: t('admin.common.expert') })"
-        prop="title"
+        label="专家名称"
+        prop="name"
       />
-      <el-table-column :label="t('webContact.phone')" prop="mobile" />
-      <el-table-column
-        :label="t('admin.table.researchIndustry')"
-        prop="industryStr"
-      />
-      <!--      <el-zh-column :label="t('webSearch.applicant')" prop="applyName"/>-->
-      <el-table-column
-        align="center"
-        :label="t('admin.table.enterTime')"
-        prop="workTime"
-      >
+      <el-table-column label="联系电话" prop="mobile" />
+      <el-table-column label="研究领域" prop="industryStr" />
+      <!--      <el-table-column label="申请（专利权）人" prop="applyName"/>-->
+      <el-table-column align="center" label="入驻时间" prop="workTime">
         <template #default="{ row }">
           <span>{{ dayjs(row.workTime).format("YYYY-MM-DD") }}</span>
         </template>
@@ -74,7 +136,7 @@
       <el-table-column
         align="center"
         class-name="small-padding fixed-width"
-        :label="t('admin.common.operation')"
+        label="操作"
       >
         <template #default="{ row }">
           <!--          <el-button-->
@@ -90,10 +152,16 @@
             size="small"
             type="text"
             @click="handleDeleteBind(row.id)"
-            >{{ t("admin.table.cancelRelation") }}
+            >取消关联
           </el-button>
         </template>
       </el-table-column>
+      <template #footer>
+        <div class="dialog-footer">
+          <!--          <el-button type="primary" @click="submitForm">确 定</el-button>-->
+          <el-button>取 消</el-button>
+        </div>
+      </template>
     </el-table>
 
     <pagination
@@ -106,7 +174,7 @@
     <!-- 添加或修改数据配置对话框 -->
     <el-dialog v-model="open" :title="title" append-to-body width="800px">
       <el-form ref="expertRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item :label="t('admin.form.expertName')" prop="title">
+        <el-form-item label="专家姓名" prop="title">
           <el-input v-model="form.title" placeholder="请输入专家姓名" />
         </el-form-item>
         <el-form-item label="性别" prop="gender">
@@ -122,16 +190,14 @@
             :labelWidth="100"
             fieldKey="researchs"
             placeholder="研究方向"
-            :title="t('admin.form.researchDirection')"
+            title="研究方向"
           />
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm"
-            >{{ t("admin.common.confirm") }}
-          </el-button>
-          <el-button @click="cancel">{{ t("admin.common.cancel") }}</el-button>
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -139,17 +205,19 @@
 </template>
 
 <script setup>
-import { labPatentList } from "@/api/admin/laboratory/patent";
 import dayjs from "dayjs";
 import { ElMessage, ElMessageBox } from "element-plus";
-import modal from "@/plugins/modal";
 import { useRouter } from "vue-router";
-import { computed, reactive, ref, toRefs } from "vue";
+import { reactive, ref, toRefs } from "vue";
 import InputBoxAdd from "@/views/components/InputBoxAdd/index.vue";
-import { deleteBindExpert, expertList } from "@/api/admin/laboratory/expert";
-import { useI18n } from "vue-i18n";
+import {
+  bindExpert,
+  deleteBindExpert,
+  expertList,
+  selectNotBindLaboratory,
+} from "@/api/admin/laboratory/expert";
+import Pagination from "@/components/Pagination/index.vue";
 
-const { t } = useI18n();
 const router = useRouter();
 
 const dataList = ref([]);
@@ -160,6 +228,7 @@ const total = ref(0);
 const title = ref("");
 const expertRef = ref();
 const researchDirectionFormRef = ref();
+
 const data = reactive({
   queryParams: {
     pageNum: 1,
@@ -202,14 +271,7 @@ function resetQuery() {
 
 /** 删除按钮操作 */
 function handleDeleteBind(id) {
-  modal
-    .confirm(
-      t("admin.common.confirmAction", {
-        number: id,
-        action: t("admin.table.cancelRelation"),
-        type: t("admin.common.expert"),
-      })
-    )
+  ElMessageBox.confirm(`是否确认取消关联数据编号为"${id}"的专家?`)
     .then(function () {
       return deleteBindExpert(id);
     })
@@ -242,11 +304,60 @@ function cancel() {
   reset();
 }
 
-const handleAdd = () => {
-  reset();
-  title.value = "添加专家";
-  open.value = true;
+// 是否显示关联专家dialog
+const showExpertDialog = ref(false);
+// 未绑定专家列表
+const notBindExpertList = ref([]);
+// 未绑定专家总数
+const notBindExpertTotal = ref(0);
+const notBindExpertQueryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  name: undefined,
+});
+
+const notBindExpertQueryRef = ref();
+const getNotBindExpertList = () => {
+  selectNotBindLaboratory(notBindExpertQueryParams).then((resp) => {
+    notBindExpertList.value = resp.rows;
+    notBindExpertTotal.value = resp.total;
+  });
 };
+
+const handleAddBind = () => {
+  getNotBindExpertList();
+  showExpertDialog.value = true;
+};
+
+/**
+ * 重置未绑定专家查询条件
+ */
+const resetNotBindExpertQuery = () => {
+  notBindExpertQueryParams.pageNum = 1;
+  notBindExpertQueryParams.pageSize = 10;
+  notBindExpertQueryParams.name = undefined;
+  notBindExpertQueryRef.value.resetFields();
+  getNotBindExpertList();
+};
+
+/**
+ * 关联专家
+ * @param id
+ */
+const submitBind = (id) => {
+  ElMessageBox.confirm("是否确认关联该专家?")
+    .then(function () {
+      return bindExpert(id);
+    })
+    .then(() => {
+      getNotBindExpertList();
+      ElMessage.success("关联成功");
+    })
+    .catch((err) => {
+      console.log(err);
+    });
+};
+
 const handleUpdate = () => {
   reset();
   title.value = "编辑专家";
@@ -261,7 +372,7 @@ function submitForm() {
       if (form.value.id) {
         // TODO
         paperEdit(form.value).then((response) => {
-          ElMessage.success(t("admin.common.editSuccess"));
+          ElMessage.success("修改成功");
           open.value = false;
           getList();
         });
diff --git a/src/views/components/AgentForm/index.vue b/src/views/components/AgentForm/index.vue
index bf7581e..9c04da3 100644
--- a/src/views/components/AgentForm/index.vue
+++ b/src/views/components/AgentForm/index.vue
@@ -6,12 +6,13 @@
     :rules="rules"
   >
     <div v-if="showTitle" class="form_title">
+      <!--      基本信息-->
       {{ t("admin.form.basicInfo") }}
     </div>
 
     <el-row v-if="isAdd">
       <el-col :span="24">
-        <el-form-item :label="t('admin.form.fullName')" prop="name">
+        <el-form-item label="姓名:" prop="name">
           <el-input v-model="modelValue.name"></el-input>
         </el-form-item>
       </el-col>
@@ -19,7 +20,7 @@
 
     <el-row v-if="isAdd">
       <el-col :span="24">
-        <el-form-item :label="t('admin.form.mobile')" prop="mobile">
+        <el-form-item label="手机号:" prop="mobile">
           <el-input v-model="modelValue.mobile"></el-input>
         </el-form-item>
       </el-col>
@@ -27,7 +28,7 @@
 
     <el-row v-if="isAdd">
       <el-col :span="24">
-        <el-form-item :label="t('admin.form.idCard')" prop="idCard">
+        <el-form-item label="身份证号:" prop="idCard">
           <el-input v-model="modelValue.idCard"></el-input>
         </el-form-item>
       </el-col>
@@ -35,7 +36,7 @@
 
     <el-row>
       <el-col :span="24">
-        <el-form-item :label="t('admin.form.workLocation')" prop="wordAddress">
+        <el-form-item label="工作所在地:" prop="wordAddress">
           <el-input v-model="modelValue.wordAddress" />
         </el-form-item>
       </el-col>
@@ -43,7 +44,7 @@
 
     <el-row>
       <el-col :span="24">
-        <el-form-item :label="t('admin.form.workExperience')" prop="experience">
+        <el-form-item label="工作经历:" prop="experience">
           <el-input
             v-model="modelValue.experience"
             :autosize="{ minRows: 2, maxRows: 10 }"
@@ -60,13 +61,13 @@
       v-model="modelValue"
       :labelWidth="labelWidth"
       fieldKey="keywords"
-      :placeholder="t('admin.form.inputKeywords')"
-      :title="t('admin.form.keywords')"
+      placeholder="应用场景关键词+技术产品关键词"
+      title="关键词"
     />
 
     <el-row v-if="isAdd">
       <el-col :span="24">
-        <el-form-item :label="t('admin.form.idCard')" required>
+        <el-form-item label="身份证:" required>
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item prop="idImage.0">
@@ -76,9 +77,7 @@
                   :limit="1"
                 />
               </el-form-item>
-              <div style="text-align: center">
-                {{ t("admin.form.idCardPortrait") }}
-              </div>
+              <div style="text-align: center">身份证人像面</div>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="idImage.1">
@@ -88,9 +87,7 @@
                   :limit="1"
                 />
               </el-form-item>
-              <div style="text-align: center">
-                {{ t("admin.form.idCardEmblem") }}
-              </div>
+              <div style="text-align: center">身份证国徽面</div>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="idImage.2">
@@ -100,9 +97,7 @@
                   :limit="1"
                 />
               </el-form-item>
-              <div style="text-align: center">{{
-                  t('admin.validation.portraitOfTheIdCard')
-                }}</div>
+              <div style="text-align: center">手持身份证人像面</div>
             </el-col>
           </el-row>
         </el-form-item>
@@ -111,10 +106,7 @@
 
     <el-row v-if="isAdd">
       <el-col :span="24">
-        <el-form-item
-          :label="t('admin.form.achievementBroker')"
-          prop="certificatePics"
-        >
+        <el-form-item label="成果经纪资格证书:" prop="certificatePics">
           <el-row :gutter="20">
             <el-col :span="8">
               <image-upload
@@ -131,7 +123,7 @@
 <script setup>
 import InputBoxAdd from "../InputBoxAdd";
 import FieldOptions from "../FieldOptions";
-import { computed, reactive, ref } from "vue";
+import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 
 const { t } = useI18n();
@@ -153,101 +145,51 @@ const props = defineProps({
     default: 120,
   },
 });
-const rules = reactive({
-  product: [
-    {
-      required: true,
-      message: computed(() => t("admin.form.placeholder", { type: "" })),
-      trigger: "blur",
-    },
-  ],
-  name: [
-    {
-      required: true,
-      message: computed(() => t("admin.form.placeholder", { type: "" })),
-      trigger: "blur",
-    },
-  ],
-  kind: [
-    {
-      required: true,
-      message: computed(() => t("admin.form.pleaseSelect")),
-      trigger: "change",
-    },
-  ],
-  code: [
-    {
-      required: true,
-      message: computed(() => t("admin.form.placeholder")),
-      trigger: "blur",
-    },
-  ],
+const rules = {
+  product: [{ required: true, message: "请输入", trigger: "blur" }],
+  name: [{ required: true, message: "请输入", trigger: "blur" }],
+  kind: [{ required: true, message: "请选择", trigger: "change" }],
+  code: [{ required: true, message: "请输入", trigger: "blur" }],
   mobile: [
-    {
-      required: true,
-      message: computed(() =>
-        t("admin.form.placeholder", { name: t("admin.form.mobile") })
-      ),
-      trigger: "blur",
-    },
+    { required: true, message: "请输入手机号码", trigger: "blur" },
     {
       pattern: /^1[3-9]\d{9}$/,
-      message: computed(() =>
-        t("admin.validation.pleaseEnterTheCorrectFormatOfThePhoneNumber")
-      ),
-      trigger: "blur",
-    },
-  ],
-  idCard: [
-    {
-      required: true,
-      message: computed(() => t("admin.form.placeholder")),
-      trigger: "blur",
-    },
-  ],
-  wordAddress: [
-    {
-      required: true,
-      message: computed(() => t("admin.form.placeholder", { type: "" })),
-      trigger: "blur",
-    },
-  ],
-  experience: [
-    {
-      required: true,
-      message: computed(() => t("admin.form.placeholder")),
+      message: "请输入正确的手机号码",
       trigger: "blur",
     },
   ],
+  idCard: [{ required: true, message: "请输入", trigger: "blur" }],
+  wordAddress: [{ required: true, message: "请输入", trigger: "blur" }],
+  experience: [{ required: true, message: "请输入", trigger: "blur" }],
   "idImage.0": [
     {
       required: true,
-      message: computed(() => t("admin.validation.pleaseUpload")),
+      message: "请上传",
       trigger: ["blur", "change"],
     },
   ],
   "idImage.1": [
     {
       required: true,
-      message: computed(() => t("admin.validation.pleaseUpload")),
+      message: "请上传",
       trigger: ["blur", "change"],
     },
   ],
   "idImage.2": [
     {
       required: true,
-      message: computed(() => t("admin.validation.pleaseUpload")),
+      message: "请上传",
       trigger: ["blur", "change"],
     },
   ],
   certificatePics: [
     {
       required: true,
-      message: computed(() => t("admin.validation.pleaseUpload")),
+      message: "请上传",
       trigger: ["blur", "change"],
     },
   ],
-});
+};
 
 const validateForm = async () => {
   let formValid;
diff --git a/src/views/components/LaboratoryForm/index.vue b/src/views/components/LaboratoryForm/index.vue
index 1fe3636..3b96009 100644
--- a/src/views/components/LaboratoryForm/index.vue
+++ b/src/views/components/LaboratoryForm/index.vue
@@ -1,10 +1,10 @@
 <template>
   <!--COMPLETE-->
   <el-form
-      ref="formRef"
-      :label-width="labelWidth + 'px'"
-      :model="modelValue"
-      :rules="rules"
+    ref="formRef"
+    :label-width="labelWidth + 'px'"
+    :model="modelValue"
+    :rules="rules"
   >
     <div v-if="showTitle" class="form_title">
       {{ t("admin.form.basicInfo") }}
@@ -13,8 +13,8 @@
     <el-row v-if="isAdd">
       <el-col :span="24">
         <el-form-item
-            :label="t('admin.form.name', { type: t('admin.common.lab') })"
-            prop="name"
+          :label="t('admin.form.name', { type: t('admin.common.lab') })"
+          prop="name"
         >
           <el-input v-model="modelValue.name"></el-input>
         </el-form-item>
@@ -37,8 +37,8 @@
       <el-col :span="24">
         <el-form-item :label="t('admin.form.institute')" prop="school">
           <el-input
-              v-model="modelValue.school"
-              :placeholder="
+            v-model="modelValue.school"
+            :placeholder="
               t('admin.form.placeholder', { type: t('admin.form.institute') })
             "
           />
@@ -49,8 +49,8 @@
       <el-col :span="24">
         <el-form-item :label="t('admin.table.labWebsite')">
           <el-input
-              v-model="modelValue.url"
-              :placeholder="
+            v-model="modelValue.url"
+            :placeholder="
               t('admin.form.placeholder', { type: t('admin.table.labWebsite') })
             "
           ></el-input>
@@ -58,20 +58,19 @@
       </el-col>
     </el-row>
     <InputBoxAdd
-        ref="keywordsFormRef"
-        v-model="modelValue"
-        :labelWidth="labelWidth"
-        :placeholder="t('admin.form.inputKeywords')"
-        :title="t('admin.form.keywords')"
-        fieldKey="keywords"
+      ref="keywordsFormRef"
+      v-model="modelValue"
+      :labelWidth="labelWidth"
+      :placeholder="t('admin.form.inputKeywords')"
+      :title="t('admin.form.keywords')"
+      fieldKey="keywords"
     />
     <FieldOptions
-        ref="fieldFormRef"
-        v-model="modelValue"
-        :labelWidth="labelWidth"
+      ref="fieldFormRef"
+      v-model="modelValue"
+      :labelWidth="labelWidth"
     />
 
-
     <!--    <CityOptions-->
     <!--      ref="cityFormRef"-->
     <!--      v-model="modelValue"-->
@@ -91,30 +90,30 @@
     <!--      </el-col>-->
     <!--    </el-row>-->
     <InputBoxAdd
-        ref="directionsFormRef"
-        v-model="modelValue"
-        :labelWidth="labelWidth"
-        :placeholder="
+      ref="directionsFormRef"
+      v-model="modelValue"
+      :labelWidth="labelWidth"
+      :placeholder="
         t('admin.form.placeholder', { type: t('admin.form.researchDirection') })
       "
-        :title="t('admin.form.researchDirection')"
-        fieldKey="researchs"
+      :title="t('admin.form.researchDirection')"
+      fieldKey="researchs"
     />
     <el-row>
       <el-col :span="24">
         <el-form-item
-            :label="t('webSearch.technicalApplication')"
-            prop="primaryTechnology"
+          :label="t('webSearch.technicalApplication')"
+          prop="primaryTechnology"
         >
           <el-input
-              v-model="modelValue.primaryTechnology"
-              :autosize="{ minRows: 4 }"
-              :placeholder="
+            v-model="modelValue.primaryTechnology"
+            :autosize="{ minRows: 4 }"
+            :placeholder="
               t('admin.form.placeholder', {
                 type: t('webSearch.technicalApplication'),
               })
             "
-              type="textarea"
+            type="textarea"
           ></el-input>
         </el-form-item>
       </el-col>
@@ -122,18 +121,18 @@
     <el-row>
       <el-col :span="24">
         <el-form-item
-            :label="t('webSearch.researchProject')"
-            prop="researchProject"
+          :label="t('webSearch.researchProject')"
+          prop="researchProject"
         >
           <el-input
-              v-model="modelValue.researchProject"
-              :autosize="{ minRows: 4 }"
-              :placeholder="
+            v-model="modelValue.researchProject"
+            :autosize="{ minRows: 4 }"
+            :placeholder="
               t('admin.form.placeholder', {
                 type: t('webSearch.researchProject'),
               })
             "
-              type="textarea"
+            type="textarea"
           ></el-input>
         </el-form-item>
       </el-col>
@@ -141,18 +140,18 @@
     <el-row>
       <el-col :span="24">
         <el-form-item
-            :label="t('webSearch.representativeAchievements')"
-            prop="achievement"
+          :label="t('webSearch.representativeAchievements')"
+          prop="achievement"
         >
           <el-input
-              v-model="modelValue.achievement"
-              :autosize="{ minRows: 4 }"
-              :placeholder="
+            v-model="modelValue.achievement"
+            :autosize="{ minRows: 4 }"
+            :placeholder="
               t('admin.form.placeholder', {
                 type: t('webSearch.representativeAchievements'),
               })
             "
-              type="textarea"
+            type="textarea"
           ></el-input>
         </el-form-item>
       </el-col>
@@ -161,32 +160,31 @@
       <el-col :span="24">
         <el-form-item :label="t('webContact.phone')" prop="phone">
           <el-input
-              v-model="modelValue.phone"
-              :maxlength="11"
-              :placeholder="
+            v-model="modelValue.phone"
+            :maxlength="11"
+            :placeholder="
               t('admin.form.placeholder', { type: t('webContact.phone') })
             "
-              oninput="value = value.replace(/\D+/, '')"
+            oninput="value = value.replace(/\D+/, '')"
           ></el-input>
         </el-form-item>
       </el-col>
     </el-row>
 
-
     <el-row>
       <el-col :span="24">
         <el-form-item
-            :label="
+          :label="
             t('admin.form.introduction', {
               type: t('admin.common.lab'),
             })
           "
-            prop="introduction"
+          prop="introduction"
         >
           <editor
-              ref="introduceRef"
-              v-model="modelValue.introduction"
-              :minHeight="150"
+            ref="introduceRef"
+            v-model="modelValue.introduction"
+            :minHeight="150"
           />
         </el-form-item>
       </el-col>
@@ -194,14 +192,12 @@
 
     <el-row>
       <el-col :span="24">
-        <el-form-item :label="t(
-            'admin.form.coreMembers',
-        )" prop="member">
+        <el-form-item :label="t('admin.form.coreMembers')" prop="member">
           <WangEditor
-              ref="memberRef"
-              v-model="modelValue.member"
-              minHeight="320px"
-              @blur="formRef.validateField(`member`)"
+            ref="memberRef"
+            v-model="modelValue.member"
+            minHeight="320px"
+            @blur="formRef.validateField(`member`)"
           />
           <!-- @click.native="handleEditAble" -->
         </el-form-item>
@@ -213,10 +209,10 @@
 import Editor from "@/components/WangEditor";
 import FieldOptions from "@/views/components/FieldOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
-import {computed, reactive, ref, toRefs} from "vue";
-import {useI18n} from "vue-i18n";
+import { computed, reactive, ref, toRefs } from "vue";
+import { useI18n } from "vue-i18n";
 
-const {t} = useI18n();
+const { t } = useI18n();
 const props = defineProps({
   modelValue: Object,
   isAdd: {
@@ -246,9 +242,9 @@ const data = reactive({
       {
         required: true,
         message: computed(() =>
-            t("admin.form.placeholder", {
-              type: t("admin.form.name", {type: t("admin.common.lab")}),
-            })
+          t("admin.form.placeholder", {
+            type: t("admin.form.name", { type: t("admin.common.lab") }),
+          })
         ),
         trigger: "blur",
       },
@@ -257,9 +253,9 @@ const data = reactive({
       {
         required: true,
         message: computed(() =>
-            t("admin.form.placeholder", {
-              type: t("admin.form.organizationCode"),
-            })
+          t("admin.form.placeholder", {
+            type: t("admin.form.organizationCode"),
+          })
         ),
         trigger: "blur",
       },
@@ -268,7 +264,7 @@ const data = reactive({
       {
         required: true,
         message: computed(() =>
-            t("admin.form.placeholder", {type: t("admin.form.institute")})
+          t("admin.form.placeholder", { type: t("admin.form.institute") })
         ),
         trigger: "blur",
       },
@@ -278,11 +274,11 @@ const data = reactive({
         required: true,
         // message: "请输入实验室简介",
         message: computed(() =>
-            t("admin.form.placeholder", {
-              type: t("admin.form.introduction", {
-                type: t("admin.common.lab"),
-              }),
-            })
+          t("admin.form.placeholder", {
+            type: t("admin.form.introduction", {
+              type: t("admin.common.lab"),
+            }),
+          })
         ),
         trigger: ["change", "blur"],
       },
@@ -311,7 +307,7 @@ const data = reactive({
       {
         pattern: /^1[3-9]\d{9}$/,
         message: computed(() =>
-            t("admin.validation.pleaseEnterTheCorrectFormatOfThePhoneNumber")
+          t("admin.validation.pleaseEnterTheCorrectFormatOfThePhoneNumber")
         ),
         trigger: "blur",
       },
@@ -362,7 +358,7 @@ const data = reactive({
       {
         required: true,
         message: computed(() =>
-            t("admin.form.placeholder", {type: t("admin.form.workTime")})
+          t("admin.form.placeholder", { type: t("admin.form.workTime") })
         ),
         trigger: ["change", "blur"],
       },
@@ -376,7 +372,7 @@ const data = reactive({
     ],
   },
 });
-const {rules} = toRefs(data);
+const { rules } = toRefs(data);
 
 const validateForm = async () => {
   let formValid;
@@ -390,11 +386,11 @@ const validateForm = async () => {
   const keywordsFormValid = await keywordsFormRef.value.validateForm(); // 关键词表单验证
   const directionsFormValid = await directionsFormRef.value.validateForm(); // 研究方向表单验证
   return (
-      formValid &&
-      // cityFormValid &&
-      fieldFormValid &&
-      keywordsFormValid &&
-      directionsFormValid
+    formValid &&
+    // cityFormValid &&
+    fieldFormValid &&
+    keywordsFormValid &&
+    directionsFormValid
   );
 };
 
diff --git a/src/views/components/StatisticsPanel.vue b/src/views/components/StatisticsPanel.vue
index 4d3f624..11fbb73 100644
--- a/src/views/components/StatisticsPanel.vue
+++ b/src/views/components/StatisticsPanel.vue
@@ -13,11 +13,11 @@ const prop = defineProps({
 <template>
   <div class="statistics-panel">
     <div
-        v-for="(item, index) in list"
-        :style="{
+      v-for="(item, index) in list"
+      :style="{
         backgroundColor: colors[index % colors.length],
       }"
-        class="statistics-item"
+      class="statistics-item"
     >
       <div class="left">
         <div class="label">
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 7697ef3..94ae90d 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -1,49 +1,49 @@
 <template>
   <div>
     <div class="user-info-head" @click="editCropper()">
-      <img :src="options.img" class="img-circle img-lg" title="点击上传头像"/>
+      <img :src="options.img" class="img-circle img-lg" title="点击上传头像" />
     </div>
     <el-dialog
-        v-model="open"
-        :title="title"
-        append-to-body
-        width="800px"
-        @close="closeDialog"
-        @opened="modalOpened"
+      v-model="open"
+      :title="title"
+      append-to-body
+      width="800px"
+      @close="closeDialog"
+      @opened="modalOpened"
     >
       <el-row>
         <el-col :md="12" :style="{ height: '350px' }" :xs="24">
           <vue-cropper
-              v-if="visible"
-              ref="cropper"
-              :autoCrop="options.autoCrop"
-              :autoCropHeight="options.autoCropHeight"
-              :autoCropWidth="options.autoCropWidth"
-              :fixedBox="options.fixedBox"
-              :img="options.img"
-              :info="true"
-              @realTime="realTime"
+            v-if="visible"
+            ref="cropper"
+            :autoCrop="options.autoCrop"
+            :autoCropHeight="options.autoCropHeight"
+            :autoCropWidth="options.autoCropWidth"
+            :fixedBox="options.fixedBox"
+            :img="options.img"
+            :info="true"
+            @realTime="realTime"
           />
         </el-col>
         <el-col :md="12" :style="{ height: '350px' }" :xs="24">
           <div class="avatar-upload-preview">
-            <img :src="options.previews.url" :style="options.previews.img"/>
+            <img :src="options.previews.url" :style="options.previews.img" />
           </div>
         </el-col>
       </el-row>
-      <br/>
+      <br />
       <el-row>
         <el-col :lg="2" :md="2">
           <el-upload
-              :before-upload="beforeUpload"
-              :http-request="requestUpload"
-              :show-file-list="false"
-              action="#"
+            :before-upload="beforeUpload"
+            :http-request="requestUpload"
+            :show-file-list="false"
+            action="#"
           >
             <el-button>
               {{ t("common.select") }}
               <el-icon class="el-icon--right">
-                <Upload/>
+                <Upload />
               </el-icon>
             </el-button>
           </el-upload>
@@ -61,9 +61,8 @@
           <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
         </el-col>
         <el-col :lg="{ span: 2, offset: 6 }" :md="2">
-          <el-button type="primary" @click="uploadImg()">{{
-              t("common.submit")
-            }}
+          <el-button type="primary" @click="uploadImg()"
+            >{{ t("common.submit") }}
           </el-button>
         </el-col>
       </el-row>
@@ -73,17 +72,17 @@
 
 <script setup>
 import "vue-cropper/dist/index.css";
-import {VueCropper} from "vue-cropper";
+import { VueCropper } from "vue-cropper";
 import useUserStore from "@/store/modules/user";
-import {computed} from "vue";
-import {useI18n} from "vue-i18n";
-import {updateAvatar} from "@/api/login";
-import {upload} from "@/api/common";
+import { computed } from "vue";
+import { useI18n } from "vue-i18n";
+import { updateAvatar } from "@/api/login";
+import { upload } from "@/api/common";
 import defaultAvatar from "@/assets/logo/avatar.png";
 
-const {t} = useI18n();
+const { t } = useI18n();
 const userStore = useUserStore();
-const {proxy} = getCurrentInstance();
+const { proxy } = getCurrentInstance();
 
 const open = ref(false);
 const visible = ref(false);
@@ -91,7 +90,9 @@ const title = computed(() => t("headerMenu.changeAvatar"));
 const baseUrl = ref(import.meta.env.VITE_APP_BASE_API);
 //图片裁剪数据
 const options = reactive({
-  img: userStore.avatar ? `${baseUrl.value}/file${userStore.avatar}` : defaultAvatar, // 裁剪图片的地址
+  img: userStore.avatar
+    ? `${baseUrl.value}/file${userStore.avatar}`
+    : defaultAvatar, // 裁剪图片的地址
   autoCrop: true, // 是否默认生成截图框
   autoCropWidth: 200, // 默认生成截图框宽度
   autoCropHeight: 200, // 默认生成截图框高度
@@ -110,8 +111,7 @@ function modalOpened() {
 }
 
 /** 覆盖默认上传行为 */
-function requestUpload() {
-}
+function requestUpload() {}
 
 /** 向左旋转 */
 function rotateLeft() {
@@ -133,7 +133,7 @@ function changeScale(num) {
 function beforeUpload(file) {
   if (file.type.indexOf("image/") == -1) {
     proxy.$modal.msgError(
-        "文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。"
+      "文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。"
     );
   } else {
     const reader = new FileReader();
@@ -150,19 +150,19 @@ function uploadImg() {
     let formData = new FormData();
     formData.append("file", data);
     upload(formData)
-        .then((uploadResp) => {
-          return uploadResp.fileName;
-        })
-        .then((fileName) => {
-          updateAvatar({
-            avatar: fileName,
-          });
-          open.value = false;
-          options.img = `${baseUrl.value}/file/${fileName}`;
-          userStore.avatar = fileName;
-          proxy.$modal.msgSuccess(t("admin.common.editSuccess"));
-          visible.value = false;
+      .then((uploadResp) => {
+        return uploadResp.fileName;
+      })
+      .then((fileName) => {
+        updateAvatar({
+          avatar: fileName,
         });
+        open.value = false;
+        options.img = `${baseUrl.value}/file/${fileName}`;
+        userStore.avatar = fileName;
+        proxy.$modal.msgSuccess(t("admin.common.editSuccess"));
+        visible.value = false;
+      });
   });
 }
 
@@ -173,7 +173,9 @@ function realTime(data) {
 
 /** 关闭窗口 */
 function closeDialog() {
-  options.img = userStore.avatar ? `${baseUrl.value}/file${userStore.avatar}` : defaultAvatar;
+  options.img = userStore.avatar
+    ? `${baseUrl.value}/file${userStore.avatar}`
+    : defaultAvatar;
   options.visible = false;
 }