From dd86abca9a62cd1ef34f4b4c671d7d08873adf7b Mon Sep 17 00:00:00 2001
From: cxc <quantulr@outlook.com>
Date: Wed, 4 Jan 2023 16:11:46 +0800
Subject: [PATCH] bugfix

---
 src/components/webFooter/index.vue            |  6 ++--
 src/views/website/home/comp/RegionPagine.vue  |  6 ++--
 src/views/website/home/comp/index6.vue        | 12 +++----
 src/views/website/login/index.vue             |  4 +--
 .../searchList/components/laboratoryItem.vue  |  5 +--
 .../components/technologyDemandItem.vue       |  4 +--
 .../website/searchList/laboratoryDetail.vue   | 35 ++++++++++++++++---
 7 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/src/components/webFooter/index.vue b/src/components/webFooter/index.vue
index b3212a1..5b97c26 100644
--- a/src/components/webFooter/index.vue
+++ b/src/components/webFooter/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="webFooter">
     <div class="wrap">
-      <el-row type="flex" justify="center" :gutter="100">
-        <el-col :span="6" v-for="item in state.list" :key="item.id">
+      <el-row type="flex" justify="center" :gutter="50">
+        <el-col :span="8" v-for="item in state.list" :key="item.id">
           <div class="tit">{{ item.title }}</div>
           <p v-for="subItem in item.children" :key="subItem.id">
             <a :href="`${subItem.link}`" target="_black">{{ subItem.title }}</a>
@@ -293,7 +293,7 @@ loadsolutionCategoryList();
 }
 
 .wrap {
-  width: 1000px;
+  width: 1200px;
   margin: 0 auto;
   padding: 100px 0;
   font-size: 14px;
diff --git a/src/views/website/home/comp/RegionPagine.vue b/src/views/website/home/comp/RegionPagine.vue
index a11e978..56171e1 100644
--- a/src/views/website/home/comp/RegionPagine.vue
+++ b/src/views/website/home/comp/RegionPagine.vue
@@ -4,7 +4,7 @@
       class="prev"
       :style="{
         cursor: page === 1 ? 'not-allowed' : 'pointer',
-        color: page === 1 ? '#999' : '#fff',
+        color: page === 1 ? '#999' : '#4f93ed',
       }"
       @click="prev"
     >
@@ -15,7 +15,7 @@
       class="next"
       :style="{
         cursor: Math.ceil(total / 5) <= page ? 'not-allowed' : 'pointer',
-        color: Math.ceil(total / 5) <= page ? '#999' : '#fff',
+        color: Math.ceil(total / 5) <= page ? '#999' : '#4f93ed',
       }"
       @click="next"
     >
