From 6a14f15880919c297bdf0feb223c910d05e2d2a9 Mon Sep 17 00:00:00 2001
From: ailanyin <ailanyin4j@163.com>
Date: Fri, 21 Jul 2023 16:43:36 +0800
Subject: [PATCH] bugfix

---
 src/api/admin/laboratory/achievement.js       |   31 +-
 src/api/admin/laboratory/expert.js            |    2 +-
 src/api/admin/research/achievement.js         |   27 +-
 src/assets/achievement_import_description.txt |   22 +
 src/assets/achievement_import_template.xlsx   |  Bin 0 -> 4654 bytes
 src/components/ImageUpload/index.vue          |  105 +-
 src/router/index.js                           | 2005 +++++++++--------
 src/views/admin/agent/account/basic-info.vue  |   25 -
 .../laboratory/research/achievement/index.vue |  258 ++-
 .../research/research/achievement/index.vue   |  249 +-
 src/views/components/AgentForm/index.vue      |   78 +-
 src/views/website/home/comp/index3.vue        |   74 +-
 vite.config.js                                |    4 +-
 13 files changed, 1583 insertions(+), 1297 deletions(-)
 create mode 100644 src/assets/achievement_import_description.txt
 create mode 100644 src/assets/achievement_import_template.xlsx

diff --git a/src/api/admin/laboratory/achievement.js b/src/api/admin/laboratory/achievement.js
index 03445d3..3f3580b 100644
--- a/src/api/admin/laboratory/achievement.js
+++ b/src/api/admin/laboratory/achievement.js
@@ -1,17 +1,28 @@
 import request from "@/utils/request";
 
-// 实验室专利成果
+// 专家成果
 export const achievementList = (params) => {
-  return request({
-    url: `/app/laboratory/achievementList`,
-    method: "GET",
-    params,
-  });
+    return request({
+        url: `/app/laboratory/achievementList`,
+        method: "GET",
+        params,
+    });
 };
 
+// 实验室成果
+export const laboratoryAchievementList = (params) => {
+    return request({
+        url: `/app/laboratory/laboratoryAchievementList`,
+        method: "GET",
+        params,
+    });
+}
+
 export const deleteAchievements = (ids) => {
-  return request({
-    url: `/app/laboratory/deleteAchievements/${ids}`,
-    method: "DELETE",
-  });
+    return request({
+        url: `/app/laboratory/deleteAchievements/${ids}`,
+        method: "DELETE",
+    });
 };
