From ce7f7e4b8bd9983239833469bdb9be61a3c3b287 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Fri, 8 Mar 2024 16:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E7=A0=94=E6=9C=BA=E6=9E=84=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=BB=91=E5=AE=9A=E4=B8=93=E5=AE=B6=E5=92=8C=E5=AE=9E?=
 =?UTF-8?q?=E9=AA=8C=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/research/expert.js              |  98 +++-
 .../admin/research/research/expert/index.vue  | 356 +++++++++++----
 .../research/research/laboratory/index.vue    | 420 ++++++++++++------
 src/views/website/about/about.vue             |  70 +--
 src/views/website/news/detail.vue             |   2 +-
 src/views/website/searchList/achievement.vue  |  75 ++--
 .../website/searchList/achievementDetail.vue  |  12 +-
 .../searchList/components/achievementItem.vue |  34 +-
 .../searchList/components/expertItem.vue      |   4 +-
 .../searchList/components/gainItem.vue        |   4 +-
 .../searchList/components/laboratoryItem.vue  |  20 +-
 .../components/serviceDemandItem.vue          |   4 +-
 .../components/technologyDemandItem.vue       |  21 +-
 .../website/searchList/enterpriseDetail.vue   |  40 +-
 src/views/website/searchList/expertDetail.vue |  29 +-
 .../website/searchList/laboratoryDetail.vue   |  94 ++--
 src/views/website/searchList/patentDetail.vue |  18 +-
 .../website/searchList/productDetail.vue      |   2 +-
 .../searchList/serviceDemandDetail.vue        |  58 +--
 .../searchList/technologyDemandDetail.vue     |   8 +-
 .../website/solution/components/seeMore.vue   |  24 +-
 src/views/website/solution/detail.vue         |  45 +-
 vite.config.js                                |   2 +-
 23 files changed, 923 insertions(+), 517 deletions(-)

diff --git a/src/api/admin/research/expert.js b/src/api/admin/research/expert.js
index 08ce19e..65fed63 100644
--- a/src/api/admin/research/expert.js
+++ b/src/api/admin/research/expert.js
@@ -2,28 +2,28 @@ import request from "@/utils/request";
 
 // 科研机构专家列表
 export const expertList = (params) => {
-  return request({
-    url: `/app/research/expertList`,
-    method: "GET",
-    params,
-  });
+    return request({
+        url: `/app/research/expertList`,
+        method: "GET",
+        params,
+    });
 };
 
 // 科研机构取消专家绑定
 export const deleteBindExpert = (expertId) => {
-  return request({
-    url: `/app/research/deleteBindExpert/${expertId}`,
-    method: "PUT",
-  });
+    return request({
+        url: `/app/research/deleteBindExpert/${expertId}`,
+        method: "PUT",
+    });
 };
 
 // 科研机构新增专利
 export const insertLabPatent = (data) => {
-  return request({
-    url: `/app/research/patent`,
-    method: "POST",
-    data,
-  });
+    return request({
+        url: `/app/research/patent`,
+        method: "POST",
+        data,
+    });
 };
 
 /**
@@ -32,16 +32,68 @@ export const insertLabPatent = (data) => {
  * @return {*}
  */
 export const updateLabPatent = (data) => {
-  return request({
-    url: `/app/research/patent`,
-    method: "PUT",
-    data,
-  });
+    return request({
+        url: `/app/research/patent`,
+        method: "PUT",
+        data,
+    });
 };
 
 export const deleteLabPatentByIds = (ids) => {
-  return request({
-    url: `/app/research/deletePatents/${ids}`,
-    method: "DELETE",
-  });
+    return request({
+        url: `/app/research/deletePatents/${ids}`,
+        method: "DELETE",
+    });
 };
+
+
+/**
+ * 实验室未绑定专家列表
+ * @param params
+ * @return {*}
+ */
+export const selectNotBindResearch = (params) => {
+    return request({
+        url: `/app/research/selectNotBindResearch`,
+        method: "GET",
+        params,
+    });
+};
+
+/**
+ * 实验室专家绑定
+ * @param expertId
+ * @return {*}
+ */
+export const bindExpert = (expertId) => {
+    return request({
+        url: `/app/research/bindExpert/${expertId}`,
+        method: "GET",
+    });
+};
+
+
+/**
+ * 实验室未绑定专家列表
+ * @param params
+ * @return {*}
+ */
+export const selectLabNotBindResearch = (params) => {
+    return request({
+        url: `/app/research/selectLabNotBindResearch`,
+        method: "GET",
+        params,
+    });
+};
+
+/**
+ * 科研机构专家绑定
+ * @param laboratoryId
+ * @return {*}
+ */
+export const bindLaboratory = (laboratoryId) => {
+    return request({
+        url: `/app/research/bindLaboratory/${laboratoryId}`,
+        method: "GET",
+    });
+};
\ No newline at end of file
diff --git a/src/views/admin/research/research/expert/index.vue b/src/views/admin/research/research/expert/index.vue
index 7b60e73..4881be9 100644
--- a/src/views/admin/research/research/expert/index.vue
+++ b/src/views/admin/research/research/expert/index.vue
@@ -1,33 +1,33 @@
 <template>
   <div class="app-container">
     <el-form
-      v-show="showSearch"
-      ref="queryRef"
-      :inline="true"
-      :model="queryParams"
-      @submit.prevent
+        v-show="showSearch"
+        ref="queryRef"
+        :inline="true"
+        :model="queryParams"
+        @submit.prevent
     >
       <el-form-item
-        :label="t('admin.form.name', { type: t('admin.common.achievement') })"
-        prop="title"
+          :label="t('admin.form.name', { type: t('admin.common.achievement') })"
+          prop="title"
       >
         <el-input
-          v-model="queryParams.title"
-          clearable
-          :placeholder="
+            v-model="queryParams.title"
+            clearable
+            :placeholder="
             t('admin.form.placeholder', { type: t('admin.common.patent') })
           "
-          size="small"
-          style="width: 240px"
-          @keyup.enter="handleQuery"
+            size="small"
+            style="width: 240px"
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item>
         <el-button
-          icon="Search"
-          size="small"
-          type="primary"
-          @click="handleQuery"
+            icon="Search"
+            size="small"
+            type="primary"
+            @click="handleQuery"
         >
           {{ t("admin.common.search") }}
         </el-button>
@@ -36,45 +36,137 @@
         </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.common.add") }}-->