@@ -62,7 +62,7 @@ const next = () => {
   .next {
     user-select: none;
     cursor: pointer;
-    color: #fff;
+    color: #4f93ed;
     width: 30px;
     height: 30px;
   }
diff --git a/src/views/website/home/comp/index6.vue b/src/views/website/home/comp/index6.vue
index a7bac71..543e66c 100644
--- a/src/views/website/home/comp/index6.vue
+++ b/src/views/website/home/comp/index6.vue
@@ -538,10 +538,10 @@ function loadMap(mapName, data) {
 .rightBox {
   overflow: hidden;
 }
-:deep(.pagine) {
-  .prev,
-  .next {
-    color: #000 !important;
-  }
-}
+// :deep(.pagine) {
+//   .prev,
+//   .next {
+//     color: #4f93ed !important;
+//   }
+// }
 </style>
diff --git a/src/views/website/login/index.vue b/src/views/website/login/index.vue
index bc35be8..f469179 100644
--- a/src/views/website/login/index.vue
+++ b/src/views/website/login/index.vue
@@ -145,8 +145,8 @@ const userStore = useUserStore();
 const isLogin = ref(1);
 
 const loginForm = ref({
-  username: "18212342345",
-  password: "12342345",
+  username: "",
+  password: "",
   rememberMe: false,
   mode: "102",
   captcha: "",
diff --git a/src/views/website/searchList/components/laboratoryItem.vue b/src/views/website/searchList/components/laboratoryItem.vue
index 433c24c..84ec8e4 100644
--- a/src/views/website/searchList/components/laboratoryItem.vue
+++ b/src/views/website/searchList/components/laboratoryItem.vue
@@ -47,7 +47,7 @@
   </div>
 </template>
 
-<script setup>
+<script setup name="LabItem">
 import wordcloud from "./wordcloud.vue";
 import collectAndVisit from "./collectAndVisit.vue";
 import { useRoute, useRouter } from "vue-router";
@@ -73,8 +73,9 @@ function handleDetail(id) {
 }
 
 function createdData(arr) {
+  // debugger;
   let l = [];
-  arr = arr ? arr.split(",") : [];
+  arr = arr ? arr.split(/[,\/]{1}/) : [];
   let snap = JSON.parse(JSON.stringify(arr));
   snap.map((e) => {
     l.push({ name: e, value: 30 });
diff --git a/src/views/website/searchList/components/technologyDemandItem.vue b/src/views/website/searchList/components/technologyDemandItem.vue
index 2022795..30f63ba 100644
--- a/src/views/website/searchList/components/technologyDemandItem.vue
+++ b/src/views/website/searchList/components/technologyDemandItem.vue
@@ -12,9 +12,9 @@
         <div class="tit" @click="handleDetail(data.id)">{{ data.title }}</div>
         <slot name="des" />
 
-        <div v-if="data.industrys" class="line">
+        <div v-if="data.industryStr" class="line">
           所属领域：
-          <span>{{ data.industrys[data.industrys.length - 1] }}</span>
+          <span>{{ data.industryStr }}</span>
         </div>
         <div class="line">
           需求类型：
diff --git a/src/views/website/searchList/laboratoryDetail.vue b/src/views/website/searchList/laboratoryDetail.vue
index eb602c8..6c6b6a6 100644
--- a/src/views/website/searchList/laboratoryDetail.vue
+++ b/src/views/website/searchList/laboratoryDetail.vue
@@ -57,7 +57,9 @@
                 <div class="keywords" style="flex: 1">
                   <wordcloud
                     v-if="state.LabDetail.keyword"
-                    :data="createdData(state.LabDetail.keyword.split(','))"
+                    :data="
+                      createdData(state.LabDetail.keyword.split(/[,\/]{1}/))
+                    "
                   ></wordcloud>
                 </div>
                 <div class="btns">
@@ -79,19 +81,32 @@
               <div style="padding: 20px 0">
                 <div class="pointTit">研究方向</div>
               </div>
-              <div>{{ state.LabDetail.researchDirection }}</div>
+              <div
+                class="html"
+                v-html="state.LabDetail.researchDirection"
+              ></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">主要技术应用场景</div>
               </div>
-              <div>{{ state.LabDetail.primaryTechnology }}</div>
+              <div
+                v-html="
+                  state.LabDetail.primaryTechnology?.replaceAll(`/`, `<br />`)
+                "
+              ></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">承担科研项目情况</div>
               </div>
-              <div>{{ state.LabDetail.researchProject }}</div>
+              <div
+                v-html="
+                  state.LabDetail.researchProject?.replaceAll('/', `</br>`)
+                "
+              ></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">代表性科技成果</div>
               </div>
-              <div>{{ state.LabDetail.achievement }}</div>
+              <div
+                v-html="state.LabDetail.achievement?.replaceAll('/', `</br>`)"
+              ></div>
               <div style="padding: 20px 0">
                 <div class="pointTit">所属行业领域</div>
               </div>
@@ -184,6 +199,16 @@ function getDataList() {
   if (!id) return;
   searchLaboratoryDetail(id)
     .then((resp) => {
+      const data = resp.data;
+      data.introduction = data.introduction
+        ?.replaceAll("\n", "</br>")
+        ?.replaceAll(" ", "&ensp;");
+      data.member = data.member
+        ?.replaceAll("\n", "</br>")
+        ?.replaceAll(" ", "&ensp;");
+      data.researchDirection = data.researchDirection
+        ?.replaceAll("/", "</br>")
+        ?.replaceAll(" ", "&ensp;");
       state.LabDetail = resp.data;
       loading.value = false;
     })