+
+
diff --git a/src/api/admin/laboratory/expert.js b/src/api/admin/laboratory/expert.js
index 3f8e5c8..ef32a18 100644
--- a/src/api/admin/laboratory/expert.js
+++ b/src/api/admin/laboratory/expert.js
@@ -40,7 +40,7 @@ export const deleteLabPatentByIds = (ids) => {
 
 
 /**
- * 实验室专利列表
+ * 实验室未绑定专家列表
  * @param params
  * @return {*}
  */
diff --git a/src/api/admin/research/achievement.js b/src/api/admin/research/achievement.js
index 10d08e5..9ecedee 100644
--- a/src/api/admin/research/achievement.js
+++ b/src/api/admin/research/achievement.js
@@ -2,16 +2,25 @@ import request from "@/utils/request";
 
 // 实验室专利成果
 export const achievementList = (params) => {
-  return request({
-    url: `/app/research/achievementList`,
-    method: "GET",
-    params,
-  });
+    return request({
+        url: `/app/research/achievementList`,
+        method: "GET",
+        params,
+    });
 };
 
+// 科研成果
+export const researchAchievementList = (params) => {
+    return request({
+        url: `/app/research/researchAchievementList`,
+        method: "GET",
+        params,
+    });
+}
+
 export const deleteAchievements = (ids) => {
-  return request({
-    url: `/app/research/deleteAchievements/${ids}`,
-    method: "DELETE",
-  });
+    return request({
+        url: `/app/research/deleteAchievements/${ids}`,
+        method: "DELETE",
+    });
 };
diff --git a/src/assets/achievement_import_description.txt b/src/assets/achievement_import_description.txt
new file mode 100644
index 0000000..b59608e
--- /dev/null
+++ b/src/assets/achievement_import_description.txt
@@ -0,0 +1,22 @@
+1. ʡ�����ͺ�̨��Ӧ(����: ����,����д�ɰ���ʡ, �Ϸ��в���д�ɺϷ�)
+
+2. ��������
+	a. ͨ�� > ����
+		��������ҽҩ>��ҩ����Ȼҩ��>����ҩ���з�����
+	b. ���ͨ�� / ����
+		��������ҽҩ>��ҩ����Ȼҩ��>����ҩ���з�����/�߼�������>֪ʶ��Ȩ��ɹ�ת������
+		
+3. Ӧ�ÿͻ�
+	���ͨ�� , (Ӣ�Ķ���) ����
+	
+4. �ؼ���
+	���ͨ�� , (Ӣ�Ķ���) ����
+	
+5. �ɹ������:
+	�����з� С�Խ׶� ͨ��С�� ���Խ׶� ͨ������ �ɹ�ģ����
+
+6. �ɹ�������:
+	�����Ƚ� �������� �����Ƚ� ��������
+
+7. ����ģʽ:
+	����ת�� �������� ������� �������� ���� ��˾ �������� �г��ƹ� ����
\ No newline at end of file
diff --git a/src/assets/achievement_import_template.xlsx b/src/assets/achievement_import_template.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d151d8935a29c62620fc410911e75689e71d9966
GIT binary patch
literal 4654
zcmaJ^2RIz+(#Gnmlhq?ykmv-_Yp{qKy^E4)tH!EPj_AFUgpHD;2hq#Xm*{m9B~e3g
z^cKXwE9d?k_a?K?w&&TI{pS7NnR!P;1%OF`hKq}fCa%1%i+07xk)Ms^oSodQo!rfI
zpb%>}6K*d@hxbVz9=7w6C<L(XfLNUjZiQrcwp!sOvor7_61xhmjBXz8A4ZLW!nIg5
zR(m~{2P7t$@4o5Duk6HUrrvzYSBwplE@%{TGL5YHs13b~5B?&kzgZ3%i0ttaoWjlx
zGNK=csc}pzD;IVWz1=~l*P~$&Q}T^+qn73}kJ<6&t&Q((2;olV@Cn;qL8sOKq%*zQ
zY`bPCjXS}vlm#x$lH}()41FX&W&ieGV5$DCh;G7$b*J`6WIL203thg;&6KZH1ZmDG
z`h}x4-!>U~PHS0sj=%jtVnCJH>NmjAu}45p3kIpzffGuK+z>C`u`_Jz{lzIB>E&)j
zZ_&^5l@?;P)GYs^e@m*4f+;8;#OF~B12KJ@q!8HDN#O|sE-M-NSbo1RZC1C4=~W`i
z`!|K(#=`u}N$1j0`p{-T+o3|j+0HT9<8veG05lC19Ng}p)j1V(G_)j4H01YR-31VN
z7iO;34sJZ$sMnH&)~D^f1fgb~E3+aS=24n8sr)OBQGcTg8Y!z<en5OmX*%oUHd4W-
zU1w+UJI5LElzO4uq{;p2O`ykU5X|o5F@n}hQlj{8=^L#pka;C+rgr}tKNwz~Q&MXI
z><$wM5Uf-`S&s<BNC_qH{In{9lVrGT%2vgEkSpxyQ?#p&oh2|nObu78!S-mIPNYg>
zI~#!dTHMTxD2a}hZ^2tC-Ay5KFaszUz?;+1n$|0hJzX3a1SZu~S6i&@KoK$1cg8V$
z=l?Vos5juP$Xay<PsYLkc%l@iFjL&sN(O`<1`3;kDDS2PWai2kzr%(E`HRQSRvNC(
z5H}tR2n0n^wU}1?HeM3>&7gA<SLYgUl6b+qTS06-L&UhN6WAGQO1i6GGZVeDsF$~O
zYQ8Hp@>x^9O>U@<$LI+i9<EG|J;@X8edsLwREg2j@`XVX&XVpx-!^94M%3(LeV<MW
z2a9uU$6g4p+Q9sMM5>}CLbx9tVx3FceaAmgt4Ok|)1X~J_HdXYm&!>G>%1xGb?}di
z%NBA9W=upLw-)*Q^<|S@O~}gG)f$zNW84(DgO>tXc8g7FBlB-_Hg5Gk&lWLP*ydvC
zu0|Lu!RXItt72}9)v)-y?CdG6#*u(M+p;Ln@8T?=3XIn!%rDxOYxpq0i?2z=`oKQB
zt83m-Te&-Lzx;3_FcyHBBzPOL`gFQ`MTAl2AX@=WZlQH#*#zP<@l(u-D}w>FH0l{?
zU>Z#L{6K*knr+QL7Yp5;{f#lfWK=T2;eq8@@eD#ilXIT~Sq*yRsC1uZ<on*C<aX?U
zk8bpzRrm^}9j}o=wCTr<y-7$Zz!*2BjGr!wK{<KKKG8ej8zxap^y5!xb*<i)`Y5iq
zIC;u>Dr)rEI9JwN`lMkk-RSk*or2|Maug|+0P_#AkOfnYeEu3kDkO$p4m^)tEuKAb
zvUU5<2R;;(tWhc`a!4NrJ;SZ6AvXyN$)BN6&&I*+M^I!C3$z{_VH-=%F6=Lm3h%R~
z++zbyJ`9El+P36(ww>%Ziks676#Uq7@J!c#FB$&Cj&aP80M-`>OXQ{m_xtlJ>e225
zy_%VQ=+d4!@hquru@Ms{dPewV3xGO&u_<N4Gvv{Ne@g(0pNDs|vv9S3tnKcK$^dn6
zkKtBuJ1-T^R>K#uq-m3CMy3%PoL06W9Cj09puJ(Hj<~MH8`${GZzaVJIFqCKUK)k%
zsZTy_aIF_+7w?lDHGfWBWMJ~--fM=$a1~O^W0X7~$4z5@pvNqMmqo|0u^vqHX_kz`
zI>-_cqMY3X#LTp_6_Px4s)~5vLXbnIK`lUhD>ov-BVCAqJW=)`p-QTOrlEwA8t{Wj
zp=IBmq=Rs#k4EY}j5wuxEc{7z{zCYv3;H1h;gA_l^dDUQ`L&x%qXp42NhV^a(5egq
zD1{@9dXRY7u|q;#na4?+2r<uEV2jBapayU8+3Ope%piNoD6bv;!L=lSuv>m|c5^0o
z8|Tg4*pmoCQ{7gF`-k7m2AW>DYrfxU_Fc~16mG$e3{Wsb;f(f|Z_aHbL9l+?ISBv3
z*&XU&eF5-Bs*H0cFGcre;sHJ9XFZIK`YH_Xw2rC|-2J&G^j^>Jolt*#h;z1A>5`!J
zWCSq=mfRzglA1l=WH4`GIi6w1f}%Orwgu%=(t^?K$06(Z-~IIb5F-scXARQ`<-h!h
z&BL{`IqaM_Aek)rf6MT@<zP!c%X?(Vzm{LG(w7~0uPZWFsiJ>bG(L)%%S{{(Hk5nn
zA#F57sMg!~=qO2<=LtNi4$4BTTATF3&Eq{8m^_9sYKX#p%?-{HQaGr()wEp6m}soZ
z`0}_T%DXs`F8QE`rI<|ee8mkLj`3IKyxKcMKH@HpI+Cw5FNfpUcLNQ8G<Ss=yS;=7
zH8gZ^TWv~DR6N@E26-~nfSuyCe;k5^|Mq%K43fy}HI}x2DZN{I_~wz^Jda^fE|6wG
z^bb|94~g?sB2zRWwTBXOiYI+O4$30aX0!pN;Voy{E6-yr%JIlITik)ODpMN)#|iHw
zc(zpiJa*Mx+d^ejKNGnU*Jm^s$&^Sw4|a8Kk;Ai7E)xuJf8~!e#*Lowz4R%x34SC-
zKc#O6=jjink75h1U73d&>=%O?_)UO%9KIhFtDeIxpVvmA&)>lgi{+Cx?nc|@zz%aH
zAQ9%1&Mh)pEz*)778qsESdO6Fu{5*j*`7>^eDz}?xdk1?lPLs~_Xd(DR7AgPCd5B^
z^32)Q-qP9G9#x9bF)|k_=um08HACV(09S^hfHq`|KC*4r<975oBF0Ab1F60%TF16G
zQI-yRiiv^QdH-%%%4RdA4~r+C9Xkjg6PuQnvYN(pLS65$yqJflP%d}ocGpX|uQ{O!
zSdN2ril}K$fsS`EKYCHEH@-RnM|KqQBF&elEV({$wib;|PWh{d<&<b->~J%bV3mb&
zU9H!?&J7@U*07!~Z$$<o{-!Hu@BJXo<DO6%5%DQbj3!m)^vy||H!{&#r#KHYzv^Kw
zXtr-J>>izA1%W5+vLCqtEWhd92PIlaChjWk6QckkPmv5=M5b^0+ipwq6QG|8<tj`+
z)k?gYJyNYmpGOS)xs0?@y>a5P8d{q;L$kW;V#h?Sa<bC$x}kkS8b@r8C2GruxN6pa
zAQ9Tl#GDvh`lR(1Rtz&Ck?Enj@S(Z9gn|@b4!{!OG%+XwEs<i0Hc(ZF6HzKWZZ*Wi
zv*jVQ&8=Up>oZ-eBoI1*Yymz!nwtISI`EuzbR8C45lNrc!~-Y<C^wt?4r_hL{qsw`
zsLg3?%85V05q!?^!3fZ^;dyWqU8QK`@IuIB*-`$Fyq2@^0LXnM*)eS>{mgq6f6M}^
zhT4N=APSpMfLQz(GIN37Hkp4W5egMIJ8NrqH=c{Pi%FE1VuI>7p_^<QQu@tic#C2f
zg{3Bwp6R+JC$*k)B*hpHsuSH$_Qix)7~z!TwaN}&r{58qeBE<P_6BkEN}UQfG|w&N
z@pQtKpzp(11{rD?KzscD=iJl4W0)(N8bmseDZ}2ROkADyev+z57|k8uL_7ojXp_2a
z9j?GUPYnaFRy)C6aM#^W?8S>lg7PWbm`?H)Tsb4rVIe_J2=ta3bp?sEV>VS!<z+#`
zcLUxNy`_BNxok#vP&j(qhH+4~F>Sz)M$@?5W>8&28isyi=!C9duZw=Xt3zq5D9Aen
z6C5QOR*h(R9ytUvmCG;7VTTOxv2qUk;>3z@!v<yTH8T!{NbWje6w^C5SvkxcFfJQ4
zP{$_Z#=UdQX^A|e-%^XwJk}-vVv%XGpQwPH#B*~WmmLHQYQMBPVkQr$cqFp6xg2l8
z+5^qNAnMW2$xePMAEe7d#l-KV&?P5-y9E9?3|@63orpC3JyRtk)2{AgN%_aa5uBl6
zoJR3WB%}fE@ao}P=~g2|y@uy;)j!S`OD5@9eAb=PY+TqoUn%({^g)67Y<ca}4lSVY
z*3!6kMSQ6nw@2q8l(DkTwjoCIR;g(QZBlHd4IR@8)9&GaL>`T?rf|<!t7N+oE$&j!
zH^emvus|3OZQ+PN#IqR5DR-6#((B{)sYgB=5=V>IQ#TIxXBQ##N%z*>Z!NrfP4sv~
zU@TD8Cq^{RU{DK(f79TbG)O{)9$sPlCt%wL`s0h`_x$>_S?n^CzFOO&$@}Hi(EbQa
zpiMOw{^+T036>azr}#1}oG`7TM2V?7nIpGqch5b1YeR7^BvYjoyP3akE}2P<wELvJ
zldcGSI|TcQxBj|o;{lx*Rti)_lPQz4(y>vp%E~1{r$WNCHq6+CKxej~f2><f@ART8
zER`qOS0PznfcLw$$$Z&1|6%^m264&%i}ny5+mDiCA!e-WGr9Y>nADoWhKj~;^b<CS
zt25&|T55z-gRqEaZ9aZ<wk=$+f7KBzOGj_dZjBy<5D{}NoBQ-i*oTCV(I|^95!(||
zTm)20+fkr<z@YE|GRB*`NDNjG7>d#qRnHQB2^7c|4>g4f3a=|WMp_oM2?HinhxG|_
z-m!*(<kXdelX|gzmyKOW^ZHKLy?nlZZCI-x9_mRyQO)uX(XY+^1}?cX!GJ1#^Ml0Z
za%6h!7i|$8g97bxhrYVep?2th+yB_8HB|l`;Og3gTKq083i)?e*1+qISJw;FR&;4^
zk(YISN4oBPRam1|kV}ICu6X}vA-V2;RobF@-la7mSKD7{@#|5p3OAGtzBF&Fizxpk
zimykwI?_=B@6zV6e@6I!xp&?5>aau2{7b_}5*?Ys)zNm{`RX)4&BIH(i+|z#i|Keh
z&ehubH;#%(GW>Ih|C%J%qg*8@stzwr1}Sy^9p!&krG^R?5-v0}Ao4MRWRL6xApZv+
C^Gl%s

literal 0
HcmV?d00001

diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 50f0623..398ae8c 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -1,24 +1,24 @@
 <template>
   <div class="component-upload-image">
     <el-upload
-      :action="uploadImgUrl"
-      :before-upload="handleBeforeUpload"
-      :class="{ hide: fileList.length >= limit }"
-      :file-list="fileList"
-      :headers="headers"
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      :on-preview="handlePictureCardPreview"
-      :on-remove="handleRemove"
-      :on-success="handleUploadSuccess"
-      :show-file-list="true"
-      list-type="picture-card"
-      multiple
-      name="file"
+        :action="uploadImgUrl"
+        :before-upload="handleBeforeUpload"
+        :class="{ hide: fileList.length >= limit }"
+        :file-list="fileList"
+        :headers="headers"
+        :limit="limit"
+        :on-error="handleUploadError"
+        :on-exceed="handleExceed"
+        :on-preview="handlePictureCardPreview"
+        :on-remove="handleRemove"
+        :on-success="handleUploadSuccess"
+        :show-file-list="true"
+        list-type="picture-card"
+        multiple
+        name="file"
     >
       <el-icon class="avatar-uploader-icon">
-        <plus />
+        <plus/>
       </el-icon>
     </el-upload>
     <!-- 上传提示 -->
@@ -34,21 +34,21 @@
     </div>
 
     <el-dialog
-      v-model="dialogVisible"
-      append-to-body
-      title="预览"
-      width="800px"
+        v-model="dialogVisible"
+        append-to-body
+        title="预览"
+        width="800px"
     >
       <img
-        :src="dialogImageUrl"
-        style="display: block; max-width: 100%; margin: 0 auto"
+          :src="dialogImageUrl"
+          style="display: block; max-width: 100%; margin: 0 auto"
       />
     </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { getToken } from "@/utils/auth";
+import {getToken} from "@/utils/auth";
 
 const props = defineProps({
   modelValue: [String, Object, Array],
@@ -74,7 +74,7 @@ const props = defineProps({
   },
 });
 
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 const emit = defineEmits();
 const number = ref(0);
 const uploadList = ref([]);
@@ -82,35 +82,36 @@ const dialogImageUrl = ref("");
 const dialogVisible = ref(false);
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
-const headers = ref({ "client-token": "Bearer " + getToken() });
+const headers = ref({"client-token": "Bearer " + getToken()});
 const fileList = ref([]);
 const showTip = computed(
-  () => props.isShowTip && (props.fileType || props.fileSize)
+    () => props.isShowTip && (props.fileType || props.fileSize)
 );
 
 watch(
-  () => props.modelValue,
-  (val) => {
-    if (val) {
-      // 首先将值转为数组
-      const list = Array.isArray(val) ? val : props.modelValue.split(",");
-      // 然后将数组转为对象数组
-      fileList.value = list.map((item) => {
-        if (typeof item === "string") {
-          if (item.indexOf(baseUrl) === -1) {
-            item = { name: baseUrl + item, url: baseUrl + item };
-          } else {
-            item = { name: item, url: item };
+    () => props.modelValue,
+    (val) => {
+      if (val) {
+        // 首先将值转为数组
+        const list = Array.isArray(val) ? val : props.modelValue.split(",");
+        // 然后将数组转为对象数组
+        fileList.value = list.map((item) => {
+          if (typeof item === "string") {
+            if (item.indexOf(baseUrl) === -1) {
+              // item = {name: baseUrl + item, url: baseUrl + item};
+              item = {name: item, url: `${baseUrl}/file${item}`};
+            } else {
+              item = {name: item, url: item};
+            }
           }
-        }
-        return item;
-      });
-    } else {
-      fileList.value = [];
-      return [];
-    }
-  },
-  { deep: true, immediate: true }
+          return item;
+        });
+      } else {
+        fileList.value = [];
+        return [];
+      }
+    },
+    {deep: true, immediate: true}
 );
 
 // 删除图片
@@ -120,11 +121,11 @@ function handleRemove(file, files) {
 
 // 上传成功回调
 function handleUploadSuccess(res) {
-  uploadList.value.push({ name: res.fileName, url: res.url });
+  uploadList.value.push({name: res.fileName, url: `${baseUrl}/file${res.fileName}`});
   if (uploadList.value.length === number.value) {
     fileList.value = fileList.value
-      .filter((f) => f.url !== undefined)
-      .concat(uploadList.value);
+        .filter((f) => f.url !== undefined)
+        .concat(uploadList.value);
     uploadList.value = [];
     number.value = 0;
     emit("update:modelValue", listToString(fileList.value));
@@ -150,7 +151,7 @@ function handleBeforeUpload(file) {
   }
   if (!isImg) {
     proxy.$modal.msgError(
-      `文件格式不正确, 请上传${props.fileType.join("/")}图片格式文件!`
+        `文件格式不正确, 请上传${props.fileType.join("/")}图片格式文件!`
     );
     return false;
   }
@@ -189,7 +190,7 @@ function listToString(list, separator) {
   for (let i in list) {
     if (undefined !== list[i].url && list[i].url.indexOf("blob:") !== 0) {
       // strs += list[i].url.replace(baseUrl, "") + separator;
-      strs += list[i].url + separator;
+      strs += list[i].name + separator;
     }
   }
   return strs != "" ? strs.substr(0, strs.length - 1) : "";
diff --git a/src/router/index.js b/src/router/index.js
index f79adda..206bfcd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory } from "vue-router";
+import {createRouter, createWebHistory} from "vue-router";
 /* Layout */
 import Layout from "@/layout";
 import basicInfo from "../views/admin/enterprise/account/basicInfo.vue";
@@ -27,822 +27,849 @@ import basicInfo from "../views/admin/enterprise/account/basicInfo.vue";
 
 // 公共路由
 export const constantRoutes = [
-  {
-    path: "/",
-    name: "Home",
-    component: () => import("../views/website/website-layout.vue"),
-    hidden: true,
-    children: [
-      {
-        path: "login",
-        name: "login",
-        component: () => import("@/views/website/login/index.vue"),
-        children: [],
-      },
-      {
-        path: "",
-        component: () => import("../views/website/home/index.vue"),
-      },
-      {
-        path: "searchList/enterprise",
-        component: () => import("../views/website/searchList/enterprise.vue"),
-        meta: {
-          searchType: 1,
-        },
-      },
-      {
-        path: "searchList/enterprise/detail/:id",
-        component: () =>
-          import("../views/website/searchList/enterpriseDetail.vue"),
-        meta: {
-          searchType: 1,
-        },
-      },
-      {
-        path: "searchList/achievement",
-        component: () => import("../views/website/searchList/achievement.vue"),
-        meta: {
-          searchType: 2,
-        },
-      },
-      {
-        path: "searchList/achievement/detail/:id",
-        component: () =>
-          import("../views/website/searchList/achievementDetail.vue"),
-        meta: {
-          searchType: 2,
-        },
-      },
-      {
-        path: "searchList/product/detail/:id",
-        component: () =>
-          import("../views/website/searchList/productDetail.vue"),
-        meta: {
-          searchType: 2,
-        },
-      },
-      {
-        path: "searchList/lab",
-        component: () => import("../views/website/searchList/lab.vue"),
-        meta: {
-          searchType: 8,
-        },
-      },
-      {
-        path: "searchList/lab/detail/:id",
-        component: () =>
-          import("../views/website/searchList/laboratoryDetail.vue"),
-        meta: {
-          searchType: 8,
-        },
-      },
-      {
-        path: "searchList/patent",
-        component: () => import("../views/website/searchList/patent.vue"),
-        meta: {
-          searchType: 4,
-        },
-      },
-      {
-        path: "searchList/patent/detail/:id",
-        component: () => import("../views/website/searchList/patentDetail.vue"),
-        meta: {
-          searchType: 4,
-        },
-      },
-      {
-        path: "searchList/expert",
-        component: () => import("../views/website/searchList/expert.vue"),
-        meta: {
-          searchType: 5,
-        },
-      },
-      {
-        path: "searchList/expert/detail/:id",
-        component: () => import("../views/website/searchList/expertDetail.vue"),
-        meta: {
-          searchType: 5,
-        },
-      },
-      {
-        path: "searchList/serviceDemand",
-        component: () =>
-          import("../views/website/searchList/serviceDemand.vue"),
-        meta: {
-          searchType: 7,
-        },
-      },
-      {
-        path: "searchList/serviceDemand/detail/:id",
-        component: () =>
-          import("../views/website/searchList/serviceDemandDetail.vue"),
-        meta: {
-          searchType: 7,
-        },
-      },
-      {
-        path: "searchList/technologyDemand",
-        component: () =>
-          import("../views/website/searchList/technologyDemand.vue"),
-        meta: {
-          searchType: 6,
-        },
-      },
-      {
-        path: "searchList/technologyDemand/detail/:id",
-        component: () =>
-          import("../views/website/searchList/technologyDemandDetail.vue"),
-        meta: {
-          searchType: 6,
-        },
-      },
-      {
-        path: "solution/:mode",
-        name: "solution",
-        component: () => import("../views/website/solution/solution.vue"),
-      },
-      {
-        path: "solution/detail/:id",
-        name: "solutionDetail",
-        component: () => import("../views/website/solution/detail.vue"),
-      },
-      {
-        path: "/innovate",
-        name: "innovate",
-        component: () => import("../views/website/innovate/innovate.vue"),
-      },
-      {
-        path: "innovate/detail/:id",
-        name: "innovateDetail",
-        component: () => import("../views/website/innovate/detail.vue"),
-      },
-      {
-        path: "activity",
-        name: "activity",
-        component: () => import("../views/website/activity/activity.vue"), // children: [
-        //   {
-        //     path: '',
-        //     name: 'activityList',
-        //     component: () => import('../views/website/activity/list.vue'),
-        //   },
-        //   {
-        //     path: 'detail/:id',
-        //     name: 'activityDetail',
-        //     component: () => import('../views/website/activity/detail.vue'),
-        //   },
-        // ]
-      },
-      {
-        path: "about",
-        name: "about",
-        component: () => import("../views/website/about/about.vue"),
-      },
-    ],
-  },
+    {
+        path: "/",
+        name: "Home",
+        component: () => import("../views/website/website-layout.vue"),
+        hidden: true,
+        children: [
+            {
+                path: "login",
+                name: "login",
+                component: () => import("@/views/website/login/index.vue"),
+                children: [],
+            },
+            {
+                path: "",
+                component: () => import("../views/website/home/index.vue"),
+            },
+            {
+                path: "searchList/enterprise",
+                component: () => import("../views/website/searchList/enterprise.vue"),
+                meta: {
+                    searchType: 1,
+                },
+            },
+            {
+                path: "searchList/enterprise/detail/:id",
+                component: () =>
+                    import("../views/website/searchList/enterpriseDetail.vue"),
+                meta: {
+                    searchType: 1,
+                },
+            },
+            {
+                path: "searchList/achievement",
+                component: () => import("../views/website/searchList/achievement.vue"),
+                meta: {
+                    searchType: 2,
+                },
+            },
+            {
+                path: "searchList/achievement/detail/:id",
+                component: () =>
+                    import("../views/website/searchList/achievementDetail.vue"),
+                meta: {
+                    searchType: 2,
+                },
+            },
+            {
+                path: "searchList/product/detail/:id",
+                component: () =>
+                    import("../views/website/searchList/productDetail.vue"),
+                meta: {
+                    searchType: 2,
+                },
+            },
+            {
+                path: "searchList/lab",
+                component: () => import("../views/website/searchList/lab.vue"),
+                meta: {
+                    searchType: 8,
+                },
+            },
+            {
+                path: "searchList/lab/detail/:id",
+                component: () =>
+                    import("../views/website/searchList/laboratoryDetail.vue"),
+                meta: {
+                    searchType: 8,
+                },
+            },
+            {
+                path: "searchList/patent",
+                component: () => import("../views/website/searchList/patent.vue"),
+                meta: {
+                    searchType: 4,
+                },
+            },
+            {
+                path: "searchList/patent/detail/:id",
+                component: () => import("../views/website/searchList/patentDetail.vue"),
+                meta: {
+                    searchType: 4,
+                },
+            },
+            {
+                path: "searchList/expert",
+                component: () => import("../views/website/searchList/expert.vue"),
+                meta: {
+                    searchType: 5,
+                },
+            },
+            {
+                path: "searchList/expert/detail/:id",
+                component: () => import("../views/website/searchList/expertDetail.vue"),
+                meta: {
+                    searchType: 5,
+                },
+            },
+            {
+                path: "searchList/serviceDemand",
+                component: () =>
+                    import("../views/website/searchList/serviceDemand.vue"),
+                meta: {
+                    searchType: 7,
+                },
+            },
+            {
+                path: "searchList/serviceDemand/detail/:id",
+                component: () =>
+                    import("../views/website/searchList/serviceDemandDetail.vue"),
+                meta: {
+                    searchType: 7,
+                },
+            },
+            {
+                path: "searchList/technologyDemand",
+                component: () =>
+                    import("../views/website/searchList/technologyDemand.vue"),
+                meta: {
+                    searchType: 6,
+                },
+            },
+            {
+                path: "searchList/technologyDemand/detail/:id",
+                component: () =>
+                    import("../views/website/searchList/technologyDemandDetail.vue"),
+                meta: {
+                    searchType: 6,
+                },
+            },
+            {
+                path: "solution/:mode",
+                name: "solution",
+                component: () => import("../views/website/solution/solution.vue"),
+            },
+            {
+                path: "solution/detail/:id",
+                name: "solutionDetail",
+                component: () => import("../views/website/solution/detail.vue"),
+            },
+            {
+                path: "/innovate",
+                name: "innovate",
+                component: () => import("../views/website/innovate/innovate.vue"),
+            },
+            {
+                path: "innovate/detail/:id",
+                name: "innovateDetail",
+                component: () => import("../views/website/innovate/detail.vue"),
+            },
+            {
+                path: "activity",
+                name: "activity",
+                component: () => import("../views/website/activity/activity.vue"), // children: [
+                //   {
+                //     path: '',
+                //     name: 'activityList',
+                //     component: () => import('../views/website/activity/list.vue'),
+                //   },
+                //   {
+                //     path: 'detail/:id',
+                //     name: 'activityDetail',
+                //     component: () => import('../views/website/activity/detail.vue'),
+                //   },
+                // ]
+            },
+            {
+                path: "about",
+                name: "about",
+                component: () => import("../views/website/about/about.vue"),
+            },
+        ],
+    },
 
-  {
-    path: "/redirect",
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: "/redirect/:path(.*)",
-        component: () => import("@/views/redirect/index.vue"),
-      },
-    ],
-  }, // {
-  //   path: "/login",
-  //   component: () => import("@/views/login"),
-  //   hidden: true,
-  // },
-  // {
-  //   path: "/register",
-  //   component: () => import("@/views/register"),
-  //   hidden: true,
-  // },
-  {
-    path: "/:pathMatch(.*)*",
-    component: () => import("@/views/error/404"),
-    hidden: true,
-  },
-  {
-    path: "/401",
-    component: () => import("@/views/error/401"),
-    hidden: true,
-  },
+    {
+        path: "/redirect",
+        component: Layout,
+        hidden: true,
+        children: [
+            {
+                path: "/redirect/:path(.*)",
+                component: () => import("@/views/redirect/index.vue"),
+            },
+        ],
+    }, // {
+    //   path: "/login",
+    //   component: () => import("@/views/login"),
+    //   hidden: true,
+    // },
+    // {
+    //   path: "/register",
+    //   component: () => import("@/views/register"),
+    //   hidden: true,
+    // },
+    {
+        path: "/:pathMatch(.*)*",
+        component: () => import("@/views/error/404"),
+        hidden: true,
+    },
+    {
+        path: "/401",
+        component: () => import("@/views/error/401"),
+        hidden: true,
+    },
 
-  {
-    path: "/identity",
-    component: () => import("@/views/identity/layout"),
-    hidden: true,
-    children: [
-      {
-        path: "index",
-        component: () => import("@/views/identity/index"),
-        name: "index",
-        meta: { title: "身份选择" },
-      },
-      {
-        path: "enterprise",
-        component: () => import("@/views/identity/enterprise"),
-        name: "enterprise",
-        meta: { title: "企业入驻" },
-      },
-      {
-        path: "expert",
-        component: () => import("@/views/identity/expert"),
-        name: "expert",
-        meta: { title: "专家入驻" },
-      },
-      {
-        path: "research",
-        component: () => import("@/views/identity/research"),
-        name: "research",
-        meta: { title: "研究机构入驻" },
-      },
-      {
-        path: "laboratory",
-        component: () => import("@/views/identity/laboratory"),
-        name: "laboratory",
-        meta: { title: "实验室入驻" },
-      },
-      {
-        path: "agent",
-        component: () => import("@/views/identity/agent"),
-        name: "agent",
-        meta: { title: "科技经纪人入驻" },
-      },
-    ],
-  }, //TODO:
+    {
+        path: "/identity",
+        component: () => import("@/views/identity/layout"),
+        hidden: true,
+        children: [
+            {
+                path: "index",
+                component: () => import("@/views/identity/index"),
+                name: "index",
+                meta: {title: "身份选择"},
+            },
+            {
+                path: "enterprise",
+                component: () => import("@/views/identity/enterprise"),
+                name: "enterprise",
+                meta: {title: "企业入驻"},
+            },
+            {
+                path: "expert",
+                component: () => import("@/views/identity/expert"),
+                name: "expert",
+                meta: {title: "专家入驻"},
+            },
+            {
+                path: "research",
+                component: () => import("@/views/identity/research"),
+                name: "research",
+                meta: {title: "研究机构入驻"},
+            },
+            {
+                path: "laboratory",
+                component: () => import("@/views/identity/laboratory"),
+                name: "laboratory",
+                meta: {title: "实验室入驻"},
+            },
+            {
+                path: "agent",
+                component: () => import("@/views/identity/agent"),
+                name: "agent",
+                meta: {title: "科技经纪人入驻"},
+            },
+        ],
+    }, //TODO:
 
-  // {
-  //   path: '',
-  //   component: Layout,
-  //   redirect: '/index',
-  //   children: [
-  //     {
-  //       path: '/index',
-  //       component: () => import('@/views/index'),
-  //       name: 'Index',
-  //       meta: { title: '首页', icon: 'dashboard', affix: true }
-  //     }
-  //   ]
-  // },
-  {
-    path: "/user",
-    component: Layout,
-    hidden: true,
-    redirect: "noredirect",
-    children: [
-      {
-        path: "profile",
-        component: () => import("@/views/system/user/profile/index"),
-        name: "Profile",
-        meta: { title: "个人中心", icon: "user" },
-      },
-    ],
-  },
+    // {
+    //   path: '',
+    //   component: Layout,
+    //   redirect: '/index',
+    //   children: [
+    //     {
+    //       path: '/index',
+    //       component: () => import('@/views/index'),
+    //       name: 'Index',
+    //       meta: { title: '首页', icon: 'dashboard', affix: true }
+    //     }
+    //   ]
+    // },
+    {
+        path: "/user",
+        component: Layout,
+        hidden: true,
+        redirect: "noredirect",
+        children: [
+            {
+                path: "profile",
+                component: () => import("@/views/system/user/profile/index"),
+                name: "Profile",
+                meta: {title: "个人中心", icon: "user"},
+            },
+        ],
+    },
 ];
 
 // 企业后台路由表
 export const enterpriseRoutes = [
-  {
-    path: "/admin",
-    component: Layout,
-    redirect: "/admin/index",
-    children: [
-      {
-        path: "index",
-        component: () => import("@/views/admin/enterprise/index"),
-        name: "Index",
-        meta: { title: "首页", icon: "dashboard", affix: true },
-      },
-    ],
-  },
-  {
-    path: "/account",
-    component: Layout,
-    meta: { title: "账号管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/account/basicInfo",
-    children: [
-      {
-        path: "basicInfo",
-        component: basicInfo,
-        name: "basicInfo",
-        meta: { title: "基本资料", icon: "list" },
-      },
-      {
-        path: "joinMembership",
-        component: () =>
-          import("@/views/admin/enterprise/account/joinMembership"),
-        name: "joinMembership",
-        meta: { title: "开通会员", icon: "list" },
-      },
-      {
-        path: "bill",
-        component: () => import("@/views/admin/enterprise/account/bill"),
-        name: "Bill",
-        meta: { title: "账单列表", icon: "list" },
-      }, // {
-      //   path: "record",
-      //   component: () => import("@/views/admin/enterprise/account/record"),
-      //   name: "Record",
-      //   meta: { title: "创新币兑换记录", icon: "list" },
-      // },
-    ],
-  },
-  {
-    path: "/extension",
-    component: Layout,
-    meta: { title: "产品推广", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/extension/product",
-    children: [
-      {
-        path: "product",
-        component: () => import("@/views/admin/enterprise/extension/product"),
-        name: "Product",
-        meta: { title: "产品列表", icon: "list" },
-      },
-      {
-        path: "release",
-        component: () => import("@/views/admin/enterprise/extension/release"),
-        hidden: true,
-        name: "Release",
-        meta: { title: "发布产品", icon: "list" },
-      },
-      {
-        path: "results",
-        component: () => import("@/views/admin/enterprise/extension/results"),
-        hidden: true,
-        name: "Results",
-        meta: { title: "匹配结果", icon: "list", isMatch: true },
-      },
-      {
-        path: "business",
-        component: () => import("@/views/admin/enterprise/extension/business"),
-        hidden: true,
-        name: "Business",
-        meta: { title: "浏览信息", icon: "list" },
-      },
-    ],
-  },
-  {
-    path: "/demand",
-    component: Layout,
-    meta: { title: "需求管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/demand/serviceDemand",
-    children: [
-      {
-        path: "serviceDemand",
-        component: () =>
-          import("@/views/admin/enterprise/demand/serviceDemand"),
-        name: "serviceDemand",
-        meta: { title: "服务需求", icon: "list" },
-      },
-      {
-        path: "releaseService",
-        component: () =>
-          import("@/views/admin/enterprise/demand/releaseService"),
-        hidden: true,
-        name: "releaseService",
-        meta: { title: "发布服务需求", icon: "list" },
-      },
-      {
-        path: "technology",
-        component: () => import("@/views/admin/enterprise/demand/technology"),
-        name: "technology",
-        meta: { title: "技术需求", icon: "list" },
-      },
-      {
-        path: "releaseTechnology",
-        component: () =>
-          import("@/views/admin/enterprise/demand/releaseTechnology"),
-        hidden: true,
-        name: "releaseTechnology",
-        meta: { title: "发布技术需求", icon: "list" },
-      },
-      {
-        path: "results",
-        component: () => import("@/views/admin/enterprise/extension/results"),
-        hidden: true,
-        name: "results",
-        meta: { title: "匹配结果", icon: "list", isMatch: true },
-      },
-    ],
-  },
-  {
-    path: "/activity",
-    component: Layout,
-    meta: { title: "活动管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/activity/active",
-    children: [
-      {
-        path: "active",
-        component: () => import("@/views/admin/enterprise/activity/active"),
-        name: "Active",
-        meta: { title: "活动列表", icon: "list" },
-      },
-    ],
-  },
+    {
+        path: "/admin",
+        component: Layout,
+        redirect: "/admin/index",
+        children: [
+            {
+                path: "index",
+                component: () => import("@/views/admin/enterprise/index"),
+                name: "Index",
+                meta: {title: "首页", icon: "dashboard", affix: true},
+            },
+        ],
+    },
+    {
+        path: "/account",
+        component: Layout,
+        meta: {title: "账号管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/account/basicInfo",
+        children: [
+            {
+                path: "basicInfo",
+                component: basicInfo,
+                name: "basicInfo",
+                meta: {title: "基本资料", icon: "list"},
+            },
+            {
+                path: "joinMembership",
+                component: () =>
+                    import("@/views/admin/enterprise/account/joinMembership"),
+                name: "joinMembership",
+                meta: {title: "开通会员", icon: "list"},
+            },
+            {
+                path: "bill",
+                component: () => import("@/views/admin/enterprise/account/bill"),
+                name: "Bill",
+                meta: {title: "账单列表", icon: "list"},
+            }, // {
+            //   path: "record",
+            //   component: () => import("@/views/admin/enterprise/account/record"),
+            //   name: "Record",
+            //   meta: { title: "创新币兑换记录", icon: "list" },
+            // },
+        ],
+    },
+    {
+        path: "/extension",
+        component: Layout,
+        meta: {title: "产品推广", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/extension/product",
+        children: [
+            {
+                path: "product",
+                component: () => import("@/views/admin/enterprise/extension/product"),
+                name: "Product",
+                meta: {title: "产品列表", icon: "list"},
+            },
+            {
+                path: "release",
+                component: () => import("@/views/admin/enterprise/extension/release"),
+                hidden: true,
+                name: "Release",
+                meta: {title: "发布产品", icon: "list"},
+            },
+            {
+                path: "results",
+                component: () => import("@/views/admin/enterprise/extension/results"),
+                hidden: true,
+                name: "Results",
+                meta: {title: "匹配结果", icon: "list", isMatch: true},
+            },
+            {
+                path: "business",
+                component: () => import("@/views/admin/enterprise/extension/business"),
+                hidden: true,
+                name: "Business",
+                meta: {title: "浏览信息", icon: "list"},
+            },
+        ],
+    },
+    {
+        path: "/demand",
+        component: Layout,
+        meta: {title: "需求管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/demand/serviceDemand",
+        children: [
+            {
+                path: "serviceDemand",
+                component: () =>
+                    import("@/views/admin/enterprise/demand/serviceDemand"),
+                name: "serviceDemand",
+                meta: {title: "服务需求", icon: "list"},
+            },
+            {
+                path: "releaseService",
+                component: () =>
+                    import("@/views/admin/enterprise/demand/releaseService"),
+                hidden: true,
+                name: "releaseService",
+                meta: {title: "发布服务需求", icon: "list"},
+            },
+            {
+                path: "technology",
+                component: () => import("@/views/admin/enterprise/demand/technology"),
+                name: "technology",
+                meta: {title: "技术需求", icon: "list"},
+            },
+            {
+                path: "releaseTechnology",
+                component: () =>
+                    import("@/views/admin/enterprise/demand/releaseTechnology"),
+                hidden: true,
+                name: "releaseTechnology",
+                meta: {title: "发布技术需求", icon: "list"},
+            },
+            {
+                path: "results",
+                component: () => import("@/views/admin/enterprise/extension/results"),
+                hidden: true,
+                name: "results",
+                meta: {title: "匹配结果", icon: "list", isMatch: true},
+            },
+        ],
+    },
+    {
+        path: "/activity",
+        component: Layout,
+        meta: {title: "活动管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/activity/active",
+        children: [
+            {
+                path: "active",
+                component: () => import("@/views/admin/enterprise/activity/active"),
+                name: "Active",
+                meta: {title: "活动列表", icon: "list"},
+            },
+        ],
+    },
 ];
 
 // 专家后台路由表
 export const expertRoutes = [
-  {
-    path: "/admin",
-    component: Layout,
-    redirect: "/admin/index",
-    children: [
-      {
-        path: "index",
-        component: () => import("@/views/admin/expert/index"),
-        name: "Index",
-        meta: { title: "首页", icon: "dashboard", affix: true },
-      },
-    ],
-  },
-  {
-    path: "/account",
-    component: Layout,
-    meta: { title: "账号管理", icon: "dashboard" },
-    alwaysShow: true, // redirect: 'noRedirect',
-    redirect: "/account/bill",
-    children: [
-      // {
-      //   path: "bill",
-      //   component: () => import("@/views/admin/expert/account/bill"),
-      //   name: "Bill",
-      //   meta: { title: "账单列表", icon: "list" },
-      // },
-      // {
-      //   path: "exchange",
-      //   component: () => import("@/views/admin/expert/account/exchange"),
-      //   name: "Exchange",
-      //   meta: { title: "兑换记录", icon: "list" },
-      // },
-      {
-        path: "basicInfo",
-        component: () => import("@/views/admin/expert/account/basicInfo"),
-        name: "basicInfo",
-        meta: { title: "基本资料", icon: "list" },
-      }, // {
-      //   path: "transactionAuth",
-      //   component: () => import("@/views/admin/expert/account/transactionAuth"),
-      //   name: "transactionAuth",
-      //   meta: { title: "交易认证", icon: "list" },
-      // },
-      // {
-      //   path: "profit",
-      //   component: () => import("@/views/admin/expert/account/profit"),
-      //   name: "profit",
-      //   meta: { title: "收益管理", icon: "list" },
-      // },
-      // {
-      //   path: "withdrawal",
-      //   component: () => import("@/views/admin/expert/account/withdrawal"),
-      //   hidden: true,
-      //   name: "Withdrawal",
-      //   meta: { title: "提现记录", icon: "list" },
-      // },
-    ],
-  },
-  {
-    path: "/technology",
-    component: Layout,
-    meta: { title: "技术管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/technology/achievement",
-    children: [
-      {
-        path: "achievement",
-        component: () => import("@/views/admin/expert/technology/achievement"),
-        name: "Achievement",
-        meta: { title: "成果列表", icon: "list" },
-      },
-      {
-        path: "release",
-        component: () => import("@/views/admin/expert/technology/release"),
-        hidden: true,
-        name: "Release",
-        meta: { title: "发布成果", icon: "list" },
-      },
-      {
-        path: "results", // component: () => import("@/views/admin/expert/technology/results"),
-        component: () => import("@/views/admin/enterprise/extension/results"),
-        hidden: true,
-        name: "Results",
-        meta: { title: "匹配结果", icon: "list", isMatch: false },
-      },
-      {
-        path: "patent",
-        component: () => import("@/views/admin/expert/technology/patent"),
-        name: "patent",
-        meta: { title: "专利列表", icon: "list" },
-      },
-      {
-        path: "claimPatent",
-        component: () => import("@/views/admin/expert/technology/claimPatent"),
-        hidden: true,
-        name: "claimPatent",
-        meta: { title: "认领专利", icon: "list" },
-      },
-      {
-        path: "paper",
-        component: () => import("@/views/admin/expert/technology/paper"),
-        name: "Paper",
-        meta: { title: "论文列表", icon: "list" },
-      },
-      {
-        path: "research",
-        component: () => import("@/views/admin/expert/technology/research"),
-        name: "Research",
-        meta: { title: "科研项目列表", icon: "list" },
-      },
-    ],
-  },
-  {
-    path: "/demand",
-    component: Layout,
-    meta: { title: "需求管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/demand/serviceDemand",
-    children: [
-      {
-        path: "serviceDemand",
-        component: () => import("@/views/admin/expert/demand/serviceDemand"),
-        name: "serviceDemand",
-        meta: { title: "服务需求", icon: "list" },
-      },
-      {
-        path: "release",
-        component: () => import("@/views/admin/expert/demand/release"),
-        hidden: true,
-        name: "release",
-        meta: { title: "发布需求", icon: "list" },
-      },
-      {
-        path: "already",
-        component: () => import("@/views/admin/expert/demand/already"),
-        name: "already",
-        meta: { title: "已合作企业", icon: "list" },
-      },
-      {
-        path: "think",
-        component: () => import("@/views/admin/expert/demand/think"),
-        name: "think",
-        meta: { title: "想合作企业", icon: "list" },
-      },
-    ],
-  },
+    {
+        path: "/admin",
+        component: Layout,
+        redirect: "/admin/index",
+        children: [
+            {
+                path: "index",
+                component: () => import("@/views/admin/expert/index"),
+                name: "Index",
+                meta: {title: "首页", icon: "dashboard", affix: true},
+            },
+        ],
+    },
+    {
+        path: "/account",
+        component: Layout,
+        meta: {title: "账号管理", icon: "dashboard"},
+        alwaysShow: true, // redirect: 'noRedirect',
+        redirect: "/account/bill",
+        children: [
+            // {
+            //   path: "bill",
+            //   component: () => import("@/views/admin/expert/account/bill"),
+            //   name: "Bill",
+            //   meta: { title: "账单列表", icon: "list" },
+            // },
+            // {
+            //   path: "exchange",
+            //   component: () => import("@/views/admin/expert/account/exchange"),
+            //   name: "Exchange",
+            //   meta: { title: "兑换记录", icon: "list" },
+            // },
+            {
+                path: "basicInfo",
+                component: () => import("@/views/admin/expert/account/basicInfo"),
+                name: "basicInfo",
+                meta: {title: "基本资料", icon: "list"},
+            }, // {
+            //   path: "transactionAuth",
+            //   component: () => import("@/views/admin/expert/account/transactionAuth"),
+            //   name: "transactionAuth",
+            //   meta: { title: "交易认证", icon: "list" },
+            // },
+            // {
+            //   path: "profit",
+            //   component: () => import("@/views/admin/expert/account/profit"),
+            //   name: "profit",
+            //   meta: { title: "收益管理", icon: "list" },
+            // },
+            // {
+            //   path: "withdrawal",
+            //   component: () => import("@/views/admin/expert/account/withdrawal"),
+            //   hidden: true,
+            //   name: "Withdrawal",
+            //   meta: { title: "提现记录", icon: "list" },
+            // },
+        ],
+    },
+    {
+        path: "/technology",
+        component: Layout,
+        meta: {title: "技术管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/technology/achievement",
+        children: [
+            {
+                path: "achievement",
+                component: () => import("@/views/admin/expert/technology/achievement"),
+                name: "Achievement",
+                meta: {title: "成果列表", icon: "list"},
+            },
+            {
+                path: "release",
+                component: () => import("@/views/admin/expert/technology/release"),
+                hidden: true,
+                name: "Release",
+                meta: {title: "发布成果", icon: "list"},
+            },
+            {
+                path: "results", // component: () => import("@/views/admin/expert/technology/results"),
+                component: () => import("@/views/admin/enterprise/extension/results"),
+                hidden: true,
+                name: "Results",
+                meta: {title: "匹配结果", icon: "list", isMatch: false},
+            },
+            {
+                path: "patent",
+                component: () => import("@/views/admin/expert/technology/patent"),
+                name: "patent",
+                meta: {title: "专利列表", icon: "list"},
+            },
+            {
+                path: "claimPatent",
+                component: () => import("@/views/admin/expert/technology/claimPatent"),
+                hidden: true,
+                name: "claimPatent",
+                meta: {title: "认领专利", icon: "list"},
+            },
+            {
+                path: "paper",
+                component: () => import("@/views/admin/expert/technology/paper"),
+                name: "Paper",
+                meta: {title: "论文列表", icon: "list"},
+            },
+            {
+                path: "research",
+                component: () => import("@/views/admin/expert/technology/research"),
+                name: "Research",
+                meta: {title: "科研项目列表", icon: "list"},
+            },
+        ],
+    },
+    {
+        path: "/demand",
+        component: Layout,
+        meta: {title: "需求管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/demand/serviceDemand",
+        children: [
+            {
+                path: "serviceDemand",
+                component: () => import("@/views/admin/expert/demand/serviceDemand"),
+                name: "serviceDemand",
+                meta: {title: "服务需求", icon: "list"},
+            },
+            {
+                path: "release",
+                component: () => import("@/views/admin/expert/demand/release"),
+                hidden: true,
+                name: "release",
+                meta: {title: "发布需求", icon: "list"},
+            },
+            {
+                path: "already",
+                component: () => import("@/views/admin/expert/demand/already"),
+                name: "already",
+                meta: {title: "已合作企业", icon: "list"},
+            },
+            {
+                path: "think",
+                component: () => import("@/views/admin/expert/demand/think"),
+                name: "think",
+                meta: {title: "想合作企业", icon: "list"},
+            },
+        ],
+    },
 
-  {
-    path: "/activity",
-    component: Layout,
-    meta: { title: "活动管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/activity/active",
-    children: [
-      {
-        path: "active",
-        component: () => import("@/views/admin/expert/activity/active"),
-        name: "Active",
-        meta: { title: "活动列表", icon: "list" },
-      },
-    ],
-  },
+    {
+        path: "/activity",
+        component: Layout,
+        meta: {title: "活动管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/activity/active",
+        children: [
+            {
+                path: "active",
+                component: () => import("@/views/admin/expert/activity/active"),
+                name: "Active",
+                meta: {title: "活动列表", icon: "list"},
+            },
+        ],
+    },
 ];
 
 export const laboratoryRoutes = [
-  {
-    path: "/admin",
-    component: Layout,
-    redirect: "/admin/index",
-    children: [
-      {
-        path: "index",
-        component: () => import("@/views/admin/laboratory/index"),
-        name: "Index",
-        meta: { title: "首页", icon: "dashboard", affix: true },
-      },
-    ],
-  },
-  {
-    path: "/admin/account",
-    component: Layout,
-    meta: { title: "账号管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/admin/account/basic-info",
-    children: [
-      {
-        path: "basic-info",
-        component: () =>
-          import("@/views/admin/laboratory/account/basic-info.vue"),
-        name: "basicInfo",
-        meta: { title: "基本资料", icon: "list" },
-      },
-    ],
-  },
-  {
-    path: "/admin/research",
-    component: Layout,
-    meta: { title: "科研管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/admin/research/patent",
-    children: [
-      {
-        path: "patent",
-        component: () =>
-          import("@/views/admin/laboratory/research/patent/index.vue"),
-        name: "Patent",
-        meta: { title: "专利列表", icon: "list" },
-      },
-      {
-        path: "achievement",
-        component: () =>
-          import("@/views/admin/laboratory/research/achievement/index.vue"),
-        name: "Achievement",
-        meta: { title: "成果列表", icon: "list" },
-      },
-      {
-        path: "service-demand",
-        component: () =>
-          import("@/views/admin/laboratory/research/service-demand/index.vue"),
-        name: "ServiceDemand",
-        meta: { title: "服务需求列表", icon: "list" },
-      },
-      {
-        path: "service-demand/detail/:id",
-        component: () =>
-          import("@/views/admin/laboratory/research/service-demand/detail.vue"),
-        hidden: true,
-        name: "ServiceDemandDetail",
-        meta: { title: "查看需求", icon: "list" },
-      },
-      {
-        path: "expert",
-        component: () =>
-          import("@/views/admin/laboratory/research/expert/index.vue"),
-        name: "Expert",
-        meta: { title: "专家列表", icon: "list" },
-      },
-      {
-        path: "research-project",
-        component: () =>
-          import(
-            "@/views/admin/laboratory/research/research-project/index.vue"
-          ),
-        name: "ResearchProject",
-        meta: { title: "科研项目列表", icon: "list" },
-      },
-      {
-        path: "paper",
-        component: () =>
-          import("@/views/admin/laboratory/research/paper/index.vue"),
-        name: "Paper",
-        meta: { title: "论文列表", icon: "list" },
-      },
-      {
-        path: "paper/unit-info",
-        component: () =>
-          import("@/views/admin/laboratory/research/paper/unit-info.vue"),
-        hidden: true,
-        name: "UnitInfo",
-        meta: { title: "浏览单位信息", icon: "list" },
-      },
-      {
-        path: "laboratory-equipment",
-        component: () =>
-          import(
-            "@/views/admin/laboratory/research/laboratory-equipment/index.vue"
-          ),
-        name: "LaboratoryEquipment",
-        meta: { title: "实验设备", icon: "list" },
-      },
-    ],
-  },
+    {
+        path: "/admin",
+        component: Layout,
+        redirect: "/admin/index",
+        children: [
+            {
+                path: "index",
+                component: () => import("@/views/admin/laboratory/index"),
+                name: "Index",
+                meta: {title: "首页", icon: "dashboard", affix: true},
+            },
+        ],
+    },
+    {
+        path: "/admin/account",
+        component: Layout,
+        meta: {title: "账号管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/admin/account/basic-info",
+        children: [
+            {
+                path: "basic-info",
+                component: () =>
+                    import("@/views/admin/laboratory/account/basic-info.vue"),
+                name: "basicInfo",
+                meta: {title: "基本资料", icon: "list"},
+            },
+        ],
+    },
+    {
+        path: "/admin/research",
+        component: Layout,
+        meta: {title: "科研管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/admin/research/patent",
+        children: [
+            {
+                path: "patent",
+                component: () =>
+                    import("@/views/admin/laboratory/research/patent/index.vue"),
+                name: "Patent",
+                meta: {title: "专利列表", icon: "list"},
+            },
+            /*  {
+                  path: "achievement",
+                  // component: () =>
+                  //     import("@/views/admin/laboratory/research/achievement/index.vue"),
+                  component: Layout,
+                  name: "Achievement",
+                  // meta: {title: "成果列表", icon: "list"},
+                  children: [
+                      {
+                          path: "/expert-achievement",
+                          component: () => import("@/views/admin/laboratory/research/achievement/index.vue"),
+                          meta: {title: "专家成果", icon: "list"},
+                          name: 'ExpertddAchievement'
+                      }
+                  ]
+              },*/
+            {
+                path: "expert-achievement",
+                component: () => import("@/views/admin/laboratory/research/achievement/index.vue"),
+                meta: {title: "专家成果", icon: "list"},
+                name: 'ExpertAchievement'
+            },
+            {
+                path: "lab-achievement",
+                component: () => import("@/views/admin/laboratory/research/achievement/index.vue"),
+                meta: {title: "实验室成果", icon: "list"},
+                name: 'LabAchievement'
+            },
+            {
+                path: "service-demand",
+                component: () =>
+                    import("@/views/admin/laboratory/research/service-demand/index.vue"),
+                name: "ServiceDemand",
+                meta: {title: "服务需求列表", icon: "list"},
+            },
+            {
+                path: "service-demand/detail/:id",
+                component: () =>
+                    import("@/views/admin/laboratory/research/service-demand/detail.vue"),
+                hidden: true,
+                name: "ServiceDemandDetail",
+                meta: {title: "查看需求", icon: "list"},
+            },
+            {
+                path: "expert",
+                component: () =>
+                    import("@/views/admin/laboratory/research/expert/index.vue"),
+                name: "Expert",
+                meta: {title: "专家列表", icon: "list"},
+            },
+            {
+                path: "research-project",
+                component: () =>
+                    import(
+                        "@/views/admin/laboratory/research/research-project/index.vue"
+                        ),
+                name: "ResearchProject",
+                meta: {title: "科研项目列表", icon: "list"},
+            },
+            {
+                path: "paper",
+                component: () =>
+                    import("@/views/admin/laboratory/research/paper/index.vue"),
+                name: "Paper",
+                meta: {title: "论文列表", icon: "list"},
+            },
+            {
+                path: "paper/unit-info",
+                component: () =>
+                    import("@/views/admin/laboratory/research/paper/unit-info.vue"),
+                hidden: true,
+                name: "UnitInfo",
+                meta: {title: "浏览单位信息", icon: "list"},
+            },
+            {
+                path: "laboratory-equipment",
+                component: () =>
+                    import(
+                        "@/views/admin/laboratory/research/laboratory-equipment/index.vue"
+                        ),
+                name: "LaboratoryEquipment",
+                meta: {title: "实验设备", icon: "list"},
+            },
+        ],
+    },
 ];
 
 export const researchRoutes = [
-  {
-    /*研究机构后台首页*/
-    path: "/admin",
-    component: Layout,
-    redirect: "/admin/index",
-    children: [
-      {
-        path: "index",
-        component: () => import("@/views/admin/research/index"),
-        name: "Index",
-        meta: { title: "首页", icon: "dashboard", affix: true },
-      },
-    ],
-  },
-  {
-    path: "/admin/account",
-    component: Layout,
-    meta: { title: "账号管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/admin/account/basic-info",
-    children: [
-      {
-        path: "basic-info",
-        component: () =>
-          import("@/views/admin/research/account/basic-info.vue"),
-        name: "basicInfo",
-        meta: { title: "基本资料", icon: "list" },
-      },
-    ],
-  },
-  {
-    path: "/admin/research",
-    component: Layout,
-    meta: { title: "科研管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/admin/research/patent",
-    children: [
-      {
-        path: "patent",
-        component: () =>
-          import("@/views/admin/research/research/patent/index.vue"),
-        name: "Patent",
-        meta: { title: "专利列表", icon: "list" },
-      },
-      {
-        path: "achievement",
-        component: () =>
-          import("@/views/admin/research/research/achievement/index.vue"),
-        name: "Achievement",
-        meta: { title: "成果列表", icon: "list" },
-      },
-      {
-        path: "service-demand",
-        component: () =>
-          import("@/views/admin/research/research/service-demand/index.vue"),
-        name: "ServiceDemand",
-        hidden: true,
-        meta: { title: "服务需求列表", icon: "list" },
-      },
-      {
-        path: "service-demand/detail/:id",
-        component: () =>
-          import("@/views/admin/research/research/service-demand/detail.vue"),
-        hidden: true,
-        name: "ServiceDemandDetail",
-        meta: { title: "查看需求", icon: "list" },
-      },
-      {
-        path: "expert",
-        component: () =>
-          import("@/views/admin/research/research/expert/index.vue"),
-        name: "Expert",
-        meta: { title: "专家列表", icon: "list" },
-      },
-      {
-        path: "research-project",
-        component: () =>
-          import("@/views/admin/research/research/research-project/index.vue"),
-        name: "ResearchProject",
-        meta: { title: "科研项目列表", icon: "list" },
-      },
-      {
-        path: "laboratory",
-        component: () =>
-          import("@/views/admin/research/research/laboratory/index.vue"),
-        name: "Laboratory",
-        meta: { title: "实验室列表", icon: "list" },
-      },
-      {
-        path: "laboratory/edit",
-        component: () =>
-          import("@/views/admin/research/research/laboratory/edit.vue"),
-        name: "EditLaboratory",
-        hidden: true,
-        meta: { title: "修改实验室", icon: "edit" },
-      },
-    ],
-  },
-  {
-    // 客户足迹路由
-    path: "/admin/footprint",
-    component: Layout,
-    meta: { title: "客户足迹", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/admin/footprint/browsing-history",
-    children: [
-      {
-        //    浏览数据
-        path: "browsing-history",
-        component: () =>
-          import("@/views/admin/research/footprint/browsing-history/index.vue"),
-        name: "BrowsingHistory",
-        meta: { title: "浏览数据", icon: "list" },
-      },
-    ],
-  },
+    {
+        /*研究机构后台首页*/
+        path: "/admin",
+        component: Layout,
+        redirect: "/admin/index",
+        children: [
+            {
+                path: "index",
+                component: () => import("@/views/admin/research/index"),
+                name: "Index",
+                meta: {title: "首页", icon: "dashboard", affix: true},
+            },
+        ],
+    },
+    {
+        path: "/admin/account",
+        component: Layout,
+        meta: {title: "账号管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/admin/account/basic-info",
+        children: [
+            {
+                path: "basic-info",
+                component: () =>
+                    import("@/views/admin/research/account/basic-info.vue"),
+                name: "basicInfo",
+                meta: {title: "基本资料", icon: "list"},
+            },
+        ],
+    },
+    {
+        path: "/admin/research",
+        component: Layout,
+        meta: {title: "科研管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/admin/research/patent",
+        children: [
+            {
+                path: "patent",
+                component: () =>
+                    import("@/views/admin/research/research/patent/index.vue"),
+                name: "Patent",
+                meta: {title: "专利列表", icon: "list"},
+            },
+            {
+                path: "expert-achievement",
+                component: () =>
+                    import("@/views/admin/research/research/achievement/index.vue"),
+                name: "ExpertAchievement",
+                meta: {title: "专家成果列表", icon: "list"},
+            }, {
+                path: "research-achievement",
+                component: () =>
+                    import("@/views/admin/research/research/achievement/index.vue"),
+                name: "ResearchAchievement",
+                meta: {title: "科研机构成果列表", icon: "list"},
+            },
+            {
+                path: "service-demand",
+                component: () =>
+                    import("@/views/admin/research/research/service-demand/index.vue"),
+                name: "ServiceDemand",
+                hidden: true,
+                meta: {title: "服务需求列表", icon: "list"},
+            },
+            {
+                path: "service-demand/detail/:id",
+                component: () =>
+                    import("@/views/admin/research/research/service-demand/detail.vue"),
+                hidden: true,
+                name: "ServiceDemandDetail",
+                meta: {title: "查看需求", icon: "list"},
+            },
+            {
+                path: "expert",
+                component: () =>
+                    import("@/views/admin/research/research/expert/index.vue"),
+                name: "Expert",
+                meta: {title: "专家列表", icon: "list"},
+            },
+            {
+                path: "research-project",
+                component: () =>
+                    import("@/views/admin/research/research/research-project/index.vue"),
+                name: "ResearchProject",
+                meta: {title: "科研项目列表", icon: "list"},
+            },
+            {
+                path: "laboratory",
+                component: () =>
+                    import("@/views/admin/research/research/laboratory/index.vue"),
+                name: "Laboratory",
+                meta: {title: "实验室列表", icon: "list"},
+            },
+            {
+                path: "laboratory/edit",
+                component: () =>
+                    import("@/views/admin/research/research/laboratory/edit.vue"),
+                name: "EditLaboratory",
+                hidden: true,
+                meta: {title: "修改实验室", icon: "edit"},
+            },
+        ],
+    },
+    {
+        // 客户足迹路由
+        path: "/admin/footprint",
+        component: Layout,
+        meta: {title: "客户足迹", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/admin/footprint/browsing-history",
+        children: [
+            {
+                //    浏览数据
+                path: "browsing-history",
+                component: () =>
+                    import("@/views/admin/research/footprint/browsing-history/index.vue"),
+                name: "BrowsingHistory",
+                meta: {title: "浏览数据", icon: "list"},
+            },
+        ],
+    },
 ];
 
 /**
@@ -850,204 +877,204 @@ export const researchRoutes = [
  * @type {[{redirect: string, path: string, component: {}, children: [{path: string, component: (function(): Promise<{}>), meta: {affix: boolean, icon: string, title: string}, name: string}]}]}
  */
 export const agentRoutes = [
-  {
-    /*研究机构后台首页*/
-    path: "/admin",
-    component: Layout,
-    redirect: "/admin/index",
-    children: [
-      {
-        path: "index",
-        component: () => import("@/views/admin/agent/index"),
-        name: "Index",
-        meta: { title: "首页", icon: "dashboard", affix: true },
-      },
-    ],
-  },
-  {
-    path: "/admin/service",
-    component: Layout,
-    meta: { title: "服务管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/admin/service/enterprise",
-    children: [
-      {
-        path: "enterprise",
-        component: () =>
-          import("@/views/admin/agent/service/enterprise/index.vue"),
-        name: "ServiceEnterprise",
-        meta: { title: "我服务的企业", icon: "list" },
-      },
-      {
-        path: "technology-demand",
-        component: () =>
-          import(
-            "@/views/admin/agent/service/enterprise/technology-demand.vue"
-          ),
-        name: "TechnologyDemandList",
-        hidden: true,
-        meta: { title: "技术需求列表", icon: "list" },
-      },
-      {
-        path: "results",
-        component: () => import("@/views/admin/enterprise/extension/results"),
-        hidden: true,
-        name: "Results",
-        meta: { title: "匹配结果", icon: "list", isMatch: true },
-      },
-      {
-        path: "technology-demand-release",
-        component: () =>
-          import(
-            "@/views/admin/agent/service/enterprise/technology-demand-release.vue"
-          ),
-        name: "TechnologyDemandRelease",
-        hidden: true,
-        meta: { title: "发布需求", icon: "list" },
-      },
-      {
-        path: "update-status",
-        component: () =>
-          import("@/views/admin/agent/service/enterprise/update-status.vue"),
-        name: "TechnologyDemandUpdateStatus",
-        hidden: true,
-        meta: { title: "更新状态", icon: "list" },
-      },
-      {
-        path: "matching-demand",
-        component: () =>
-          import("@/views/admin/agent/service/matching-demand/index.vue"),
-        name: "EnterpriseDemandMatch",
-        hidden: true,
-        meta: { title: "企业需求匹配", icon: "list" },
-      },
-      {
-        path: "matching-demand-detail",
-        component: () =>
-          import("@/views/admin/agent/service/matching-demand/index.vue"),
-        name: "EnterpriseDemandMatchDetail",
-        hidden: true,
-        meta: { title: "企业需求匹配详情", icon: "list" },
-      },
-    ],
-  },
+    {
+        /*研究机构后台首页*/
+        path: "/admin",
+        component: Layout,
+        redirect: "/admin/index",
+        children: [
+            {
+                path: "index",
+                component: () => import("@/views/admin/agent/index"),
+                name: "Index",
+                meta: {title: "首页", icon: "dashboard", affix: true},
+            },
+        ],
+    },
+    {
+        path: "/admin/service",
+        component: Layout,
+        meta: {title: "服务管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/admin/service/enterprise",
+        children: [
+            {
+                path: "enterprise",
+                component: () =>
+                    import("@/views/admin/agent/service/enterprise/index.vue"),
+                name: "ServiceEnterprise",
+                meta: {title: "我服务的企业", icon: "list"},
+            },
+            {
+                path: "technology-demand",
+                component: () =>
+                    import(
+                        "@/views/admin/agent/service/enterprise/technology-demand.vue"
+                        ),
+                name: "TechnologyDemandList",
+                hidden: true,
+                meta: {title: "技术需求列表", icon: "list"},
+            },
+            {
+                path: "results",
+                component: () => import("@/views/admin/enterprise/extension/results"),
+                hidden: true,
+                name: "Results",
+                meta: {title: "匹配结果", icon: "list", isMatch: true},
+            },
+            {
+                path: "technology-demand-release",
+                component: () =>
+                    import(
+                        "@/views/admin/agent/service/enterprise/technology-demand-release.vue"
+                        ),
+                name: "TechnologyDemandRelease",
+                hidden: true,
+                meta: {title: "发布需求", icon: "list"},
+            },
+            {
+                path: "update-status",
+                component: () =>
+                    import("@/views/admin/agent/service/enterprise/update-status.vue"),
+                name: "TechnologyDemandUpdateStatus",
+                hidden: true,
+                meta: {title: "更新状态", icon: "list"},
+            },
+            {
+                path: "matching-demand",
+                component: () =>
+                    import("@/views/admin/agent/service/matching-demand/index.vue"),
+                name: "EnterpriseDemandMatch",
+                hidden: true,
+                meta: {title: "企业需求匹配", icon: "list"},
+            },
+            {
+                path: "matching-demand-detail",
+                component: () =>
+                    import("@/views/admin/agent/service/matching-demand/index.vue"),
+                name: "EnterpriseDemandMatchDetail",
+                hidden: true,
+                meta: {title: "企业需求匹配详情", icon: "list"},
+            },
+        ],
+    },
 
-  {
-    path: "/admin/account",
-    component: Layout,
-    meta: { title: "账号管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/admin/account/basic-info",
-    children: [
-      {
-        path: "basic-info",
-        component: () => import("@/views/admin/agent/account/basic-info.vue"),
-        name: "basicInfo",
-        meta: { title: "基本资料", icon: "list" },
-      },
-    ],
-  },
-  {
-    path: "/admin/bill",
-    component: Layout,
-    meta: { title: "账单管理", icon: "dashboard" },
-    alwaysShow: true,
-    redirect: "/admin/bill/bill-list",
-    children: [
-      {
-        path: "bill-list",
-        component: () => import("@/views/admin/agent/bill/bill-list/index.vue"),
-        name: "BillList",
-        meta: { title: "账单列表", icon: "list" },
-      },
-    ],
-  },
+    {
+        path: "/admin/account",
+        component: Layout,
+        meta: {title: "账号管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/admin/account/basic-info",
+        children: [
+            {
+                path: "basic-info",
+                component: () => import("@/views/admin/agent/account/basic-info.vue"),
+                name: "basicInfo",
+                meta: {title: "基本资料", icon: "list"},
+            },
+        ],
+    },
+    {
+        path: "/admin/bill",
+        component: Layout,
+        meta: {title: "账单管理", icon: "dashboard"},
+        alwaysShow: true,
+        redirect: "/admin/bill/bill-list",
+        children: [
+            {
+                path: "bill-list",
+                component: () => import("@/views/admin/agent/bill/bill-list/index.vue"),
+                name: "BillList",
+                meta: {title: "账单列表", icon: "list"},
+            },
+        ],
+    },
 ];
 
 // 动态路由，基于用户权限动态去加载
 export const dynamicRoutes = [
-  {
-    path: "/system/user-auth",
-    component: Layout,
-    hidden: true,
-    permissions: ["system:user:edit"],
-    children: [
-      {
-        path: "role/:userId(\\d+)",
-        component: () => import("@/views/system/user/authRole"),
-        name: "AuthRole",
-        meta: { title: "分配角色", activeMenu: "/system/user" },
-      },
-    ],
-  },
-  {
-    path: "/system/role-auth",
-    component: Layout,
-    hidden: true,
-    permissions: ["system:role:edit"],
-    children: [
-      {
-        path: "user/:roleId(\\d+)",
-        component: () => import("@/views/system/role/authUser"),
-        name: "AuthUser",
-        meta: { title: "分配用户", activeMenu: "/system/role" },
-      },
-    ],
-  },
-  {
-    path: "/system/dict-data",
-    component: Layout,
-    hidden: true,
-    permissions: ["system:dict:list"],
-    children: [
-      {
-        path: "index/:dictId(\\d+)",
-        component: () => import("@/views/system/dict/data"),
-        name: "Data",
-        meta: { title: "字典数据", activeMenu: "/system/dict" },
-      },
-    ],
-  },
-  {
-    path: "/monitor/job-log",
-    component: Layout,
-    hidden: true,
-    permissions: ["monitor:job:list"],
-    children: [
-      {
-        path: "index",
-        component: () => import("@/views/monitor/job/log"),
-        name: "JobLog",
-        meta: { title: "调度日志", activeMenu: "/monitor/job" },
-      },
-    ],
-  },
-  {
-    path: "/tool/gen-edit",
-    component: Layout,
-    hidden: true,
-    permissions: ["tool:gen:edit"],
-    children: [
-      {
-        path: "index/:tableId(\\d+)",
-        component: () => import("@/views/tool/gen/editTable"),
-        name: "GenEdit",
-        meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
-      },
-    ],
-  },
+    {
+        path: "/system/user-auth",
+        component: Layout,
+        hidden: true,
+        permissions: ["system:user:edit"],
+        children: [
+            {
+                path: "role/:userId(\\d+)",
+                component: () => import("@/views/system/user/authRole"),
+                name: "AuthRole",
+                meta: {title: "分配角色", activeMenu: "/system/user"},
+            },
+        ],
+    },
+    {
+        path: "/system/role-auth",
+        component: Layout,
+        hidden: true,
+        permissions: ["system:role:edit"],
+        children: [
+            {
+                path: "user/:roleId(\\d+)",
+                component: () => import("@/views/system/role/authUser"),
+                name: "AuthUser",
+                meta: {title: "分配用户", activeMenu: "/system/role"},
+            },
+        ],
+    },
+    {
+        path: "/system/dict-data",
+        component: Layout,
+        hidden: true,
+        permissions: ["system:dict:list"],
+        children: [
+            {
+                path: "index/:dictId(\\d+)",
+                component: () => import("@/views/system/dict/data"),
+                name: "Data",
+                meta: {title: "字典数据", activeMenu: "/system/dict"},
+            },
+        ],
+    },
+    {
+        path: "/monitor/job-log",
+        component: Layout,
+        hidden: true,
+        permissions: ["monitor:job:list"],
+        children: [
+            {
+                path: "index",
+                component: () => import("@/views/monitor/job/log"),
+                name: "JobLog",
+                meta: {title: "调度日志", activeMenu: "/monitor/job"},
+            },
+        ],
+    },
+    {
+        path: "/tool/gen-edit",
+        component: Layout,
+        hidden: true,
+        permissions: ["tool:gen:edit"],
+        children: [
+            {
+                path: "index/:tableId(\\d+)",
+                component: () => import("@/views/tool/gen/editTable"),
+                name: "GenEdit",
+                meta: {title: "修改生成配置", activeMenu: "/tool/gen"},
+            },
+        ],
+    },
 ];
 
 const router = createRouter({
-  history: createWebHistory(),
-  routes: constantRoutes,
-  scrollBehavior(to, from, savedPosition) {
-    if (savedPosition) {
-      return savedPosition;
-    } else {
-      return { top: 0 };
-    }
-  },
+    history: createWebHistory(),
+    routes: constantRoutes,
+    scrollBehavior(to, from, savedPosition) {
+        if (savedPosition) {
+            return savedPosition;
+        } else {
+            return {top: 0};
+        }
+    },
 });
 
 export default router;
diff --git a/src/views/admin/agent/account/basic-info.vue b/src/views/admin/agent/account/basic-info.vue
index 0908b58..7df06bf 100644
--- a/src/views/admin/agent/account/basic-info.vue
+++ b/src/views/admin/agent/account/basic-info.vue
@@ -1,32 +1,7 @@
 <template>
   <div class="app-container">
     <el-card shadow="always" style="width: 55%; margin: 0 auto"
-      ><p><b>基本资料</b></p>
-      <el-form
-        ref="personFormRef"
-        :model="personForm"
-        :rules="rules"
-        label-width="100px"
       >
-        <el-form-item label="姓名:" prop="nickName">
-          <el-input v-model="personForm.nickName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="手机:" prop="mobile">
-          <el-input v-model="personForm.mobile" placeholder="请输入手机号" />
-        </el-form-item>
-        <el-form-item label="邮箱:" prop="email">
-          <el-input v-model="personForm.email" placeholder="请输入邮箱" />
-        </el-form-item>
-        <el-form-item label="职务:" prop="post">
-          <el-input v-model="personForm.post" placeholder="请输入职务" />
-        </el-form-item>
-        <el-form-item label="固定电话:" prop="phone">
-          <el-input v-model="personForm.phone" placeholder="请输入固定电话" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="submitPersonalInfo">提交</el-button>
-        </el-form-item>
-      </el-form>
       <p><b>实验室资料</b></p>
       <!--    <laboratory-form ref="labFormRef" v-model="form" :is-add="false"/>-->
       <agent-form ref="agentFormRef" v-model="form" :is-add="false" />
diff --git a/src/views/admin/laboratory/research/achievement/index.vue b/src/views/admin/laboratory/research/achievement/index.vue
index 39d3465..1b4fc63 100644
--- a/src/views/admin/laboratory/research/achievement/index.vue
+++ b/src/views/admin/laboratory/research/achievement/index.vue
@@ -1,56 +1,59 @@
 <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="成果名称" prop="title">
         <el-input
-          v-model="queryParams.title"
-          clearable
-          placeholder="请输入成果名称"
-          size="small"
-          style="width: 240px"
-          @keyup.enter="handleQuery"
+            v-model="queryParams.title"
+            clearable
+            placeholder="请输入成果名称"
+            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"
+        >搜索
         </el-button>
         <el-button icon="Refresh" size="small" @click="resetQuery"
-          >重置
+        >重置
         </el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
+      <el-col v-if="route.name==='LabAchievement'" :span="1.5">
+        <el-button icon="UploadFilled" size="small" type="primary" @click="handleImport">导入成果</el-button>
+      </el-col>
       <right-toolbar
-        v-model:showSearch="showSearch"
-        @queryTable="getList"
+          v-model:showSearch="showSearch"
+          @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
     <!-- 表格数据 -->
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column label="数据编号" prop="id" />
+      <el-table-column label="数据编号" prop="id"/>
       <el-table-column
-        :show-overflow-tooltip="true"
-        label="成果名称"
-        prop="title"
+          :show-overflow-tooltip="true"
+          label="成果名称"
+          prop="title"
       />
       <el-table-column
-        :show-overflow-tooltip="true"
-        label="成果领域"
-        prop="industryStr"
+          :show-overflow-tooltip="true"
+          label="成果领域"
+          prop="industryStr"
       />
-      <el-table-column label="所属专家" prop="expertName" />
+      <el-table-column v-if="route.name ==='ExpertAchievement'" label="所属专家" prop="expertName"/>
       <!--      <el-table-column label="浏览量" prop="visitCount"/>-->
       <el-table-column align="center" label="发布时间" prop="createTime">
         <template #default="{ row }">
@@ -58,9 +61,9 @@
         </template>
       </el-table-column>
       <el-table-column
-        align="center"
-        class-name="small-padding fixed-width"
-        label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          label="操作"
       >
         <template #default="{ row }">
           <!--          <el-button-->
@@ -72,47 +75,109 @@
           <!--          </el-button-->
           <!--          >-->
           <el-button
-            icon="delete"
-            size="small"
-            type="text"
-            @click="handleDelete(row.id)"
-            >删除
+              icon="delete"
+              size="small"
+              type="text"
+              @click="handleDelete(row.id)"
+          >删除
           </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="upload.dialogVisible"
+        append-to-body
+        title="导入成果"
+        width="400px"
+    >
+      <el-upload
+          ref="uploadRef"
+          :action="upload.url"
+          :auto-upload="false"
+          :disabled="upload.isUploading"
+          :headers="upload.headers"
+          :limit="1"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          accept=".xlsx, .xls"
+          drag
+      >
+        <el-icon class="el-icon--upload">
+          <upload-filled/>
+        </el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link
+                :underline="false"
+                style="font-size: 12px; vertical-align: baseline"
+                type="primary"
+                @click="saveAs(xlsl, '成果导入模板.xlsx')"
+            >下载模板
+            </el-link
+            >
+          </div>
+          <div class="el-upload__tip text-center">
+            <span style="color: red">成果导入说明(必读)。</span>
+            <el-link
+                :underline="false"
+                style="font-size: 12px; vertical-align: baseline"
+                type="primary"
+                @click="saveAs(importTip, '成果导入说明(必读).txt')"
+            >下载
+            </el-link
+            >
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.dialogVisible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import dayjs from "dayjs";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { useRouter } from "vue-router";
-import { getCurrentInstance, reactive, ref, toRefs } from "vue";
-import {
-  achievementList,
-  deleteAchievements,
-} from "@/api/admin/laboratory/achievement";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {useRouter} from "vue-router";
+import {getCurrentInstance, reactive, ref, toRefs} from "vue";
+import {achievementList, deleteAchievements, laboratoryAchievementList} from "@/api/admin/laboratory/achievement";
+import {getToken} from "@/utils/auth";
+import xlsl from '@/assets/achievement_import_template.xlsx?url'
+import importTip from '@/assets/achievement_import_description.txt?url'
+import {saveAs} from 'file-saver'
 
 const router = useRouter();
+const route = useRoute()
 
-const { proxy } = getCurrentInstance();
-
+const {proxy} = getCurrentInstance();
+console.log(route.name)
 const dataList = ref([]);
 const open = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
 const title = ref("");
-
+const fetchMethods = {
+  "LabAchievement": laboratoryAchievementList,
+  "ExpertAchievement": achievementList,
+}
 const data = reactive({
   queryParams: {
     pageNum: 1,
@@ -121,22 +186,22 @@ const data = reactive({
   },
 });
 
-const { queryParams } = toRefs(data);
+const {queryParams} = toRefs(data);
 
 const queryRef = ref();
 
 /** 查询数据列表 */
 const getList = async () => {
   loading.value = true;
-  achievementList(queryParams.value)
-    .then((resp) => {
-      dataList.value = resp.rows;
-      total.value = resp.total;
-      loading.value = false;
-    })
-    .catch(() => {
-      loading.value = false;
-    });
+  fetchMethods[route.name](queryParams.value)
+      .then((resp) => {
+        dataList.value = resp.rows;
+        total.value = resp.total;
+        loading.value = false;
+      })
+      .catch(() => {
+        loading.value = false;
+      });
 };
 
 /** 搜索按钮操作 */
@@ -157,16 +222,69 @@ function resetQuery() {
  */
 function handleDelete(id) {
   ElMessageBox.confirm('是否确认删除数据编号为"' + id + '"的成果项?')
-    .then(function () {
-      return deleteAchievements(id);
-    })
-    .then(() => {
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch((err) => {
-      console.log(err);
-    });
+      .then(function () {
+        return deleteAchievements(id);
+      })
+      .then(() => {
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+}
+
+const uploadRef = ref(null)
+const upload = reactive({
+  dialogVisible: false,
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: {'client-token': "Bearer " + getToken()},
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/app/laboratory/importData",
+})
+
+/**
+ * 导入成果
+ */
+const handleImport = () => {
+  upload.dialogVisible = true
+};
+
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.dialogVisible = false;
+  upload.isUploading = false;
+  uploadRef.value.handleRemove(file);
+  proxy.$alert(
+      "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+      response.msg +
+      "</div>",
+      "导入结果",
+      {dangerouslyUseHTMLString: true}
+  );
+  getList();
+};
+
+/** 下载模板操作 */
+const importTemplate = () => {
+  saveAs(xlsl, '成果导入模板.xlsx')
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  uploadRef.value.submit();
 }
 
 getList();
diff --git a/src/views/admin/research/research/achievement/index.vue b/src/views/admin/research/research/achievement/index.vue
index ed4d0d3..e293a0c 100644
--- a/src/views/admin/research/research/achievement/index.vue
+++ b/src/views/admin/research/research/achievement/index.vue
@@ -1,56 +1,61 @@
 <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="成果名称" prop="title">
         <el-input
-          v-model="queryParams.title"
-          clearable
-          placeholder="请输入成果名称"
-          size="small"
-          style="width: 240px"
-          @keyup.enter="handleQuery"
+            v-model="queryParams.title"
+            clearable
+            placeholder="请输入成果名称"
+            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"
+        >搜索
         </el-button>
         <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 v-if="route.name==='ResearchAchievement'" icon="UploadFilled" size="small" type="primary"
+                   @click="handleImport">导入成果
+        </el-button>
+      </el-col>
       <right-toolbar
-        v-model:showSearch="showSearch"
-        @queryTable="getList"
+          v-model:showSearch="showSearch"
+          @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
     <!-- 表格数据 -->
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column label="数据编号" prop="id" />
+      <el-table-column label="数据编号" prop="id"/>
       <el-table-column
-        :show-overflow-tooltip="true"
-        label="成果名称"
-        prop="title"
+          :show-overflow-tooltip="true"
+          label="成果名称"
+          prop="title"
       />
       <el-table-column
-        :show-overflow-tooltip="true"
-        label="成果领域"
-        prop="industryStr"
+          :show-overflow-tooltip="true"
+          label="成果领域"
+          prop="industryStr"
       />
-      <el-table-column label="所属专家" prop="expertName" />
+      <el-table-column v-if="route.name==='ExpertAchievement'" label="所属专家" prop="expertName"/>
       <!--      <el-table-column label="浏览量" prop="visitCount"/>-->
       <el-table-column align="center" label="发布时间" prop="createTime">
         <template #default="{ row }">
@@ -58,9 +63,9 @@
         </template>
       </el-table-column>
       <el-table-column
-        align="center"
-        class-name="small-padding fixed-width"
-        label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          label="操作"
       >
         <template #default="{ row }">
           <!--          <el-button-->
@@ -72,35 +77,93 @@
           <!--          </el-button-->
           <!--          >-->
           <el-button
-            icon="delete"
-            size="small"
-            type="text"
-            @click="handleDelete(row.id)"
-            >删除
+              icon="delete"
+              size="small"
+              type="text"
+              @click="handleDelete(row.id)"
+          >删除
           </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="upload.dialogVisible"
+        append-to-body
+        title="导入成果"
+        width="400px"
+    >
+      <el-upload
+          ref="uploadRef"
+          :action="upload.url"
+          :auto-upload="false"
+          :disabled="upload.isUploading"
+          :headers="upload.headers"
+          :limit="1"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          accept=".xlsx, .xls"
+          drag
+      >
+        <el-icon class="el-icon--upload">
+          <upload-filled/>
+        </el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link
+                :underline="false"
+                style="font-size: 12px; vertical-align: baseline"
+                type="primary"
+                @click="saveAs(xlsl, '成果导入模板.xlsx')"
+            >下载模板
+            </el-link
+            >
+          </div>
+          <div class="el-upload__tip text-center">
+            <span style="color: red">成果导入说明(必读)。</span>
+            <el-link
+                :underline="false"
+                style="font-size: 12px; vertical-align: baseline"
+                type="primary"
+                @click="saveAs(importTip, '成果导入说明(必读).txt')"
+            >下载
+            </el-link
+            >
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.dialogVisible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
   </div>
 </template>
 
 <script setup>
 import dayjs from "dayjs";
-import { useRouter } from "vue-router";
-import { reactive, ref, toRefs } from "vue";
-import { ElMessage, ElMessageBox } from "element-plus";
-import {
-  achievementList,
-  deleteAchievements,
-} from "@/api/admin/research/achievement";
+import {useRoute, useRouter} from "vue-router";
+import {reactive, ref, toRefs} from "vue";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {achievementList, deleteAchievements, researchAchievementList} from "@/api/admin/research/achievement";
+import {getToken} from "@/utils/auth";
+import xlsl from '@/assets/achievement_import_template.xlsx?url'
+import importTip from '@/assets/achievement_import_description.txt?url'
+import {saveAs} from "file-saver";
 
 const router = useRouter();
 
@@ -110,7 +173,7 @@ const loading = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
 const title = ref("");
-
+const route = useRoute()
 const data = reactive({
   queryParams: {
     pageNum: 1,
@@ -119,22 +182,25 @@ const data = reactive({
   },
 });
 
-const { queryParams } = toRefs(data);
+const {queryParams} = toRefs(data);
 
 const queryRef = ref();
-
+const fetchMethods = {
+  "ResearchAchievement": researchAchievementList,
+  "ExpertAchievement": achievementList,
+}
 /** 查询数据列表 */
 const getList = async () => {
   loading.value = true;
-  achievementList(queryParams.value)
-    .then((resp) => {
-      dataList.value = resp.rows;
-      total.value = resp.total;
-      loading.value = false;
-    })
-    .catch(() => {
-      loading.value = false;
-    });
+  fetchMethods[route.name](queryParams.value)
+      .then((resp) => {
+        dataList.value = resp.rows;
+        total.value = resp.total;
+        loading.value = false;
+      })
+      .catch(() => {
+        loading.value = false;
+      });
 };
 
 /** 搜索按钮操作 */
@@ -155,14 +221,65 @@ function resetQuery() {
  */
 function handleDelete(id) {
   ElMessageBox.confirm(`是否确认删除数据编号为"${id}"的成果项?'`)
-    .then(function () {
-      return deleteAchievements(id);
-    })
-    .then(() => {
-      getList();
-      ElMessage.success("删除成功");
-    });
+      .then(function () {
+        return deleteAchievements(id);
+      })
+      .then(() => {
+        getList();
+        ElMessage.success("删除成功");
+      });
 }
 
+
+const uploadRef = ref(null)
+const upload = reactive({
+  dialogVisible: false,
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: {'client-token': "Bearer " + getToken()},
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/app/research/importData",
+})
+
+/**
+ * 导入成果
+ */
+const handleImport = () => {
+  upload.dialogVisible = true
+};
+
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.dialogVisible = false;
+  upload.isUploading = false;
+  uploadRef.value.handleRemove(file);
+  proxy.$alert(
+      "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+      response.msg +
+      "</div>",
+      "导入结果",
+      {dangerouslyUseHTMLString: true}
+  );
+  getList();
+};
+
+
+/** 提交上传文件 */
+function submitFileForm() {
+  uploadRef.value.submit();
+}
+
+
 getList();
 </script>
diff --git a/src/views/components/AgentForm/index.vue b/src/views/components/AgentForm/index.vue
index 41150ff..ffc9f03 100644
--- a/src/views/components/AgentForm/index.vue
+++ b/src/views/components/AgentForm/index.vue
@@ -1,13 +1,13 @@
 <template>
   <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">基本信息</div>
 
-    <el-row v-if="isAdd">
+    <el-row>
       <el-col :span="24">
         <el-form-item label="姓名:" prop="name">
           <el-input v-model="modelValue.name"></el-input>
@@ -15,10 +15,10 @@
       </el-col>
     </el-row>
 
-    <el-row v-if="isAdd">
+    <el-row>
       <el-col :span="24">
-        <el-form-item label="手机号:" prop="mobile">
-          <el-input v-model="modelValue.mobile"></el-input>
+        <el-form-item label="手机号:" prop="phone">
+          <el-input v-model="modelValue.phone"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -34,7 +34,7 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="工作所在地:" prop="wordAddress">
-          <el-input v-model="modelValue.wordAddress" />
+          <el-input v-model="modelValue.wordAddress"/>
         </el-form-item>
       </el-col>
     </el-row>
@@ -43,23 +43,23 @@
       <el-col :span="24">
         <el-form-item label="工作经历:" prop="experience">
           <el-input
-            v-model="modelValue.experience"
-            :autosize="{ minRows: 2, maxRows: 10 }"
-            type="textarea"
+              v-model="modelValue.experience"
+              :autosize="{ minRows: 2, maxRows: 10 }"
+              type="textarea"
           />
         </el-form-item>
       </el-col>
     </el-row>
 
-    <field-options ref="researchsFormRef" v-model="modelValue" />
+    <field-options ref="researchsFormRef" v-model="modelValue"/>
 
     <InputBoxAdd
-      ref="keywordsFormRef"
-      v-model="modelValue"
-      :labelWidth="labelWidth"
-      fieldKey="keywords"
-      placeholder="应用场景关键词+技术产品关键词"
-      title="关键词"
+        ref="keywordsFormRef"
+        v-model="modelValue"
+        :labelWidth="labelWidth"
+        fieldKey="keywords"
+        placeholder="应用场景关键词+技术产品关键词"
+        title="关键词"
     />
 
     <el-row v-if="isAdd">
@@ -69,9 +69,9 @@
             <el-col :span="8">
               <el-form-item prop="idImage.0">
                 <ImageUpload
-                  v-model="modelValue.idImage[0]"
-                  :isShowTip="false"
-                  :limit="1"
+                    v-model="modelValue.idImage[0]"
+                    :isShowTip="false"
+                    :limit="1"
                 />
               </el-form-item>
               <div style="text-align: center">身份证人像面</div>
@@ -79,9 +79,9 @@
             <el-col :span="8">
               <el-form-item prop="idImage.1">
                 <ImageUpload
-                  v-model="modelValue.idImage[1]"
-                  :isShowTip="false"
-                  :limit="1"
+                    v-model="modelValue.idImage[1]"
+                    :isShowTip="false"
+                    :limit="1"
                 />
               </el-form-item>
               <div style="text-align: center">身份证国徽面</div>
@@ -89,9 +89,9 @@
             <el-col :span="8">
               <el-form-item prop="idImage.2">
                 <ImageUpload
-                  v-model="modelValue.idImage[2]"
-                  :isShowTip="false"
-                  :limit="1"
+                    v-model="modelValue.idImage[2]"
+                    :isShowTip="false"
+                    :limit="1"
                 />
               </el-form-item>
               <div style="text-align: center">手持身份证人像面</div>
@@ -107,8 +107,8 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <image-upload
-                v-model="modelValue.certificatePics"
-                :isShowTip="false"
+                  v-model="modelValue.certificatePics"
+                  :isShowTip="false"
               />
             </el-col>
           </el-row>
@@ -120,7 +120,7 @@
 <script setup>
 import InputBoxAdd from "../InputBoxAdd";
 import FieldOptions from "../FieldOptions";
-import { ref } from "vue";
+import {ref} from "vue";
 
 const formRef = ref();
 const researchsFormRef = ref();
@@ -141,21 +141,21 @@ const props = defineProps({
   },
 });
 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" }],
+  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: "请输入手机号码", trigger: "blur" },
+    {required: true, message: "请输入手机号码", trigger: "blur"},
     {
       pattern: /^1[3-9]\d{9}$/,
       message: "请输入正确的手机号码",
       trigger: "blur",
     },
   ],
-  idCard: [{ required: true, message: "请输入", trigger: "blur" }],
-  wordAddress: [{ required: true, message: "请输入", trigger: "blur" }],
-  experience: [{ required: true, 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,
diff --git a/src/views/website/home/comp/index3.vue b/src/views/website/home/comp/index3.vue
index d8b2dca..ec5494c 100644
--- a/src/views/website/home/comp/index3.vue
+++ b/src/views/website/home/comp/index3.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="box3" v-loading="loading">
+  <div v-loading="loading" class="box3">
     <div class="tit">专家分布地图</div>
     <div v-if="state.isShowGoBack" class="close-back" @click="goBack">
-      <img src="./img/back_button.png" />
+      <img src="./img/back_button.png"/>
     </div>
     <!-- echartsDom 兼容缩放 -->
-    <div ref="map" class="map echartsDom" id="map"></div>
+    <div id="map" ref="map" class="map echartsDom"></div>
     <div class="leftBox">
       <div class="head">
         <div class="a">地区</div>
@@ -13,7 +13,7 @@
       </div>
       <template v-if="snapTree.length > 0">
         <div
-          v-for="v in snapTree.slice(
+            v-for="v in snapTree.slice(
             (leftBoxPageNum - 1) * 5,
             leftBoxPageNum * 5
           )"
@@ -27,9 +27,9 @@
         <div class="b">暂无</div>
       </div>
       <RegionPagine
-        v-if="snapTree.length"
-        v-model:page="leftBoxPageNum"
-        :total="snapTree.length"
+          v-if="snapTree.length"
+          v-model:page="leftBoxPageNum"
+          :total="snapTree.length"
       ></RegionPagine>
     </div>
     <div class="rightBox">
@@ -38,10 +38,10 @@
         <div class="b">专家数量</div>
       </div>
       <div
-        v-if="Object.keys(industryTree).length > 0"
-        v-for="(v, k) in industryTree"
+          v-for="(v, k) in industryTree"
+          v-if="Object.keys(industryTree).length > 0"
       >
-        <div class="a" :title="k">{{ k }}</div>
+        <div :title="k" class="a">{{ k }}</div>
         <div class="b">{{ v ?? 0 }}</div>
       </div>
       <div v-else>
@@ -53,19 +53,15 @@
 </template>
 
 <script setup>
-import { defineComponent, getCurrentInstance, onMounted, reactive } from "vue";
-import {
-  countExpertByArea,
-  countExpertByCity,
-  countExpertByProvince,
-} from "../../../../api/website/home/index";
+import {getCurrentInstance, onMounted, reactive} from "vue";
+import {countExpertByArea, countExpertByCity, countExpertByProvince,} from "../../../../api/website/home/index";
 // return;
 // console.log(echarts);
 import * as echarts from "echarts";
 import RegionPagine from "./RegionPagine.vue";
 // import { ElMessage } from "element-plus";
 
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 const loading = shallowRef(true);
 
 let treeData = {};
@@ -78,9 +74,9 @@ const searchRegionData = async (code, level) => {
     let data = {};
 
     if (
-      snapTree.value.length &&
-      snapTree.value[0].code.substring(0, 2) == code.substring(0, 2) &&
-      snapTree.value[0].code.substring(2, 4) != code.substring(2, 4)
+        snapTree.value.length &&
+        snapTree.value[0].code.substring(0, 2) == code.substring(0, 2) &&
+        snapTree.value[0].code.substring(2, 4) != code.substring(2, 4)
     ) {
       data = snapTree.value;
     } else {
@@ -94,9 +90,9 @@ const searchRegionData = async (code, level) => {
     const ctcode = code.substring(0, 4) + "00";
     let data = {};
     if (
-      snapTree.value.length &&
-      snapTree.value[0].code.substring(0, 4) == code.substring(0, 4) &&
-      snapTree.value[0].code.substring(4, 6) != code.substring(4, 6)
+        snapTree.value.length &&
+        snapTree.value[0].code.substring(0, 4) == code.substring(0, 4) &&
+        snapTree.value[0].code.substring(4, 6) != code.substring(4, 6)
     ) {
       data = snapTree.value;
     } else {
@@ -112,7 +108,7 @@ const searchRegionData = async (code, level) => {
       snapTree.value = treeData.count ?? [];
       return treeData.count.find((item) => item.code == code) || false;
     } else {
-      const { count, industry } = await countExpertByProvince();
+      const {count, industry} = await countExpertByProvince();
       industryTree.value = industry ?? {};
       return count.find((item) => item.code == code) || false;
     }
@@ -122,6 +118,7 @@ const searchRegionData = async (code, level) => {
 const findMapCount = (data, code) => {
   return data.find((item) => item.code == code) || false;
 };
+
 function deepFindTree(code, tree) {
   let snap = false;
   for (const key in tree) {
@@ -142,7 +139,8 @@ function deepFindTree(code, tree) {
   return snap;
 }
 
-const getIndustry = () => {};
+const getIndustry = () => {
+};
 
 // function getIndustry(object) {
 //   let snap = {};
@@ -162,9 +160,7 @@ const getIndustry = () => {};
 //         // for (let index = 0; index < element['industry'].length; index++) {
 //         //   const ele = element['industry'][index];
 //         //   if(Object.hasOwnProperty.call(snap, ele)) {
-
 //         //   }
-
 //         // }
 //       }
 //     }
@@ -216,7 +212,6 @@ onMounted(() => {
     industryTree.value = resp.industry ?? {};
     loading.value = false;
   });
-
   let height = document.body.clientHeight;
   let width = document.body.clientWidth;
   let dom = proxy.$refs["map"];
@@ -365,8 +360,8 @@ function loadMapData(areaCode) {
       console.log("------------------");
       for (var i = 0; i < mapJson.features.length; i++) {
         if (
-          mapJson.features[i].properties.adcode == 810000 ||
-          mapJson.features[i].properties.adcode == 820000
+            mapJson.features[i].properties.adcode == 810000 ||
+            mapJson.features[i].properties.adcode == 820000
         ) {
           mapJson.features.splice(i, 1); // 删除下标为i 的元素，i开始只删除一个就它自己了
           i--; // 删除一个元素后数组长度减一了
@@ -390,10 +385,10 @@ function loadMap(mapName, data) {
         orient: "horizontal", //图例排列方向
         padding: 5,
         pieces: [
-          { gte: 0, lte: 99, label: "99", color: "#CAE9FD" },
-          { gte: 100, lte: 299, label: "100-299", color: "#7ED2F7" },
-          { gte: 300, lte: 499, label: "299-499", color: "#039DDD" },
-          { gte: 500, label: "500", color: "#0D4884" },
+          {gte: 0, lte: 99, label: "99", color: "#CAE9FD"},
+          {gte: 100, lte: 299, label: "100-299", color: "#7ED2F7"},
+          {gte: 300, lte: 499, label: "299-499", color: "#039DDD"},
+          {gte: 500, label: "500", color: "#0D4884"},
           // {max: 30, label: '安全', color: '#2c9a42'},
           // {min: 30, max: 60, label: '警告', color: '#d08a00'},
           // {min: 60, label: '危险', color: '#c23c33'},
@@ -467,6 +462,7 @@ function loadMap(mapName, data) {
   height: 100%;
   background: linear-gradient(0deg, #010101, #041744);
   position: relative;
+
   .tit {
     position: absolute;
     top: 75px;
@@ -478,6 +474,7 @@ function loadMap(mapName, data) {
     color: #ffffff;
   }
 }
+
 .map {
   width: 100%;
   height: 100%;
@@ -498,9 +495,11 @@ function loadMap(mapName, data) {
   top: 100px;
   cursor: pointer;
   z-index: 1000;
+
   &:hover {
     left: 55px;
   }
+
   img {
     margin: 28px auto 0;
     width: 30px;
@@ -508,9 +507,11 @@ function loadMap(mapName, data) {
     transition: all 0.5s;
   }
 }
+
 .leftBox {
   left: 6%;
 }
+
 .rightBox {
   right: 6%;
   max-height: 465px !important;
@@ -527,13 +528,16 @@ function loadMap(mapName, data) {
   background: rgba(4, 22, 65, 0.5);
   border: 1px solid #0054ff;
   color: rgba(161, 192, 255, 1);
+
   & > div {
     display: flex;
   }
+
   .head {
     border-bottom: 1px solid #0054ff;
     color: #ffffff;
   }
+
   .a {
     flex: 1;
     border-right: 1px solid #0054ff;
@@ -543,12 +547,14 @@ function loadMap(mapName, data) {
     white-space: nowrap;
     text-overflow: ellipsis;
   }
+
   .b {
     text-align: center;
     line-height: 42px;
     width: 90px;
   }
 }
+
 .rightBox {
   overflow: hidden;
 }
diff --git a/vite.config.js b/vite.config.js
index eb90d20..cd7aa15 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -31,9 +31,9 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
-          target: "http://101.34.131.16:1618",
           // target: "http://101.34.131.16:1618",
-          // target: "http://192.168.0.201:1618",
+          // target: "http://101.34.131.16:1618",
+          target: "http://192.168.0.201:1618",
           // target: 'http://172.18.3.127:1618',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),