-<!--        </el-button>-->
-<!--      </el-col>-->
-<!--      <right-toolbar-->
-<!--        v-model:showSearch="showSearch"-->
-<!--        @queryTable="getList"-->
-<!--      ></right-toolbar>-->
-<!--    </el-row>-->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button icon="plus" size="small" type="primary" @click="handleAddBind">
+          {{ t("admin.table.relatedExperts") }}
+        </el-button>
+      </el-col>
+      <right-toolbar
+          v-model:showSearch="showSearch"
+          @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <!--  关联未被关联的专家  -->
+    <el-dialog
+        v-model="showExpertDialog"
+        :title="t('admin.table.relatedExperts')"
+        @close="resetQuery"
+    >
+      <el-form
+          ref="notBindExpertQueryRef"
+          :inline="true"
+          :model="notBindExpertQueryParams"
+          @submit.prevent
+      >
+        <el-form-item
+            :label="t('admin.form.name', { type: t('admin.common.expert') })"
+            prop="name"
+        >
+          <el-input
+              v-model="notBindExpertQueryParams.name"
+              clearable
+              :placeholder="
+              t('admin.form.placeholder', {
+                type: t('admin.form.name', {
+                  type: t('admin.common.expert'),
+                }),
+              })
+            "
+              size="small"
+              style="width: 240px"
+              @keyup.enter="getNotBindExpertList"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+              icon="Search"
+              size="small"
+              type="primary"
+              @click="getNotBindExpertList"
+          ><!--搜索-->
+            {{ t("common.search") }}
+          </el-button>
+          <el-button
+              icon="Refresh"
+              size="small"
+              @click="resetNotBindExpertQuery"
+          >{{ t("admin.common.reset") }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="notBindExpertList">
+        <el-table-column :label="t('admin.common.dataNumber')" prop="id"/>
+        <el-table-column
+            :show-overflow-tooltip="true"
+            :label="t('admin.form.name', { type: t('admin.common.expert') })"
+            prop="name"
+        />
+        <el-table-column :label="t('webContact.phone')" prop="mobile"/>
+        <el-table-column
+            :label="t('admin.table.researchIndustry')"
+            prop="industryStr"
+        />
+        <!--      <el-table-column label="申请（专利权）人" prop="applyName"/>-->
+        <el-table-column
+            align="center"
+            :label="t('admin.table.enterTime')"
+            prop="workTime"
+        >
+          <template #default="{ row }">
+            <span>{{ dayjs(row.workTime).format("YYYY-MM-DD") }}</span>
+          </template>
+        </el-table-column>
+        <!--        操作-->
+        <el-table-column align="center" :label="t('admin.common.operation')">
+          <template #default="{ row }">
+            <el-button
+                icon="plus"
+                size="small"
+                type="text"
+                @click="submitBind(row.id)"
+            ><!--关联-->{{ t("admin.table.relation") }}
+            </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="t('admin.common.dataNumber')" prop="id"/>
       <el-table-column
-        :show-overflow-tooltip="true"
-        :label="t('admin.form.name', { type: t('admin.common.expert') })"
-        prop="name"
+          :show-overflow-tooltip="true"
+          :label="t('admin.form.name', { type: t('admin.common.expert') })"
+          prop="name"
       />
-      <el-table-column :label="t('webContact.phone')" prop="mobile" />
+      <el-table-column :label="t('webContact.phone')" prop="mobile"/>
       <el-table-column
-        :label="t('admin.table.researchIndustry')"
-        prop="industryStr"
+          :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"
+          align="center"
+          :label="t('admin.table.enterTime')"
+          prop="workTime"
       >
         <template #default="{ row }">
           <span>{{ dayjs(row.workTime).format("YYYY-MM-DD") }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        align="center"
-        class-name="small-padding fixed-width"
-        :label="t('admin.common.operation')"
+          align="center"
+          class-name="small-padding fixed-width"
+          :label="t('admin.common.operation')"
       >
         <template #default="{ row }">
           <!--          <el-button-->
@@ -86,72 +178,72 @@
           <!--          </el-button-->
           <!--          >-->
           <el-button
-            icon="Delete"
-            size="small"
-            type="text"
-            @click="handleDeleteBind(row.id)"
-            >{{ t("admin.table.cancelRelation") }}
+              icon="Delete"
+              size="small"
+              type="text"
+              @click="handleDeleteBind(row.id)"
+          >{{ t("admin.table.cancelRelation") }}
           </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"
     />
     <!-- 添加或修改数据配置对话框 -->
     <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-input
-            v-model="form.title"
-            :placeholder="
+              v-model="form.title"
+              :placeholder="
               t('admin.form.placeholder', { type: t('admin.form.expertName') })
             "
           />
         </el-form-item>
         <el-form-item :label="t('input.gender')" prop="gender">
           <el-input
-            v-model="form.gender"
-            :placeholder="
+              v-model="form.gender"
+              :placeholder="
               t('admin.form.placeholder', { type: t('input.gender') })
             "
           />
         </el-form-item>
         <el-form-item :label="t('webContact.unit')" prop="unit">
           <el-input
-            v-model="form.unit"
-            :placeholder="
+              v-model="form.unit"
+              :placeholder="
               t('admin.form.placeholder', { type: t('webContact.unit') })
             "
           />
         </el-form-item>
         <el-form-item
-          :label="t('admin.form.researchDirection')"
-          prop="researchDirection"
+            :label="t('admin.form.researchDirection')"
+            prop="researchDirection"
         >
           <InputBoxAdd
-            ref="researchDirectionFormRef"
-            v-model="form"
-            :labelWidth="100"
-            fieldKey="researchs"
-            :placeholder="
+              ref="researchDirectionFormRef"
+              v-model="form"
+              :labelWidth="100"
+              fieldKey="researchs"
+              :placeholder="
               t('admin.form.placeholder', {
                 type: t('admin.form.researchDirection'),
               })
             "
-            :title="t('admin.form.researchDirection')"
+              :title="t('admin.form.researchDirection')"
           />
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitForm"
-            >{{ t("admin.common.confirm") }}
+          >{{ t("admin.common.confirm") }}
           </el-button>
           <el-button @click="cancel">{{ t("admin.common.cancel") }}</el-button>
         </div>
@@ -161,16 +253,18 @@
 </template>
 
 <script setup>
-import { ElMessage } from "element-plus";
+import {ElMessage} from "element-plus";
 import modal from "@/plugins/modal";
-import { useRouter } from "vue-router";
-import { reactive, ref, toRefs } from "vue";
+import {useRouter} from "vue-router";
+import {reactive, ref, toRefs} from "vue";
 import InputBoxAdd from "@/views/components/InputBoxAdd/index.vue";
-import { deleteBindExpert, expertList } from "@/api/admin/research/expert";
-import { useI18n } from "vue-i18n";
+import {deleteBindExpert, expertList, selectNotBindResearch, bindExpert} from "@/api/admin/research/expert";
+import {useI18n} from "vue-i18n";
 import dayjs from "dayjs";
+import Pagination from "@/components/Pagination/index.vue";
 
-const { t } = useI18n();
+
+const {t} = useI18n();
 const router = useRouter();
 
 const dataList = ref([]);
@@ -181,17 +275,29 @@ const total = ref(0);
 const title = ref("");
 const expertRef = ref();
 const researchDirectionFormRef = ref();
+// 是否显示关联专家dialog
+const showExpertDialog = ref(false);
+// 未绑定专家列表
+const notBindExpertList = ref([]);
+// 未绑定专家总数
+const notBindExpertTotal = ref(0);
+const notBindExpertQueryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  name: undefined,
+});
 const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     inventor: undefined,
   },
+
   form: {},
   rules: {},
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 const queryRef = ref();
 
@@ -199,14 +305,14 @@ const queryRef = ref();
 const getList = async () => {
   loading.value = true;
   expertList(queryParams.value)
-    .then((resp) => {
-      dataList.value = resp.rows;
-      total.value = resp.total;
-      loading.value = false;
-    })
-    .catch(() => {
-      loading.value = false;
-    });
+      .then((resp) => {
+        dataList.value = resp.rows;
+        total.value = resp.total;
+        loading.value = false;
+      })
+      .catch(() => {
+        loading.value = false;
+      });
 };
 
 /** 搜索按钮操作 */
@@ -224,23 +330,23 @@ function resetQuery() {
 /** 删除按钮操作 */
 function handleDeleteBind(id) {
   modal
-    .confirm(
-      t("admin.common.confirmAction", {
-        type: t("admin.common.expert"),
-        number: id,
-        action: t("admin.table.cancelRelation"),
+      .confirm(
+          t("admin.common.confirmAction", {
+            type: t("admin.common.expert"),
+            number: id,
+            action: t("admin.table.cancelRelation"),
+          })
+      )
+      .then(function () {
+        return deleteBindExpert(id);
       })
-    )
-    .then(function () {
-      return deleteBindExpert(id);
-    })
-    .then(() => {
-      getList();
-      ElMessage.success(t("tips.cancelAssociationSuccess"));
-    })
-    .catch((err) => {
-      console.log(err);
-    });
+      .then(() => {
+        getList();
+        ElMessage.success(t("tips.cancelAssociationSuccess"));
+      })
+      .catch((err) => {
+        console.log(err);
+      });
 }
 
 /** 重置新增的表单以及其他数据  */
@@ -301,5 +407,61 @@ function submitForm() {
   });
 }
 
+const notBindExpertQueryRef = ref();
+
+const getNotBindExpertList = () => {
+  selectNotBindResearch(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) => {
+  modal
+      .confirm(
+          /*"是否确认关联该专家?"*/
+          t("admin.common.confirmAction", {
+            action: t("admin.table.relation"),
+            type: t("admin.common.expert"),
+            number: id,
+          })
+      )
+      .then(function () {
+        return bindExpert(id);
+      })
+      .then(() => {
+        getNotBindExpertList();
+        ElMessage.success(
+            /*"关联成功"*/
+            t("admin.common.success", {
+              action: t("admin.table.relation"),
+            })
+        );
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+};
+
 getList();
 </script>
diff --git a/src/views/admin/research/research/laboratory/index.vue b/src/views/admin/research/research/laboratory/index.vue
index 795fcbc..cf5c0a7 100644
--- a/src/views/admin/research/research/laboratory/index.vue
+++ b/src/views/admin/research/research/laboratory/index.vue
@@ -1,33 +1,33 @@
 <template>
   <div class="app-container">
     <el-form
-      v-show="showSearch"
-      ref="queryRef"
-      :inline="true"
-      :model="queryParams"
-      @submit.prevent
+        v-show="showSearch"
+        ref="queryRef"
+        :inline="true"
+        :model="queryParams"
+        @submit.prevent
     >
       <el-form-item
-        :label="t('admin.form.name', { type: t('admin.common.equipment') })"
-        prop="title"
+          :label="t('admin.form.name', { type: t('admin.common.equipment') })"
+          prop="title"
       >
         <el-input
-          v-model="queryParams.title"
-          clearable
-          :placeholder="
+            v-model="queryParams.title"
+            clearable
+            :placeholder="
             t('admin.form.placeholder', { type: t('admin.common.equipment') })
           "
-          size="small"
-          style="width: 240px"
-          @keyup.enter="handleQuery"
+            size="small"
+            style="width: 240px"
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item>
         <el-button
-          icon="Search"
-          size="small"
-          type="primary"
-          @click="handleQuery"
+            icon="Search"
+            size="small"
+            type="primary"
+            @click="handleQuery"
         >
           {{ t("admin.common.search") }}
         </el-button>
@@ -37,20 +37,20 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--            icon="Plus"-->
-      <!--            plain-->
-      <!--            size="small"-->
-      <!--            type="primary"-->
-      <!--            @click="handleAdd"-->
-      <!--        > {{ t('admin.common.add')  }}-->
-      <!--        </el-button-->
-      <!--        >-->
-      <!--      </el-col>-->
+            <el-col :span="1.5">
+              <el-button
+                  icon="Plus"
+                  plain
+                  size="small"
+                  type="primary"
+                  @click="handleAddBind"
+              > {{ t('admin.table.relation')  }}
+              </el-button
+              >
+            </el-col>
       <right-toolbar
-        v-model:showSearch="showSearch"
-        @queryTable="getList"
+          v-model:showSearch="showSearch"
+          @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
@@ -58,52 +58,52 @@
     <el-table v-loading="loading" :data="dataList">
       <!--      <el-zh-column align="center" :label="t('admin.common.dataNumber')" prop="id"/>-->
       <el-table-column
-        align="center"
-        :label="t('admin.form.name', { type: t('admin.common.lab') })"
-        prop="name"
+          align="center"
+          :label="t('admin.form.name', { type: t('admin.common.lab') })"
+          prop="name"
       />
       <el-table-column
-        :show-overflow-tooltip="true"
-        align="center"
-        :label="t('admin.table.researchIndustry')"
-        prop="industryStr"
+          :show-overflow-tooltip="true"
+          align="center"
+          :label="t('admin.table.researchIndustry')"
+          prop="industryStr"
       />
       <el-table-column
-        align="center"
-        :label="t('webContact.phone')"
-        prop="phone"
+          align="center"
+          :label="t('webContact.phone')"
+          prop="phone"
       />
       <el-table-column
-        align="center"
-        :label="t('admin.table.labWebsite')"
-        prop="url"
+          align="center"
+          :label="t('admin.table.labWebsite')"
+          prop="url"
       />
       <el-table-column
-        align="center"
-        :label="t('admin.table.addDate')"
-        prop="createTime"
+          align="center"
+          :label="t('admin.table.addDate')"
+          prop="createTime"
       >
         <template #default="{ row }">
           <span>{{ dayjs(row.createTime).format("YYYY-MM-DD") }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        align="center"
-        class-name="small-padding fixed-width"
-        :label="t('admin.common.operation')"
+          align="center"
+          class-name="small-padding fixed-width"
+          :label="t('admin.common.operation')"
       >
         <template #default="{ row }">
           <el-button
-            icon="Edit"
-            size="small"
-            type="text"
-            @click="handleUpdate(row)"
-            >{{ t("admin.common.edit") }}
+              icon="Edit"
+              size="small"
+              type="text"
+              @click="handleUpdate(row)"
+          >{{ t("admin.common.edit") }}
           </el-button>
           <el-button size="small" type="text" @click="handleCancelBind(row)"
-            >{{ t("admin.table.unbind") }}
+          >{{ t("admin.table.unbind") }}
             <template #icon>
-              <svg-icon icon-class="broken_link" />
+              <svg-icon icon-class="broken_link"/>
             </template>
           </el-button>
         </template>
@@ -111,59 +111,59 @@
     </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"
     />
 
     <!-- 添加或修改数据配置对话框 -->
     <el-dialog v-model="open" :title="title" append-to-body width="600px">
       <el-form
-        ref="equipmentRef"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
+          ref="equipmentRef"
+          :model="form"
+          :rules="rules"
+          label-width="100px"
       >
         <el-form-item
-          :label="t('admin.form.name', { type: t('admin.common.equipment') })"
-          prop="name"
+            :label="t('admin.form.name', { type: t('admin.common.equipment') })"
+            prop="name"
         >
           <el-input
-            v-model="form.name"
-            :placeholder="
+              v-model="form.name"
+              :placeholder="
               t('admin.form.placeholder', { type: t('admin.common.equipment') })
             "
           />
         </el-form-item>
         <el-form-item :label="t('admin.form.model')" prop="model">
           <el-input
-            v-model="form.model"
-            :placeholder="
+              v-model="form.model"
+              :placeholder="
               t('admin.form.placeholder', { type: t('admin.form.model') })
             "
           />
         </el-form-item>
         <el-form-item :label="t('admin.form.buyDate')" prop="buyDate">
           <el-date-picker
-            v-model="form.buyDate"
-            :placeholder="
+              v-model="form.buyDate"
+              :placeholder="
               t('admin.form.pleaseSelect', {
                 type: t('admin.form.purchaseTime'),
               })
             "
-            type="date"
-            value-format="YYYY-MM-DD HH:mm:ss"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
           ></el-date-picker>
         </el-form-item>
         <el-form-item
-          :label="t('admin.form.achievementParameter')"
-          prop="param"
+            :label="t('admin.form.achievementParameter')"
+            prop="param"
         >
           <el-input
-            v-model="form.param"
-            :placeholder="
+              v-model="form.param"
+              :placeholder="
               t('admin.form.placeholder', {
                 type: t('admin.form.achievementParameter'),
               })
@@ -171,36 +171,129 @@
           />
         </el-form-item>
         <el-form-item
-          :label="t('admin.form.deviceDescription')"
-          prop="description"
+            :label="t('admin.form.deviceDescription')"
+            prop="description"
         >
           <el-input
-            v-model="form.description"
-            :placeholder="
+              v-model="form.description"
+              :placeholder="
               t('admin.form.placeholder', {
                 type: t('admin.form.deviceDescription'),
               })
             "
-            type="textarea"
+              type="textarea"
           ></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitForm"
-            >{{ t("admin.common.confirm") }}
+          >{{ t("admin.common.confirm") }}
           </el-button>
           <el-button @click="cancel">{{ t("admin.common.cancel") }}</el-button>
         </div>
       </template>
     </el-dialog>
+
+
+    <!--  关联未被关联的专家  -->
+    <el-dialog
+        v-model="showExpertDialog"
+        :title="t('admin.table.relatedExperts')"
+        @close="resetQuery"
+    >
+      <el-form
+          ref="notBindExpertQueryRef"
+          :inline="true"
+          :model="notBindExpertQueryParams"
+          @submit.prevent
+      >
+        <el-form-item
+            :label="t('admin.form.name', { type: t('admin.common.expert') })"
+            prop="name"
+        >
+          <el-input
+              v-model="notBindExpertQueryParams.name"
+              clearable
+              :placeholder="
+              t('admin.form.placeholder', {
+                type: t('admin.form.name', {
+                  type: t('admin.common.expert'),
+                }),
+              })
+            "
+              size="small"
+              style="width: 240px"
+              @keyup.enter="getNotBindExpertList"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+              icon="Search"
+              size="small"
+              type="primary"
+              @click="getNotBindExpertList"
+          ><!--搜索-->
+            {{ t("common.search") }}
+          </el-button>
+          <el-button
+              icon="Refresh"
+              size="small"
+              @click="resetNotBindExpertQuery"
+          >{{ t("admin.common.reset") }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="notBindExpertList">
+        <el-table-column :label="t('admin.common.dataNumber')" prop="id"/>
+        <el-table-column
+            :show-overflow-tooltip="true"
+            :label="t('admin.form.name', { type: t('admin.common.expert') })"
+            prop="name"
+        />
+        <el-table-column :label="t('webContact.phone')" prop="mobile"/>
+        <el-table-column
+            :label="t('admin.table.researchIndustry')"
+            prop="industryStr"
+        />
+        <!--      <el-table-column label="申请（专利权）人" prop="applyName"/>-->
+        <el-table-column
+            align="center"
+            :label="t('admin.table.enterTime')"
+            prop="workTime"
+        >
+          <template #default="{ row }">
+            <span>{{ dayjs(row.workTime).format("YYYY-MM-DD") }}</span>
+          </template>
+        </el-table-column>
+        <!--        操作-->
+        <el-table-column align="center" :label="t('admin.common.operation')">
+          <template #default="{ row }">
+            <el-button
+                icon="plus"
+                size="small"
+                type="text"
+                @click="submitBind(row.id)"
+            ><!--关联-->{{ t("admin.table.relation") }}
+            </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>
   </div>
 </template>
 
 <script setup>
-import { computed, reactive, ref, toRefs } from "vue";
-import { useRouter } from "vue-router";
-import { ElMessage } from "element-plus";
+import {computed, reactive, ref, toRefs} from "vue";
+import {useRouter} from "vue-router";
+import {ElMessage} from "element-plus";
 import modal from "@/plugins/modal";
 import {
   deleteEquipment,
@@ -213,10 +306,12 @@ import {
 } from "@/api/admin/research/laboratory";
 import SvgIcon from "@/components/SvgIcon/index.vue";
 
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
 import dayjs from "dayjs";
+import {bindExpert, bindLaboratory, selectLabNotBindResearch, selectNotBindResearch} from "@/api/admin/research/expert";
+import Pagination from "@/components/Pagination/index.vue";
 
-const { t } = useI18n();
+const {t} = useI18n();
 const router = useRouter();
 
 const dataList = ref([]);
@@ -226,6 +321,19 @@ const showSearch = ref(true);
 const total = ref(0);
 const title = ref("");
 const equipmentRef = ref();
+
+// 是否显示关联专家dialog
+const showExpertDialog = ref(false);
+// 未绑定专家列表
+const notBindExpertList = ref([]);
+// 未绑定专家总数
+const notBindExpertTotal = ref(0);
+const notBindExpertQueryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  name: undefined,
+});
+
 const data = reactive({
   form: {},
   queryParams: {
@@ -239,11 +347,11 @@ const data = reactive({
         required: true,
         /*"设备名称不能为空"*/
         message: computed(() =>
-          t("admin.form.placeholder", {
-            type: t("admin.form.name", {
-              type: t("admin.common.equipment"),
-            }),
-          })
+            t("admin.form.placeholder", {
+              type: t("admin.form.name", {
+                type: t("admin.common.equipment"),
+              }),
+            })
         ),
         trigger: "blur",
       },
@@ -253,9 +361,9 @@ const data = reactive({
         required: true,
         /*"型号不能为空"*/
         message: computed(() =>
-          t("admin.form.placeholder", {
-            type: t("admin.form.model"),
-          })
+            t("admin.form.placeholder", {
+              type: t("admin.form.model"),
+            })
         ),
         trigger: "blur",
       },
@@ -265,9 +373,9 @@ const data = reactive({
         required: true,
         /*"成果参数不能为空*/
         message: computed(() =>
-          t("admin.form.placeholder", {
-            type: t("admin.form.achievementParameter"),
-          })
+            t("admin.form.placeholder", {
+              type: t("admin.form.achievementParameter"),
+            })
         ),
         trigger: "blur",
       },
@@ -277,9 +385,9 @@ const data = reactive({
         required: true,
         /* "请选择购买时间"*/
         message: computed(() =>
-          t("admin.form.pleaseSelect", {
-            type: t("admin.form.purchaseTime"),
-          })
+            t("admin.form.pleaseSelect", {
+              type: t("admin.form.purchaseTime"),
+            })
         ),
         trigger: ["blur", "change"],
       },
@@ -287,7 +395,7 @@ const data = reactive({
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 /** 查询数据列表 */
 function getList() {
@@ -314,21 +422,22 @@ function resetQuery() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   modal
-    .confirm(
-      t("admin.common.confirmAction", {
-        type: t("admin.common.item"),
-        number: row.deviceId,
-        action: t("admin.common.delete"),
+      .confirm(
+          t("admin.common.confirmAction", {
+            type: t("admin.common.item"),
+            number: row.deviceId,
+            action: t("admin.common.delete"),
+          })
+      )
+      .then(function () {
+        return deleteEquipment([row.deviceId]);
       })
-    )
-    .then(function () {
-      return deleteEquipment([row.deviceId]);
-    })
-    .then(() => {
-      getList();
-      ElMessage.success(t("admin.common.deleteSuccess"));
-    })
-    .catch(() => {});
+      .then(() => {
+        getList();
+        ElMessage.success(t("admin.common.deleteSuccess"));
+      })
+      .catch(() => {
+      });
 }
 
 /** 重置新增的表单以及其他数据  */
@@ -383,14 +492,14 @@ function submitForm() {
 
 const handleCancelBind = (row) => {
   modal
-    .confirm(`${t("home.unbindLab")} - ${row.name}`)
-    .then(() => {
-      return delBindLaboratory(row.id);
-    })
-    .then(() => {
-      getList();
-      ElMessage.success(t("tips.unbindLabSuccess"));
-    });
+      .confirm(`${t("home.unbindLab")} - ${row.name}`)
+      .then(() => {
+        return delBindLaboratory(row.id);
+      })
+      .then(() => {
+        getList();
+        ElMessage.success(t("tips.unbindLabSuccess"));
+      });
 };
 
 /** 取消按钮 */
@@ -399,5 +508,62 @@ function cancel() {
   reset();
 }
 
+
+const notBindExpertQueryRef = ref();
+
+const getNotBindExpertList = () => {
+  selectLabNotBindResearch(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) => {
+  modal
+      .confirm(
+          /*"是否确认关联该专家?"*/
+          t("admin.common.confirmAction", {
+            action: t("admin.table.relation"),
+            type: t("admin.common.expert"),
+            number: id,
+          })
+      )
+      .then(function () {
+        return bindLaboratory(id);
+      })
+      .then(() => {
+        getNotBindExpertList();
+        ElMessage.success(
+            /*"关联成功"*/
+            t("admin.common.success", {
+              action: t("admin.table.relation"),
+            })
+        );
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+};
+
 getList();
 </script>
diff --git a/src/views/website/about/about.vue b/src/views/website/about/about.vue
index 2ef7b4b..ff914ec 100644
--- a/src/views/website/about/about.vue
+++ b/src/views/website/about/about.vue
@@ -1,32 +1,32 @@
 <template>
   <div class="about" v-loading="loading">
     <div
-      v-if="!state.banner"
-      style="height: 394px; background-color: #ccc"
+        v-if="!state.banner"
+        style="height: 394px; background-color: #ccc"
     ></div>
     <div
-      v-else
-      style="height: 394px; background-size: cover; background-color: #ccc"
-      :style="{ backgroundImage: `url(${state.banner})` }"
+        v-else
+        style="height: 394px; background-size: cover; background-color: #ccc"
+        :style="{ backgroundImage: `url(${state.banner})` }"
     ></div>
 
     <div class="box conter1000">
       <div class="_l">
         <div
-          class="_item pointer"
-          v-for="(item, index) in state.data"
-          :class="index == kindId ? 'x_fff x_bg_blue' : ''"
-          :key="item.id"
-          @click="handleActive(index)"
+            class="_item pointer"
+            v-for="(item, index) in state.data"
+            :class="index == kindId ? 'x_fff x_bg_blue' : ''"
+            :key="item.id"
+            @click="handleActive(index)"
         >
           {{ item[titleField] }}
         </div>
       </div>
       <div class="_r">
         <div
-          v-if="state.data.length"
-          class="html"
-          v-html="state.data[kindId][contentField]"
+            v-if="state.data.length"
+            class="html"
+            v-html="state.data[kindId][contentField]"
         ></div>
       </div>
     </div>
@@ -37,12 +37,12 @@
 <script setup name="AboutUs">
 import webFooter from "@/components/webFooter/index.vue";
 import request from "@/utils/request";
-import { banner } from "@/api/website/home/index";
-import { getAboutList } from "../../../api/website/aboutUs";
-import { useI18n } from "vue-i18n";
-import { computed, onMounted, reactive, ref } from "vue";
+import {banner} from "@/api/website/home/index";
+import {getAboutList} from "../../../api/website/aboutUs";
+import {useI18n} from "vue-i18n";
+import {computed, onMounted, reactive, ref} from "vue";
 
-const { t, locale } = useI18n();
+const {t, locale} = useI18n();
 const titleField = computed(() => {
   return locale.value === "zh" ? "title" : `${locale.value}Title`;
 });
@@ -69,23 +69,23 @@ const kindId = ref(0);
 function getData() {
   loading.value = true;
 
-  banner({ locals: "关于我们" })
-    .then((resp) => {
-      state.banner = resp.data[0].images;
-    })
-    .catch(() => {
-      loading.value = false;
-    });
+  banner({locals: "关于我们"})
+      .then((resp) => {
+        state.banner = resp.data[0].images;
+      })
+      .catch(() => {
+        loading.value = false;
+      });
   // 获取关于我们列表
   getAboutList()
-    .then((resp) => {
-      console.log("baout", resp);
-      state.data = resp.data;
-      loading.value = false;
-    })
-    .catch(() => {
-      loading.value = false;
-    });
+      .then((resp) => {
+        console.log("baout", resp);
+        state.data = resp.data;
+        loading.value = false;
+      })
+      .catch(() => {
+        loading.value = false;
+      });
 }
 
 onMounted(() => {
@@ -125,6 +125,10 @@ function handleActive(id) {
       background: #fff;
       padding: 20px 40px;
 
+      .html {
+        line-height: 1.5;
+      }
+
       h3 {
         font-weight: 600;
         text-align: center;
diff --git a/src/views/website/news/detail.vue b/src/views/website/news/detail.vue
index b880994..1ff379c 100644
--- a/src/views/website/news/detail.vue
+++ b/src/views/website/news/detail.vue
@@ -57,7 +57,7 @@ getNews()
     p.content {
       text-indent: 2em each-line;
       font-size: 16px;
-      line-height: 24px;
+      line-height: 1.5;
       margin: 0;
       padding: 24px;
     }
diff --git a/src/views/website/searchList/achievement.vue b/src/views/website/searchList/achievement.vue
index 283c199..6930740 100644
--- a/src/views/website/searchList/achievement.vue
+++ b/src/views/website/searchList/achievement.vue
@@ -1,42 +1,47 @@
 <template>
   <div class="index">
     <searchContainer
-      bannerKey="首页>成果库>成果列表"
-      :title="t('webSearch.achievementLibrary')"
-      @handleQuery="handleQuery"
+        bannerKey="首页>成果库>成果列表"
+        :title="t('webSearch.achievementLibrary')"
+        @handleQuery="handleQuery"
     >
       <template v-slot>
         <el-row type="flex" style="padding: 20px 0">
-          <div style="flex: 1">
-            <div style="position: relative">
-              <!-- <industrySelect @industryChange="industryChange"></industrySelect> -->
-              <div class="total">
-                {{ t("webSearch.findNum") }}
-                <span>{{ total }}</span>
-                {{ t("webSearch.findAchievementNum") }}
-              </div>
-              <div v-loading="loading">
-                <section v-for="item in searchResults" :key="item.id">
-                  <div style="border: 1px solid #dcdcdc; margin-bottom: 10px">
-                    <achievementItem :data="item"></achievementItem>
-                  </div>
-                </section>
-              </div>
+          <el-col :span="16">
+            <div style="flex: 1">
+              <div style="position: relative">
+                <!-- <industrySelect @industryChange="industryChange"></industrySelect> -->
+                <div class="total">
+                  {{ t("webSearch.findNum") }}
+                  <span>{{ total }}</span>
+                  {{ t("webSearch.findAchievementNum") }}
+                </div>
+                <div v-loading="loading">
+                  <section v-for="item in searchResults" :key="item.id">
+                    <div style="border: 1px solid #dcdcdc; margin-bottom: 10px">
+                      <achievementItem :data="item"></achievementItem>
+                    </div>
+                  </section>
+                </div>
 
-              <pagination
-                class="pagination"
-                :total="total"
-                :pageSizes="[10, 10 << 1, 10 << 2, 10 << 3]"
-                v-model:page="queryParams.pageNum"
-                v-model:limit="queryParams.pageSize"
-                :autoScroll="false"
-                @pagination="getDataList"
-              />
+                <pagination
+                    class="pagination"
+                    :total="total"
+                    :pageSizes="[10, 10 << 1, 10 << 2, 10 << 3]"
+                    v-model:page="queryParams.pageNum"
+                    v-model:limit="queryParams.pageSize"
+                    :autoScroll="false"
+                    @pagination="getDataList"
+                />
+              </div>
             </div>
-          </div>
-          <div class="r">
-            <webContact />
-          </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="r">
+              <webContact/>
+            </div>
+          </el-col>
+
         </el-row>
       </template>
     </searchContainer>
@@ -45,14 +50,14 @@
 
 <script setup name="SearchAchievement">
 import webContact from "@/components/webContact/index.vue";
-import { search } from "@/api/website/home/index";
+import {search} from "@/api/website/home/index";
 import searchContainer from "./components/searchContainer.vue";
 // import industrySelect from "./components/industrySelect.vue";
 import achievementItem from "./components/achievementItem";
-import { useRoute } from "vue-router";
-import { useI18n } from "vue-i18n";
+import {useRoute} from "vue-router";
+import {useI18n} from "vue-i18n";
 
-const { t } = useI18n();
+const {t} = useI18n();
 const loading = ref(true);
 const searchResults = ref([]);
 const total = ref(0);
diff --git a/src/views/website/searchList/achievementDetail.vue b/src/views/website/searchList/achievementDetail.vue
index fdf22c9..1b33094 100644
--- a/src/views/website/searchList/achievementDetail.vue
+++ b/src/views/website/searchList/achievementDetail.vue
@@ -46,13 +46,13 @@
                     {{ t("webSearch.achievementIntroduction") }}
                   </div>
                 </div>
-                <div class="html" v-html="state.expertDetail.description"></div>
+                <div style="text-indent: 2em" class="html" v-html="state.expertDetail.description"></div>
                 <div style="padding: 20px 0">
                   <div class="pointTit">
                     {{ t("webSearch.achievementLeadership") }}
                   </div>
                 </div>
-                <section>
+                <section style="text-indent: 2em">
                   <div>
                     {{
                       leadOptions.find(
@@ -66,7 +66,7 @@
                     {{ t("webSearch.cooperationMode") }}
                   </div>
                 </div>
-                <section>
+                <section style="text-indent: 2em">
                   <div>
                     {{
                       cooperationOptions.find(
@@ -80,7 +80,7 @@
                     {{ t("webSearch.applicationCustomers") }}
                   </div>
                 </div>
-                <section>
+                <section style="text-indent: 2em">
                   <div>
                     {{ state.expertDetail.customer }}
                   </div>
@@ -89,7 +89,7 @@
                 <div style="padding: 20px 0">
                   <div class="pointTit">{{ t("webSearch.unit") }}</div>
                 </div>
-                <section>
+                <section style="text-indent: 2em">
                   {{ state.expertDetail.unit }}
                 </section>
               </div>
@@ -297,7 +297,7 @@ function getDataList() {
   padding-left: 10px;
   font-size: 16px;
   font-family: Source Han Sans CN;
-  font-weight: 500;
+  font-weight: 700;
   color: #333333;
 
   &:before {
diff --git a/src/views/website/searchList/components/achievementItem.vue b/src/views/website/searchList/components/achievementItem.vue
index 9b31d89..db4d2ee 100644
--- a/src/views/website/searchList/components/achievementItem.vue
+++ b/src/views/website/searchList/components/achievementItem.vue
@@ -2,7 +2,7 @@
   <div class="box">
     <div class="wrap">
       <div v-if="data.image" class="img">
-        <el-image :src="data.image" alt="" style="height: 150px" />
+        <el-image :src="data.image" alt="" style="height: 150px"/>
       </div>
       <div v-else-if="data.type == 1" class="type">
         <!--产品-->
@@ -19,14 +19,14 @@
           {{
             t("admin.form.name", {
               type:
-                data.type == 2
-                  ? t("admin.common.achievement")
-                  : t("admin.form.product"),
+                  data.type == 2
+                      ? t("admin.common.achievement")
+                      : t("admin.form.product"),
             })
           }}：
           {{ data.title }}
         </div>
-        <slot name="des" />
+        <slot name="des"/>
         <div v-if="data.industryStr" class="line">
           {{ t("webSearch.industry") }}：
           <!-- <span>{{ data.industrys[data.industrys.length - 1] }}</span> -->
@@ -56,8 +56,8 @@
       <div>
         <div class="keywords">
           <wordcloud
-            v-if="data.keywords"
-            :data="createdData(data.keywords ?? [])"
+              v-if="data.keywords"
+              :data="createdData(data.keywords ?? [])"
           ></wordcloud>
         </div>
         <!-- <collectAndVisit
@@ -76,12 +76,12 @@
 // import { maturityOptions } from "@/utils/parameter";
 import wordcloud from "./wordcloud.vue";
 // import collectAndVisit from "./collectAndVisit.vue";
-import { useRoute, useRouter } from "vue-router";
-import { toRefs } from "vue";
-import { addViewHistory } from "@/utils/view_history";
-import { useI18n } from "vue-i18n";
+import {useRoute, useRouter} from "vue-router";
+import {toRefs} from "vue";
+import {addViewHistory} from "@/utils/view_history";
+import {useI18n} from "vue-i18n";
 
-const { t } = useI18n();
+const {t} = useI18n();
 const route = useRoute();
 
 const router = useRouter();
@@ -91,7 +91,7 @@ const props = defineProps({
     required: true,
   },
 });
-const { data } = toRefs(props);
+const {data} = toRefs(props);
 
 function handleDetail(id) {
   addViewHistory(2, id, data.value.title);
@@ -111,16 +111,16 @@ function handleDetail(id) {
       queryType: route.query.queryType,
     },
   });
-  router.push(routeData);
-  // window.open(routeData.href, "_blank");
+  // router.push(routeData);
+  window.open(routeData.href, "_blank");
 }
 
 function createdData(arr) {
   let l = [];
   let snap = JSON.parse(JSON.stringify(arr));
   snap.map((e) => {
-    l.push({ name: e, value: 30 });
-    return { name: e, value: 30 };
+    l.push({name: e, value: 30});
+    return {name: e, value: 30};
   });
   return l;
 }
diff --git a/src/views/website/searchList/components/expertItem.vue b/src/views/website/searchList/components/expertItem.vue
index 2860db4..0c37608 100644
--- a/src/views/website/searchList/components/expertItem.vue
+++ b/src/views/website/searchList/components/expertItem.vue
@@ -102,8 +102,8 @@ function handleDetail(id) {
       queryType: route.query.queryType,
     },
   });
-  router.push(routeData);
-  // window.open(routeData.href, "_blank");
+  // router.push(routeData);
+  window.open(routeData.href, "_blank");
 }
 
 function createdData(arr) {
diff --git a/src/views/website/searchList/components/gainItem.vue b/src/views/website/searchList/components/gainItem.vue
index 213cf75..8273b90 100644
--- a/src/views/website/searchList/components/gainItem.vue
+++ b/src/views/website/searchList/components/gainItem.vue
@@ -73,8 +73,8 @@ function handleDetail(id) {
       queryType: route.query.queryType,
     },
   });
-  // window.open(routeData.href, "_blank");
-  router.push(routeData);
+  window.open(routeData.href, "_blank");
+  // router.push(routeData);
 }
 
 function createdData(arr) {
diff --git a/src/views/website/searchList/components/laboratoryItem.vue b/src/views/website/searchList/components/laboratoryItem.vue
index a651918..3173599 100644
--- a/src/views/website/searchList/components/laboratoryItem.vue
+++ b/src/views/website/searchList/components/laboratoryItem.vue
@@ -8,7 +8,7 @@
       </div>
       <div class="content">
         <div class="tit" @click="handleDetail(data.id)">{{ data.name }}</div>
-        <slot name="des" />
+        <slot name="des"/>
 
         <div v-if="data.industryStr" class="line">
           <!--          所属领域-->
@@ -36,8 +36,8 @@
       <div>
         <div class="keywords">
           <wordcloud
-            v-if="data.keyword"
-            :data="createdData(data.keyword)"
+              v-if="data.keyword"
+              :data="createdData(data.keyword)"
           ></wordcloud>
         </div>
         <!-- <collectAndVisit
@@ -55,10 +55,10 @@
 <script setup name="LabItem">
 import wordcloud from "./wordcloud.vue";
 import collectAndVisit from "./collectAndVisit.vue";
-import { useRoute, useRouter } from "vue-router";
-import { useI18n } from "vue-i18n";
+import {useRoute, useRouter} from "vue-router";
+import {useI18n} from "vue-i18n";
 
-const { t } = useI18n();
+const {t} = useI18n();
 const router = useRouter();
 const route = useRoute();
 const props = defineProps({
@@ -76,8 +76,8 @@ function handleDetail(id) {
       queryType: route.query.queryType,
     },
   });
-  //   window.open(routeData.href, "_blank");
-  router.push(routeData);
+  window.open(routeData.href, "_blank");
+  // router.push(routeData);
 }
 
 function createdData(arr) {
@@ -86,8 +86,8 @@ function createdData(arr) {
   arr = arr ? arr.split(/[,\/]{1}/) : [];
   let snap = JSON.parse(JSON.stringify(arr));
   snap.map((e) => {
-    l.push({ name: e, value: 30 });
-    return { name: e, value: 30 };
+    l.push({name: e, value: 30});
+    return {name: e, value: 30};
   });
   return l;
 }
diff --git a/src/views/website/searchList/components/serviceDemandItem.vue b/src/views/website/searchList/components/serviceDemandItem.vue
index 53f2d42..e730a03 100644
--- a/src/views/website/searchList/components/serviceDemandItem.vue
+++ b/src/views/website/searchList/components/serviceDemandItem.vue
@@ -76,8 +76,8 @@ function handleDetail(id) {
       queryType: route.query.queryType,
     },
   });
-  // window.open(routeData.href, "_blank");
-  router.push(routeData);
+  window.open(routeData.href, "_blank");
+  // router.push(routeData);
 }
 
 function createdData(arr) {
diff --git a/src/views/website/searchList/components/technologyDemandItem.vue b/src/views/website/searchList/components/technologyDemandItem.vue
index 6616746..deb56e6 100644
--- a/src/views/website/searchList/components/technologyDemandItem.vue
+++ b/src/views/website/searchList/components/technologyDemandItem.vue
@@ -11,7 +11,7 @@
       </div>
       <div class="content">
         <div class="tit" @click="handleDetail(data.id)">{{ data.title }}</div>
-        <slot name="des" />
+        <slot name="des"/>
 
         <div v-if="data.industryStr" class="line">
           <!--          所属领域-->
@@ -43,8 +43,8 @@
       <div>
         <div class="keywords">
           <wordcloud
-            v-if="data.keywords"
-            :data="createdData(data.customers ?? [])"
+              v-if="data.keywords"
+              :data="createdData(data.customers ?? [])"
           ></wordcloud>
         </div>
         <!-- <collectAndVisit
@@ -60,15 +60,15 @@
 </template>
 
 <script setup>
-import { maturityOptions } from "@/utils/parameter";
+import {maturityOptions} from "@/utils/parameter";
 import wordcloud from "./wordcloud.vue";
 import collectAndVisit from "./collectAndVisit.vue";
-import { useRoute, useRouter } from "vue-router";
-import { useI18n } from "vue-i18n";
+import {useRoute, useRouter} from "vue-router";
+import {useI18n} from "vue-i18n";
 
 const router = useRouter();
 const route = useRoute();
-const { t } = useI18n();
+const {t} = useI18n();
 const props = defineProps({
   data: {
     type: Object,
@@ -84,15 +84,16 @@ function handleDetail(id) {
       queryType: route.query.queryType,
     },
   });
-  router.push(routeData);
+  // router.push(routeData);
+  window.open(routeData.href, "_blank")
 }
 
 function createdData(arr) {
   let l = [];
   let snap = JSON.parse(JSON.stringify(arr));
   snap.map((e) => {
-    l.push({ name: e, value: 30 });
-    return { name: e, value: 30 };
+    l.push({name: e, value: 30});
+    return {name: e, value: 30};
   });
   return l;
 }
diff --git a/src/views/website/searchList/enterpriseDetail.vue b/src/views/website/searchList/enterpriseDetail.vue
index 179c122..526ed09 100644
--- a/src/views/website/searchList/enterpriseDetail.vue
+++ b/src/views/website/searchList/enterpriseDetail.vue
@@ -95,7 +95,7 @@
                   {{ t("webSearch.companyIntroduction") }}
                 </div>
               </div>
-              <div class="html" v-html="state.companyDetail.introduce"></div>
+              <div style="text-indent: 2em" class="html" v-html="state.companyDetail.introduce"></div>
               <!-- <div style="padding: 20px 0">
                 <div class="pointTit">生产方向</div>
               </div>
@@ -114,7 +114,7 @@
                   {{ t("webSearch.contact") }}
                 </div>
               </div>
-              <section v-if="state.companyDetail.username">
+              <section style="text-indent: 2em" v-if="state.companyDetail.username">
                 {{ state.companyDetail.username }}
               </section>
               <div style="padding: 20px 0">
@@ -123,7 +123,7 @@
                   {{ t("webSearch.contactInformation") }}
                 </div>
               </div>
-              <section v-if="state.companyDetail.phone">
+              <section style="text-indent: 2em" v-if="state.companyDetail.phone">
                 {{ state.companyDetail.phone }}
               </section>
               <div style="padding: 20px 0">
@@ -132,7 +132,7 @@
                   {{ t("webSearch.email") }}
                 </div>
               </div>
-              <section v-if="state.companyDetail.email">
+              <section style="text-indent: 2em" v-if="state.companyDetail.email">
                 {{ state.companyDetail.email }}
               </section>
 
@@ -142,7 +142,7 @@
                   {{ t("webSearch.industry") }}
                 </div>
               </div>
-              <section v-if="state.companyDetail.industryStr">
+              <section style="text-indent: 2em" v-if="state.companyDetail.industryStr">
                 {{ state.companyDetail.industryStr }}
                 <!-- <div
                   v-for="(item, index) in state.companyDetail.directions"
@@ -152,21 +152,21 @@
                   {{ item }}
                 </div> -->
               </section>
-              <div style="padding: 20px 0">
-                <div class="pointTit">
-                  {{ t("webSearch.location") }}
-                </div>
-              </div>
-              <section>
-                {{ state.localtion }}
-              </section>
+<!--              <div style="padding: 20px 0">-->
+<!--                <div class="pointTit">-->
+<!--                  {{ t("webSearch.location") }}-->
+<!--                </div>-->
+<!--              </div>-->
+<!--              <section>-->
+<!--                {{ state.localtion }}-->
+<!--              </section>-->
               <div style="padding: 20px 0">
                 <div class="pointTit">
                   <!--                  详细地址-->
                   {{ t("webSearch.address") }}
                 </div>
               </div>
-              <section v-if="state.companyDetail.address">
+              <section style="text-indent: 2em" v-if="state.companyDetail.address">
                 {{ state.companyDetail.address }}
               </section>
               <div style="padding: 20px 0">
@@ -175,7 +175,7 @@
                   {{ t("webSearch.companyWebsite") }}
                 </div>
               </div>
-              <section v-if="state.companyDetail.url">
+              <section style="text-indent: 2em" v-if="state.companyDetail.url">
                 {{ state.companyDetail.url }}
               </section>
               <!-- <div style="padding: 20px 0">
@@ -348,11 +348,11 @@ function getDataList() {
   searchEnterpriseDetail(id)
     .then(async (resp) => {
       state.companyDetail = resp.data;
-      state.localtion = await getCity(
-        resp.data.province,
-        resp.data.city,
-        resp.data.district
-      );
+      // state.localtion = await getCity(
+      //   resp.data.province,
+      //   resp.data.city,
+      //   resp.data.district
+      // );
       loading.value = false;
     })
     .catch((err) => {
diff --git a/src/views/website/searchList/expertDetail.vue b/src/views/website/searchList/expertDetail.vue
index 6ef30ff..fdeb246 100644
--- a/src/views/website/searchList/expertDetail.vue
+++ b/src/views/website/searchList/expertDetail.vue
@@ -32,11 +32,11 @@
                   {{ t("admin.form.personalProfile") }}
                 </div>
               </div>
-              <div class="html" v-html="state.expertDetail.introduce"></div>
+              <div style="text-indent: 2em" class="html" v-html="state.expertDetail.introduce"></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">{{ t("input.gender") }}</div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 <div>
                   {{
                     state.expertDetail.gender == "1"
@@ -58,7 +58,7 @@
               <div style="padding: 20px 0">
                 <div class="pointTit">{{ t("admin.table.major") }}</div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 <div>
                   {{ state.expertDetail.major }}
                 </div>
@@ -68,7 +68,7 @@
                   {{ t("admin.table.graduateSchool") }}
                 </div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 <div>
                   {{ state.expertDetail.school }}
                 </div>
@@ -76,7 +76,7 @@
               <div style="padding: 20px 0">
                 <div class="pointTit">{{ t("webSearch.title") }}</div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 <div>
                   {{ state.expertDetail.title }}
                 </div>
@@ -86,7 +86,7 @@
                   {{ t("webSearch.industry") }}
                 </div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 <div>
                   {{ state.expertDetail.industryStr }}
                 </div>
@@ -96,7 +96,7 @@
                   {{ t("admin.table.highestEducation") }}
                 </div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 <div>
                   {{
                     educationOptions.find(
@@ -110,7 +110,7 @@
                   {{ t("webSearch.researchDirection") }}
                 </div>
               </div>
-              <section v-if="state.expertDetail.research">
+              <section style="text-indent: 2em" v-if="state.expertDetail.research">
                 <div
                     v-for="item in state.expertDetail.research?.split(',') ?? []"
                     class="describe"
@@ -121,7 +121,7 @@
               <div style="padding: 20px 0">
                 <div class="pointTit">{{ t("admin.form.workingTime") }}</div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 <div>
                   {{ state.expertDetail.workTime }}
                 </div>
@@ -137,7 +137,7 @@
               <div style="padding: 20px 0">
                 <div class="pointTit">{{ t("dict.patent") }}</div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 <div>
                   <ul class="patent-list">
                     <li v-for="patent in state.expertDetail.patentList??[]" :key="patent.id" class="patent-item">
@@ -164,7 +164,7 @@
               <div style="padding: 20px 0">
                 <div class="pointTit">{{ t("admin.common.paper") }}</div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 <div>
                   <ul class="patent-list">
                     <li v-for="paper in state.expertDetail.paperList" :key="paper.id"
@@ -649,7 +649,8 @@ function getDataList() {
   // }
   .patent-list {
     .patent-item {
-      list-style: disc;
+      list-style: circle;
+      list-style-position: inside;
       line-height: 24px;
     }
   }
@@ -659,8 +660,8 @@ function getDataList() {
   position: relative;
   padding-left: 10px;
   font-size: 16px;
-  font-family: Source Han Sans CN;
-  font-weight: 500;
+  font-family: Source Han Sans CN, sans-serif;
+  font-weight: 700;
   color: #333333;
 
   &:before {
diff --git a/src/views/website/searchList/laboratoryDetail.vue b/src/views/website/searchList/laboratoryDetail.vue
index bcea894..fc5f9b9 100644
--- a/src/views/website/searchList/laboratoryDetail.vue
+++ b/src/views/website/searchList/laboratoryDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div v-loading="loading">
     <searchContainer
-      bannerKey="首页>实验室库>实验室详情"
-      :title="t('webSearch.labLibrary')"
-      @handleQuery="handleQuery"
+        bannerKey="首页>实验室库>实验室详情"
+        :title="t('webSearch.labLibrary')"
+        @handleQuery="handleQuery"
     >
       <template v-slot>
         <div class="head">
@@ -53,8 +53,8 @@
                     {{ t("admin.form.labWebsite") }}
                     ：
                     <a :href="state.LabDetail.url" target="_blank">{{
-                      state.LabDetail.url
-                    }}</a>
+                        state.LabDetail.url
+                      }}</a>
                   </div>
                   <div class="line">
                     {{ t("webSearch.institute") }}：
@@ -65,8 +65,8 @@
                 </div>
                 <div class="keywords" style="flex: 1">
                   <wordcloud
-                    v-if="state.LabDetail.keyword"
-                    :data="
+                      v-if="state.LabDetail.keyword"
+                      :data="
                       createdData(state.LabDetail.keyword.split(/[,\/]{1}/))
                     "
                   ></wordcloud>
@@ -90,23 +90,23 @@
                   {{ t("webSearch.labIntroduction") }}
                 </div>
               </div>
-              <div class="html" v-html="state.LabDetail.introduction"></div>
+              <div style="text-indent: 2em" class="html" v-html="state.LabDetail.introduction"></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">
                   <!--                  核心成员及简介-->
                   {{ t("webSearch.coreMembers") }}
                 </div>
               </div>
-              <div class="html" v-html="state.LabDetail.member"></div>
+              <div style="text-indent: 2em" class="html" v-html="state.LabDetail.member"></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">
                   <!--                  研究方向-->
                   {{ t("webSearch.researchDirection") }}
                 </div>
               </div>
-              <div
-                class="html"
-                v-html="state.LabDetail.researchDirection"
+              <div style="text-indent: 2em"
+                   class="html"
+                   v-html="state.LabDetail.researchDirection"
               ></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">
@@ -114,8 +114,8 @@
                   {{ t("webSearch.technicalApplication") }}
                 </div>
               </div>
-              <div
-                v-html="
+              <div style="text-indent: 2em"
+                   v-html="
                   state.LabDetail.primaryTechnology?.replaceAll(`/`, `<br />`)
                 "
               ></div>
@@ -125,8 +125,8 @@
                   {{ t("webSearch.researchProject") }}
                 </div>
               </div>
-              <div
-                v-html="
+              <div style="text-indent: 2em"
+                   v-html="
                   state.LabDetail.researchProject?.replaceAll('/', `</br>`)
                 "
               ></div>
@@ -136,8 +136,8 @@
                   {{ t("webSearch.representativeAchievements") }}
                 </div>
               </div>
-              <div
-                v-html="state.LabDetail.achievement?.replaceAll('/', `</br>`)"
+              <div style="text-indent: 2em"
+                   v-html="state.LabDetail.achievement?.replaceAll('/', `</br>`)"
               ></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">
@@ -145,11 +145,11 @@
                   {{ t("webSearch.industryField") }}
                 </div>
               </div>
-              <div>{{ state.LabDetail.industryStr }}</div>
+              <div style="text-indent: 2em">{{ state.LabDetail.industryStr }}</div>
             </div>
           </div>
           <div class="r">
-            <webContact />
+            <webContact/>
           </div>
         </el-row>
       </template>
@@ -161,16 +161,16 @@
 <script setup>
 import webContact from "@/components/webContact/index.vue";
 // import request from "@/utils/request";
-import { searchLaboratoryDetail } from "@/api/website/home";
-import { onMounted, reactive, ref } from "vue";
+import {searchLaboratoryDetail} from "@/api/website/home";
+import {onMounted, reactive, ref} from "vue";
 import searchContainer from "./components/searchContainer.vue";
 import wordcloud from "./components/wordcloud.vue";
 // import productItem from "./components/productItem.vue";
-import { useRoute, useRouter } from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import docking from "./components/docking.vue";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
 
-const { t } = useI18n();
+const {t} = useI18n();
 const showDocking = ref(false);
 const router = useRouter();
 const route = useRoute();
@@ -198,8 +198,8 @@ function createdData(arr) {
   let l = [];
   let snap = JSON.parse(JSON.stringify(arr));
   snap.map((e) => {
-    l.push({ name: e, value: 30 });
-    return { name: e, value: 30 };
+    l.push({name: e, value: 30});
+    return {name: e, value: 30};
   });
   return l;
 }
@@ -215,7 +215,7 @@ function createdData(arr) {
 function handleList(mode, keyword) {
   router.push({
     path: `/searchList/${mode}`,
-    query: { keyword, queryType: route.query.queryType },
+    query: {keyword, queryType: route.query.queryType},
   });
 }
 
@@ -238,24 +238,24 @@ function getDataList() {
   let id = route.params.id;
   if (!id) return;
   searchLaboratoryDetail(id)
-    .then((resp) => {
-      const data = resp.data;
-      data.introduction = data.introduction
-        ?.replaceAll("\n", "</br>")
-        ?.replaceAll(" ", "&ensp;");
-      data.member = data.member
-        ?.replaceAll("\n", "</br>")
-        ?.replaceAll(" ", "&ensp;");
-      data.researchDirection = data.researchDirection
-        ?.replaceAll("/", "</br>")
-        ?.replaceAll(" ", "&ensp;");
-      state.LabDetail = resp.data;
-      loading.value = false;
-    })
-    .catch((err) => {
-      console.log(err);
-      loading.value = false;
-    });
+      .then((resp) => {
+        const data = resp.data;
+        data.introduction = data.introduction
+            ?.replaceAll("\n", "</br>")
+            ?.replaceAll(" ", "&ensp;");
+        data.member = data.member
+            ?.replaceAll("\n", "</br>")
+            ?.replaceAll(" ", "&ensp;");
+        data.researchDirection = data.researchDirection
+            ?.replaceAll("/", "</br>")
+            ?.replaceAll(" ", "&ensp;");
+        state.LabDetail = resp.data;
+        loading.value = false;
+      })
+      .catch((err) => {
+        console.log(err);
+        loading.value = false;
+      });
 }
 </script>
 
@@ -302,7 +302,7 @@ function getDataList() {
   padding-left: 10px;
   font-size: 16px;
   font-family: Source Han Sans CN;
-  font-weight: 500;
+  font-weight: 700;
   color: #333333;
 
   &:before {
diff --git a/src/views/website/searchList/patentDetail.vue b/src/views/website/searchList/patentDetail.vue
index 31a0dcb..6d84805 100644
--- a/src/views/website/searchList/patentDetail.vue
+++ b/src/views/website/searchList/patentDetail.vue
@@ -87,14 +87,14 @@
                   {{ t("webSearch.patentAbstract") }}
                 </div>
               </div>
-              <div class="html" v-html="state.patentDetail.description"></div>
+              <div style="text-indent: 2em" class="html" v-html="state.patentDetail.description"></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">
                   <!--                  主权项-->
                   {{ t("webSearch.sovereignItem") }}
                 </div>
               </div>
-              <div
+              <div style="text-indent: 2em"
                 class="html"
                 v-html="state.patentDetail.principalClaim"
               ></div>
@@ -104,14 +104,14 @@
                   {{ t("webSearch.inventor") }}
                 </div>
               </div>
-              <div class="html" v-html="state.patentDetail.inventor"></div>
+              <div style="text-indent: 2em" class="html" v-html="state.patentDetail.inventor"></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">
                   <!--                  IPC分类号-->
                   {{ t("webSearch.ipc") }}
                 </div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 {{ state.patentDetail.ipcCode }}
               </section>
               <div style="padding: 20px 0">
@@ -120,7 +120,7 @@
                   {{ t("webSearch.patentType") }}
                 </div>
               </div>
-              <section>
+              <section style="text-indent: 2em">
                 {{
                   patentOptions.find(
                     (el) => el.key == state.patentDetail.kind
@@ -133,21 +133,21 @@
                   {{ t("webSearch.publicationDate") }}
                 </div>
               </div>
-              <section>{{ state.patentDetail.openAt }}</section>
+              <section style="text-indent: 2em">{{ state.patentDetail.openAt }}</section>
               <div style="padding: 20px 0">
                 <div class="pointTit">
                   <!--                  公开号-->
                   {{ t("webSearch.publicationNumber") }}
                 </div>
               </div>
-              <section>{{ state.patentDetail.openCode }}</section>
+              <section style="text-indent: 2em">{{ state.patentDetail.openCode }}</section>
               <div style="padding: 20px 0">
                 <div class="pointTit">
                   <!--                  申请人地址-->
                   {{ t("webSearch.applicantAddress") }}
                 </div>
               </div>
-              <section>{{ state.patentDetail.applyAddress }}</section>
+              <section style="text-indent: 2em">{{ state.patentDetail.applyAddress }}</section>
               <!-- <section v-if="state.patentDetail.directions">
                 <div
                   v-for="(item, index) in state.patentDetail.directions"
@@ -401,7 +401,7 @@ function getDataList() {
   padding-left: 10px;
   font-size: 16px;
   font-family: Source Han Sans CN;
-  font-weight: 500;
+  font-weight: 700;
   color: #333333;
   &:before {
     content: "";
diff --git a/src/views/website/searchList/productDetail.vue b/src/views/website/searchList/productDetail.vue
index 96b3008..e06194b 100644
--- a/src/views/website/searchList/productDetail.vue
+++ b/src/views/website/searchList/productDetail.vue
@@ -311,7 +311,7 @@ function getDataList() {
   padding-left: 10px;
   font-size: 16px;
   font-family: Source Han Sans CN;
-  font-weight: 500;
+  font-weight: 700;
   color: #333333;
 
   &:before {
diff --git a/src/views/website/searchList/serviceDemandDetail.vue b/src/views/website/searchList/serviceDemandDetail.vue
index 7704c07..8c50ce6 100644
--- a/src/views/website/searchList/serviceDemandDetail.vue
+++ b/src/views/website/searchList/serviceDemandDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div v-loading="loading">
     <searchContainer
-      bannerKey="首页>服务需求库>服务需求详情"
-      :title="t('webSearch.serviceDemandLibrary')"
-      @handleQuery="handleQuery"
+        bannerKey="首页>服务需求库>服务需求详情"
+        :title="t('webSearch.serviceDemandLibrary')"
+        @handleQuery="handleQuery"
     >
       <template v-slot>
         <div class="head">
@@ -28,7 +28,7 @@
               <div class="item">
                 <el-row type="flex" style="padding: 40px 20px">
                   <div class="img">
-                    <img :src="state.demandDetail.image" alt />
+                    <img :src="state.demandDetail.image" alt/>
                   </div>
                   <div class="content">
                     <div class="tit">
@@ -70,8 +70,8 @@
                   </div>
                   <div class="keywords" style="flex: 1">
                     <wordcloud
-                      v-if="state.demandDetail.keywords"
-                      :data="createdData(state.demandDetail.keywords)"
+                        v-if="state.demandDetail.keywords"
+                        :data="createdData(state.demandDetail.keywords)"
                     ></wordcloud>
                   </div>
                   <div class="btns">
@@ -94,16 +94,16 @@
                     {{ t("webSearch.demandDescription") }}
                   </div>
                 </div>
-                <div class="html" v-html="state.demandDetail.description"></div>
+                <div style="text-indent: 2em" class="html" v-html="state.demandDetail.description"></div>
                 <div style="padding: 20px 0">
                   <div class="pointTit">
                     <!--                  主要应用-->
                     {{ t("webSearch.mainApplication") }}
                   </div>
                 </div>
-                <div
-                  class="html"
-                  v-html="state.demandDetail.principalClaim"
+                <div style="text-indent: 2em"
+                     class="html"
+                     v-html="state.demandDetail.principalClaim"
                 ></div>
                 <!-- <section v-if="state.demandDetail.directions">
                     <div
@@ -172,7 +172,7 @@
           </el-col>
           <el-col :span="8">
             <div class="r">
-              <webContact />
+              <webContact/>
             </div>
           </el-col>
         </el-row>
@@ -185,20 +185,20 @@
 <script setup>
 import webContact from "@/components/webContact/index.vue";
 import request from "@/utils/request";
-import { searchServiceDemandDetail } from "@/api/website/home";
-import { onMounted, reactive, ref } from "vue";
+import {searchServiceDemandDetail} from "@/api/website/home";
+import {onMounted, reactive, ref} from "vue";
 import searchContainer from "./components/searchContainer.vue";
 import wordcloud from "./components/wordcloud.vue";
 import productItem from "./components/productItem.vue";
-import { useRoute, useRouter } from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import docking from "./components/docking.vue";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
 
 const showDocking = ref(false);
 const router = useRouter();
 const route = useRoute();
 const loading = ref(true);
-const { t } = useI18n();
+const {t} = useI18n();
 const state = reactive({
   pageNum: 1,
   pageSize: 4,
@@ -222,8 +222,8 @@ function createdData(arr) {
   let l = [];
   let snap = JSON.parse(JSON.stringify(arr));
   snap.map((e) => {
-    l.push({ name: e, value: 30 });
-    return { name: e, value: 30 };
+    l.push({name: e, value: 30});
+    return {name: e, value: 30};
   });
   return l;
 }
@@ -231,7 +231,7 @@ function createdData(arr) {
 function handleList(mode, keyword) {
   router.push({
     path: `/searchList/${mode}`,
-    query: { keyword, queryType: route.query.queryType },
+    query: {keyword, queryType: route.query.queryType},
   });
 }
 
@@ -254,14 +254,14 @@ function getDataList() {
   let id = route.params.id;
   if (!id) return;
   searchServiceDemandDetail(id)
-    .then((resp) => {
-      state.demandDetail = resp.data;
-      loading.value = false;
-    })
-    .catch((err) => {
-      console.log(err);
-      loading.value = false;
-    });
+      .then((resp) => {
+        state.demandDetail = resp.data;
+        loading.value = false;
+      })
+      .catch((err) => {
+        console.log(err);
+        loading.value = false;
+      });
   //   searchdemandDetail(id)
   //     .then((resp) => {})
   //     .catch((err) => {
@@ -318,8 +318,8 @@ function getDataList() {
   position: relative;
   padding-left: 10px;
   font-size: 16px;
-  font-family: Source Han Sans CN;
-  font-weight: 500;
+  font-family: Source Han Sans CN, sans-serif;
+  font-weight: 700;
   color: #333333;
 
   &:before {
diff --git a/src/views/website/searchList/technologyDemandDetail.vue b/src/views/website/searchList/technologyDemandDetail.vue
index bd2a5d9..4ce0491 100644
--- a/src/views/website/searchList/technologyDemandDetail.vue
+++ b/src/views/website/searchList/technologyDemandDetail.vue
@@ -91,21 +91,21 @@
                     {{ t("webSearch.industry") }}
                   </div>
                 </div>
-                <div>{{ state.demandDetail.industryStr }}</div>
+                <div style="text-indent: 2em">{{ state.demandDetail.industryStr }}</div>
                 <div style="padding: 20px 0">
                   <div class="pointTit">
                     <!--                  需求描述-->
                     {{ t("webSearch.demandDescription") }}
                   </div>
                 </div>
-                <div class="html" v-html="state.demandDetail.introduce"></div>
+                <div style="text-indent: 2em" class="html" v-html="state.demandDetail.introduce"></div>
                 <div style="padding: 20px 0">
                   <div class="pointTit">
                     <!--                  所在地-->
                     {{ t("webSearch.location") }}
                   </div>
                 </div>
-                <section>
+                <section style="text-indent: 2em">
                   {{ state.localtion }}
                 </section>
               </div>
@@ -269,7 +269,7 @@ function getDataList() {
   padding-left: 10px;
   font-size: 16px;
   font-family: Source Han Sans CN;
-  font-weight: 500;
+  font-weight: 700;
   color: #333333;
 
   &:before {
diff --git a/src/views/website/solution/components/seeMore.vue b/src/views/website/solution/components/seeMore.vue
index 2e2ab40..abc1971 100644
--- a/src/views/website/solution/components/seeMore.vue
+++ b/src/views/website/solution/components/seeMore.vue
@@ -3,8 +3,8 @@
     <el-breadcrumb separator="/">
       <el-breadcrumb-item>
         <span class="_one" @click="handleShow()" style="cursor: pointer">{{
-          t("solution.solution")
-        }}</span>
+            t("solution.solution")
+          }}</span>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <span class="_one">{{ oneLevelTitle[titleField] }}</span>
@@ -17,9 +17,10 @@
       <ul class="_list" v-loading="loading">
         <li v-for="item in props.data" :key="item" @click="handlePath(item.id)">
           <el-image
-            style="width: 100%; height: 135px"
-            :src="item.image"
-            fit="cover"
+              v-if="item.image"
+              style="width: 100%; height: 135px"
+              :src="resolveStaticUrl(item.image)"
+              fit="cover"
           ></el-image>
           <div class="_head text_hidden">{{ item.title }}</div>
           <div class="_detail text_hidden">{{ item.description }}</div>
@@ -40,18 +41,19 @@
 </template>
 <script setup>
 // import request from "@/utils/request";
-import { useRouter } from "vue-router";
-import { useI18n } from "vue-i18n";
-import { computed } from "vue";
+import {useRouter} from "vue-router";
+import {useI18n} from "vue-i18n";
+import {computed} from "vue";
+import {resolveStaticUrl} from "@/utils/url";
 
 const router = useRouter();
-const { t, locale } = useI18n();
+const {t, locale} = useI18n();
 const titleField = computed(() =>
-  locale.value === "zh" ? "title" : `${locale.value}Title`
+    locale.value === "zh" ? "title" : `${locale.value}Title`
 );
 
 function handlePath(id) {
-  let routeData = router.resolve({ path: `/solution/detail/${id}/` });
+  let routeData = router.resolve({path: `/solution/detail/${id}/`});
   window.open(routeData.href, "_blank");
 }
 
diff --git a/src/views/website/solution/detail.vue b/src/views/website/solution/detail.vue
index 9553fb7..f598d27 100644
--- a/src/views/website/solution/detail.vue
+++ b/src/views/website/solution/detail.vue
@@ -13,13 +13,14 @@
           </el-breadcrumb-item>
         </el-breadcrumb>
       </div>
+      <img v-if="state.data.image" class="cover-image" :src="resolveStaticUrl(state.data.image)"/>
       <div class="content">
         <div class="title">
           <div>{{ state.data[titleField] }}</div>
 
           <div class="description">
             <span class="visits"
-              >{{ t("solution.pageviews") }}：{{ state.data.visits }}</span
+            >{{ t("solution.pageviews") }}：{{ state.data.visits }}</span
             >
             <span>{{ parseTime(state.data.created_at) }}</span>
           </div>
@@ -33,28 +34,30 @@
 </template>
 
 <script setup>
-import { computed, nextTick, onMounted } from "vue";
+import {computed, nextTick, onMounted} from "vue";
 import seeMore from "./components/seeMore.vue";
-import { getInfo } from "@/api/website/solution/index";
+import {getInfo} from "@/api/website/solution";
 import webFooter from "@/components/webFooter/index.vue";
 import request from "@/utils/request";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
+import {resolveStaticUrl} from "@/utils/url";
+import {parseTime} from "../../../utils/ruoyi";
 
-const { t, locale } = useI18n();
+const {t, locale} = useI18n();
 
 const titleField = computed(() =>
-  locale.value === "zh" ? "title" : `${locale.value}Title`
+    locale.value === "zh" ? "title" : `${locale.value}Title`
 );
 
 const contentField = computed(() =>
-  locale.value === "zh" ? "content" : `${locale.value}Content`
+    locale.value === "zh" ? "content" : `${locale.value}Content`
 );
 
 function detail(id) {
   return request({
     url: "/v1/service/solution_case/detail",
     method: "post",
-    data: { id },
+    data: {id},
   });
 }
 
@@ -74,14 +77,14 @@ onMounted(() => {
 function getData() {
   let id = route.params.id;
   if (!id) return;
-  getInfo({ id })
-    .then((resp) => {
-      state.data = resp.data;
-      loading.value = false;
-    })
-    .catch(() => {
-      loading.value = false;
-    });
+  getInfo({id})
+      .then((resp) => {
+        state.data = resp.data;
+        loading.value = false;
+      })
+      .catch(() => {
+        loading.value = false;
+      });
 }
 </script>
 
@@ -112,6 +115,12 @@ function getData() {
     }
   }
 
+  .cover-image {
+    width: 100%;
+    aspect-ratio: 4/1;
+    object-fit: cover;
+  }
+
   .content {
     background: #fff;
     margin-bottom: 40px;
@@ -121,6 +130,10 @@ function getData() {
       padding: 30px 40px;
     }
 
+    .html {
+      line-height: 1.5;
+    }
+
     .title {
       font-size: 18px;
       font-family: Source Han Sans CN;
diff --git a/vite.config.js b/vite.config.js
index 79c263d..c3de321 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -33,7 +33,7 @@ export default defineConfig(({mode, command}) => {
                 "/dev-api": {
                     // target: "http://101.34.131.16:1618",
                     // target: "http://129.211.170.150/api",
-                    target: "http://192.168.0.200:1619",
+                    target: "http://127.0.0.1:1619",
                     // target: 'http://172.18.3.127:1618',
                     changeOrigin: true,
                     rewrite: (p) => p.replace(/^\/dev-api/, ""),