修改

src/components/custom/custom-layout.vue

@@ -50,7 +50,6 @@
           </div>
         </el-col>
       </div>
-      <div class="header_2"></div>
     </div>
     <div class="main">
       <slot></slot>
@@ -263,6 +262,7 @@ const toOut = () => {
 <style lang="scss" scoped>
 #c-layout {
   .header {
+    position: relative;
     background: $global-color-fff;
     .header_1 {
       display: flex;
@@ -300,14 +300,9 @@ const toOut = () => {
         }
       }
     }
-    .header_2 {
-      height: 3px;
-      background-image: linear-gradient(90deg, #4826da 0%, #50ccff 100%), linear-gradient(#003894, #003894);
-      background-blend-mode: normal, normal;
-    }
     .header_3 {
-      // background-color: #dbe9ff;
-      height: 56px;
+      height: 70px;
+      background: linear-gradient(90deg, #1e79ef, #4585ed);
 
       .list {
         height: 100%;
@@ -317,11 +312,9 @@ const toOut = () => {
         align-items: center;
         justify-content: center;
         font-size: $global-font-size-24;
-        color: #1c66e7;
+        color: #ffffff;
         .text {
           width: 10%;
-          height: 56px;
-          line-height: 56px;
           display: flex;
           justify-content: center;
           cursor: default;
@@ -339,27 +332,34 @@ const toOut = () => {
           z-index: 100;
           position: absolute;
           left: 448px;
-          top: 132px;
+          top: 143px;
           cursor: default;
           width: 170px;
-          background-color: #dbe9ff;
+          background: linear-gradient(90deg, #1e79ef, #4585ed);
 
           .children {
-            margin: 10px;
+            padding: 10px;
             text-align: center;
             .title {
               font-size: $global-font-size-22;
-              color: #1c66e7;
+              color: #ffffff;
             }
             .title:hover {
               font-weight: bold;
             }
           }
+          .children:hover {
+            background: #0165e7;
+          }
         }
       }
       .menuTrue {
-        font-weight: bold;
-        background-color: #dbe9ff;
+        background: #0165e7;
+        height: 75px;
+        line-height: 75px;
+        border-radius: 3px;
+        margin-top: -3px;
+        z-index: 100;
       }
     }
   }
@@ -371,7 +371,7 @@ const toOut = () => {
     }
   }
   .main {
-    min-height: 48vh;
+    min-height: 58.5vh;
   }
   .footer {
     padding: 10px 0;

src/views/detail/achievementDetail.vue

@@ -15,7 +15,8 @@
           <div class="other_1">
             <div class="value">
               <el-image class="image" :src="icon1" fit="fill" />
-              <span class="span">{{ info.time || '暂无' }}</span>
+              <span class="span" v-if="info.time == 'Invalid Date'">暂无时间</span>
+              <span v-else class="span">{{ info.time || '暂无' }}</span>
             </div>
             <div class="value">
               <el-image class="image" :src="icon2" fit="fill" />

src/views/detail/platformDetail.vue

@@ -298,11 +298,7 @@ const toCollect = async () => {
               font-size: $global-font-size-18;
               font-weight: normal;
               color: #666;
-            }
-
-            .other_1:hover {
-              color: #2374ff;
-              cursor: pointer;
+              cursor: default;
             }
           }
         }

src/views/detail/serviceDetail.vue

@@ -30,7 +30,7 @@
               </el-col>
               <el-col :span="24" class="other_1">
                 <span>登记时间：</span>
-                {{ info.time || '暂无运营主体' }}
+                {{ info.time || '暂无登记时间' }}
               </el-col>
               <el-col :span="24" class="other_1">
                 <span>联系人：</span>
@@ -273,11 +273,7 @@ const toCollect = async () => {
                 font-size: $global-font-size-18;
                 font-weight: normal;
                 color: #666;
-              }
-
-              .other_1:hover {
-                color: #2374ff;
-                cursor: pointer;
+                cursor: default;
               }
             }
           }

src/views/four/index.vue

@@ -7,7 +7,7 @@
           <a-tab-pane :key="item.key" :tab="item.tab" v-for="item in menuList"> </a-tab-pane>
         </a-tabs>
         <div class="input_1">
-          <el-select size="large" clearable v-model="searchValue" allow-create filterable remote reserve-keyword placeholder="请输入想要搜索的内容" :remote-method="remoteMethod" :loading="searchLoading">
+          <el-select size="large" clearable v-model="searchValue" allow-create filterable remote reserve-keyword placeholder="请输入想要搜索的内容" @clear="onSearch" :remote-method="remoteMethod" :loading="searchLoading">
             <el-option v-for="item in tagsList" :key="item.id" :label="item.title" :value="item.title" />
           </el-select>
           <el-button size="large" @click="onSearch" type="primary">搜索</el-button>
@@ -34,7 +34,7 @@ const store = TagsStore()
 // 加载中
 const loading = ref(false)
 const searchLoading = ref(false)
-const activeKey = ref('1')
+const activeKey = ref('0')
 const searchValue = ref('')
 const list = ref([])
 const tagsList = ref([])

src/views/four/parts/index.vue

@@ -126,14 +126,14 @@
             </el-col>
             <el-col :span="24" class="right_3" v-if="user && user.id">
               <el-col :span="6" class="info">
-                联系人：<span>{{ item.representative || '暂无' }}</span>
+                联系人：<span>{{ item.representative || '暂无联系人' }}</span>
               </el-col>
               <el-col :span="6" class="info"> 成立日期： {{ moment(item.create_time).format('YYYY-MM-DD') || '暂无' }} </el-col>
-              <el-col :span="8" class="info">员工人数：{{ item.person || '暂无' }}人 </el-col>
+              <el-col :span="8" class="info">员工人数：{{ item.person || '0' }}人 </el-col>
             </el-col>
             <el-col :span="24" class="right_3" v-if="user && user.id">
-              <el-col :span="6" class="info">电话：{{ item.phone || '暂无' }}</el-col>
-              <el-col :span="8" class="info">邮箱：{{ item.email || '暂无' }}</el-col>
+              <el-col :span="6" class="info">电话：{{ item.phone || '暂无电话' }}</el-col>
+              <el-col :span="8" class="info">邮箱：{{ item.email || '暂无邮箱' }}</el-col>
             </el-col>
             <el-col :span="24" class="right_3" v-if="user && user.id"> 地址：{{ getArea(item.area) || '暂无' }} </el-col>
           </el-col>

src/views/login/parts/login.vue

@@ -143,7 +143,7 @@ const submitForm = async (formEl) => {
       data.type = 'User'
       if (activeName.value == '0') {
         res = await loginStore.login(data)
-      } else res =await loginStore.loginBySms(data)
+      } else res = await loginStore.loginBySms(data)
       if (res.errcode == '0') {
         ElMessage({ message: `登录成功`, type: 'success' })
         localStorage.setItem('token', res.data)

src/views/one/parts/echarts1.vue

@@ -53,28 +53,14 @@ function echarts1View() {
       trigger: 'item',
       formatter: '{b} : {c} ({d}%)'
     },
-    legend: {
-      right: 0,
-      top: 20,
-      height: 600,
-      itemWidth: 10,
-      itemHeight: 10,
-      itemGap: 10,
-      textStyle: {
-        fontSize: 18
-      },
-      orient: 'vertical',
-      data: info.value.one.nameList
-    },
     calculable: true,
     series: [
       {
         name: '企业行业数据分析',
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
-        radius: [30, 100],
-        center: ['25%', '50%'],
-        roseType: 'radius',
+        radius: ['40%', '70%'],
+        center: ['40%', '50%'],
         label: {
           normal: {
             show: true
@@ -107,10 +93,6 @@ function echarts2View() {
       trigger: 'axis',
       axisPointer: {
         type: 'shadow'
-      },
-
-      formatter: function (param) {
-        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
     grid: {
@@ -132,7 +114,7 @@ function echarts2View() {
         data: info.value.two.nameList,
         // X轴线 标签修改
         textStyle: {
-          fontSize: '14'
+          fontSize: 18
         },
         axisLabel: {
           show: true,
@@ -156,7 +138,7 @@ function echarts2View() {
       splitNumber: 5, // 横线数
       // y轴线 标签修改
       textStyle: {
-        fontSize: '14'
+        fontSize: 18
       },
       axisLabel: {
         show: true,
@@ -195,8 +177,8 @@ function echarts2View() {
             },
             color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
               { offset: 0, color: '#28f2e6' },
-              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
-              { offset: 1, color: 'rgba(255,255,255,0)' }
+              { offset: 0.5, color: 'rgba(40,242,230,0.8)' },
+              { offset: 1, color: 'rgba(255,255,255,0.5)' }
             ])
           }
         }

src/views/one/parts/echarts2.vue

@@ -53,28 +53,14 @@ function echarts1View() {
       trigger: 'item',
       formatter: '{b} : {c} ({d}%)'
     },
-    legend: {
-      right: 0,
-      top: 20,
-      height: 600,
-      itemWidth: 10,
-      itemHeight: 10,
-      itemGap: 10,
-      textStyle: {
-        fontSize: 18
-      },
-      orient: 'vertical',
-      data: info.value.one.nameList
-    },
     calculable: true,
     series: [
       {
-        name: '企业行业数据分析',
+        name: '供给行业数据分析',
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
-        radius: [30, 100],
-        center: ['25%', '50%'],
-        roseType: 'radius',
+        radius: ['40%', '70%'],
+        center: ['40%', '50%'],
         label: {
           normal: {
             show: true
@@ -107,10 +93,6 @@ function echarts2View() {
       trigger: 'axis',
       axisPointer: {
         type: 'shadow'
-      },
-
-      formatter: function (param) {
-        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
     grid: {
@@ -188,8 +170,8 @@ function echarts2View() {
             },
             color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
               { offset: 0, color: '#28f2e6' },
-              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
-              { offset: 1, color: 'rgba(255,255,255,0)' }
+              { offset: 0.5, color: 'rgba(40,242,230,0.8)' },
+              { offset: 1, color: 'rgba(255,255,255,0.5)' }
             ])
           }
         }

src/views/one/parts/echarts3.vue

@@ -53,28 +53,14 @@ function echarts1View() {
       trigger: 'item',
       formatter: '{b} : {c} ({d}%)'
     },
-    legend: {
-      right: 0,
-      top: 20,
-      height: 600,
-      itemWidth: 10,
-      itemHeight: 10,
-      itemGap: 10,
-      textStyle: {
-        fontSize: 18
-      },
-      orient: 'vertical',
-      data: info.value.one.nameList
-    },
     calculable: true,
     series: [
       {
-        name: '企业行业数据分析',
+        name: '需求行业数据分析',
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
-        radius: [30, 100],
-        center: ['25%', '50%'],
-        roseType: 'radius',
+        radius: ['40%', '70%'],
+        center: ['40%', '50%'],
         label: {
           normal: {
             show: true
@@ -107,10 +93,6 @@ function echarts2View() {
       trigger: 'axis',
       axisPointer: {
         type: 'shadow'
-      },
-
-      formatter: function (param) {
-        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
     grid: {
@@ -188,8 +170,8 @@ function echarts2View() {
             },
             color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
               { offset: 0, color: '#28f2e6' },
-              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
-              { offset: 1, color: 'rgba(255,255,255,0)' }
+              { offset: 0.5, color: 'rgba(40,242,230,0.8)' },
+              { offset: 1, color: 'rgba(255,255,255,0.5)' }
             ])
           }
         }

src/views/one/parts/echarts4.vue

@@ -53,28 +53,14 @@ function echarts1View() {
       trigger: 'item',
       formatter: '{b} : {c} ({d}%)'
     },
-    legend: {
-      right: 0,
-      top: 20,
-      height: 600,
-      itemWidth: 10,
-      itemHeight: 10,
-      itemGap: 10,
-      textStyle: {
-        fontSize: 18
-      },
-      orient: 'vertical',
-      data: info.value.one.nameList
-    },
     calculable: true,
     series: [
       {
-        name: '企业行业数据分析',
+        name: '项目行业数据分析',
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
-        radius: [30, 100],
-        center: ['25%', '50%'],
-        roseType: 'radius',
+        radius: ['40%', '70%'],
+        center: ['40%', '50%'],
         label: {
           normal: {
             show: true
@@ -107,10 +93,6 @@ function echarts2View() {
       trigger: 'axis',
       axisPointer: {
         type: 'shadow'
-      },
-
-      formatter: function (param) {
-        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
     grid: {
@@ -188,8 +170,8 @@ function echarts2View() {
             },
             color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
               { offset: 0, color: '#28f2e6' },
-              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
-              { offset: 1, color: 'rgba(255,255,255,0)' }
+              { offset: 0.5, color: 'rgba(40,242,230,0.8)' },
+              { offset: 1, color: 'rgba(255,255,255,0.5)' }
             ])
           }
         }

src/views/one/parts/echarts5.vue

@@ -69,12 +69,11 @@ function echarts1View() {
     calculable: true,
     series: [
       {
-        name: '企业行业数据分析',
+        name: '成果行业数据分析',
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
-        radius: [30, 100],
-        center: ['50%', '50%'],
-        roseType: 'radius',
+        radius: ['40%', '70%'],
+        center: ['40%', '50%'],
         label: {
           normal: {
             show: true
@@ -107,10 +106,6 @@ function echarts2View() {
       trigger: 'axis',
       axisPointer: {
         type: 'shadow'
-      },
-
-      formatter: function (param) {
-        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
     grid: {
@@ -188,8 +183,8 @@ function echarts2View() {
             },
             color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
               { offset: 0, color: '#28f2e6' },
-              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
-              { offset: 1, color: 'rgba(255,255,255,0)' }
+              { offset: 0.5, color: 'rgba(40,242,230,0.8)' },
+              { offset: 1, color: 'rgba(255,255,255,0.5)' }
             ])
           }
         }

src/views/search/index.vue

@@ -12,7 +12,7 @@
           <a-tab-pane key="6" tab="成果"> </a-tab-pane>
         </a-tabs>
         <div class="input_1">
-          <el-select size="large" clearable v-model="searchValue" allow-create filterable remote reserve-keyword placeholder="请输入想要搜索的内容" :remote-method="remoteMethod" :loading="searchLoading">
+          <el-select size="large" clearable v-model="searchValue" allow-create filterable remote reserve-keyword placeholder="请输入想要搜索的内容" :remote-method="remoteMethod" @clear="onSearch" :loading="searchLoading">
             <el-option v-for="item in tagsList" :key="item.id" :label="item.title" :value="item.title" />
           </el-select>
           <el-button size="large" @click="onSearch" type="primary">搜索</el-button>

src/views/seven/index.vue

@@ -139,6 +139,7 @@ const getUrl = (item) => {
       .other_1 {
         font-size: $global-font-size-18;
         margin: 0 0 5px 0;
+        cursor: default;
         span {
           color: #666;
         }

src/views/six/index.vue

@@ -169,6 +169,7 @@ const getUrl = (item) => {
       .other_1 {
         font-size: $global-font-size-18;
         margin: 0 0 5px 0;
+        cursor: default;
         span {
           color: #666;
         }

src/views/thr/demand.vue

@@ -147,14 +147,13 @@ const sizeChange = (limits) => {
 
   .two {
     display: flex;
-    justify-content: space-between;
     flex-wrap: wrap;
     margin: 10px 0;
     background-color: $global-color-fff;
     .list {
       padding-bottom: 20px;
-      margin: 0 0 20px 0;
-      width: 310px;
+      margin: 0 10px 20px 0;
+      width: 317px;
       font-size: 12px;
       color: #666666;
       border: 1px solid rgb(230, 230, 230);
@@ -185,7 +184,7 @@ const sizeChange = (limits) => {
           max-width: 80px;
         }
         span:last-child {
-          max-width: 148px;
+          max-width: 195px;
         }
       }
       .button {
@@ -204,6 +203,9 @@ const sizeChange = (limits) => {
         }
       }
     }
+    .list:nth-child(4n) {
+      margin: 0 0 20px 0 !important;
+    }
     .list:hover {
       .button {
         .detail {

src/views/thr/supply.vue

@@ -138,14 +138,13 @@ const sizeChange = (limits) => {
 
   .two {
     display: flex;
-    justify-content: space-between;
     flex-wrap: wrap;
     margin: 10px 0;
     background-color: $global-color-fff;
     .list {
       padding-bottom: 20px;
-      margin: 0 0 20px 0;
-      width: 310px;
+      margin: 0 10px 20px 0;
+      width: 317px;
       font-size: 12px;
       color: #666666;
       border: 1px solid rgb(230, 230, 230);
@@ -176,7 +175,7 @@ const sizeChange = (limits) => {
           max-width: 80px;
         }
         span:last-child {
-          max-width: 148px;
+          max-width: 195px;
         }
       }
       .button {
@@ -195,6 +194,9 @@ const sizeChange = (limits) => {
         }
       }
     }
+    .list:nth-child(4n) {
+      margin: 0 0 20px 0 !important;
+    }
     .list:hover {
       .button {
         .detail {

src/views/twelve/index.vue

@@ -5,123 +5,51 @@
     </div>
     <div class="w_1700 one" v-else>
       <div class="left">
-        <div class="titleOne">
-          <el-image class="image" :src="left" fit="fill" />
-          <div class="title_center">供给信息</div>
-          <el-image class="image" :src="right" fit="fill" />
-        </div>
-        <el-empty v-if="supplytotal == 0" description="暂无数据" />
-        <div class="leftOne" v-else>
-          <div class="list" v-for="(item, index) in supplyList" :key="index">
-            <div class="title">
-              {{ item.name || '暂无供给名称' }}
-            </div>
-            <div class="other_1" v-if="user && user.id">
-              <span>技术领域：</span>
-              <span class="textOne">{{ item.field || '暂无技术领域' }}</span>
-            </div>
-            <div class="other_1" v-if="user && user.id">
-              <span>所属产业：</span>
-              <span class="textOne">{{ item.industry || '暂无所属产业' }}</span>
-            </div>
-            <div class="other_1" v-if="user && user.id">
-              <span>来源：</span>
-              <span class="textOne">{{ item.source || '暂无来源' }}</span>
-            </div>
-            <div class="button">
-              <div @click="toView(item, '0')" class="detail1">查看详情</div>
-              <div @click="toMate(item, '0')" class="detail2">匹配</div>
-            </div>
-          </div>
-          <el-col :span="24" class="page">
-            <el-pagination background layout="prev, pager, next" :total="supplytotal" :page-size="supplylimit" v-model:current-page="currentPageone" @current-change="changePageone" @size-change="sizeChangeone" />
-          </el-col>
-        </div>
-        <div class="titleOne">
-          <el-image class="image" :src="left" fit="fill" />
-          <div class="title_center">需求信息</div>
-          <el-image class="image" :src="right" fit="fill" />
-        </div>
-        <el-empty v-if="demandtotal == 0" description="暂无数据" />
-        <div v-else class="leftOne">
-          <div class="list" v-for="(item, index) in demandList" :key="index">
-            <div class="title">
-              {{ item.name || '暂无需求名称' }}
-            </div>
-            <div class="other_1" v-if="user && user.id">
-              <span>需求企业：</span>
-              <span class="textOne">{{ item.company || '暂无需求企业' }}</span>
-            </div>
-            <div class="other_1" v-if="user && user.id">
-              <span>技术领域：</span>
-              <span class="textOne">{{ item.field || '暂无技术领域' }}</span>
-            </div>
-            <div class="other_1" v-if="user && user.id">
-              <span>所在地：</span>
-              <span class="textOne">{{ getArea(item.area) || '暂无所在地' }}</span>
-            </div>
-            <div class="other_1" v-if="user && user.id">
-              <span>投入预算：</span>
-              <span class="textOne">{{ item.money || '面议' }}</span>
-            </div>
-            <div class="button">
-              <div @click="toView(item, '1')" class="detail1">查看详情</div>
-              <div @click="toMate(item, '1')" class="detail2">匹配</div>
-            </div>
-          </div>
-          <el-col :span="24" class="page">
-            <el-pagination background layout="prev, pager, next" :total="demandtotal" :page-size="demandlimit" v-model:current-page="currentPagetwo" @current-change="changePagetwo" @size-change="sizeChangetwo" />
-          </el-col>
-        </div>
-      </div>
-      <div class="center"></div>
-      <div class="right" v-if="oneTotal > 0 || twoTotal > 0">
-        <div class="rightOne" v-if="oneTotal > 0">
+        <div class="left_1">
           <div class="titleOne">
             <el-image class="image" :src="left" fit="fill" />
-            <div class="title_center">成果匹配结果</div>
+            <div class="title_center">供给信息</div>
             <el-image class="image" :src="right" fit="fill" />
           </div>
-          <div class="rightContent">
-            <div class="list" v-for="(item, index) in oneList" :key="index">
+          <el-empty v-if="supplytotal == 0" description="暂无数据" />
+          <div class="leftOne" v-else>
+            <div class="list" v-for="(item, index) in supplyList" :key="index">
               <div class="title">
-                {{ item.name || '暂无成果名称' }}
+                {{ item.name || '暂无供给名称' }}
               </div>
               <div class="other_1" v-if="user && user.id">
                 <span>技术领域：</span>
                 <span class="textOne">{{ item.field || '暂无技术领域' }}</span>
               </div>
               <div class="other_1" v-if="user && user.id">
-                <span>负责人：</span>
-                <span class="textOne">{{ item.person || '暂无负责人' }}</span>
-              </div>
-              <div class="other_1" v-if="user && user.id">
-                <span>所在地：</span>
-                <span class="textOne">{{ getArea(item.area) || '暂无所在地' }}</span>
+                <span>所属产业：</span>
+                <span class="textOne">{{ item.industry || '暂无所属产业' }}</span>
               </div>
               <div class="other_1" v-if="user && user.id">
-                <span>推荐指数：</span>
-                <el-rate size="large" v-model="item._recommend" disabled show-score text-color="#ff9900" :score-template="`${item._recommend} 星`" />
+                <span>来源：</span>
+                <span class="textOne">{{ item.source || '暂无来源' }}</span>
               </div>
               <div class="button">
-                <div @click="toView(item, '2')" class="detail1">查看详情</div>
+                <div @click="toView(item, '0')" class="detail1">查看详情</div>
+                <div @click="toMate(item, '0')" class="detail2">匹配</div>
               </div>
             </div>
+            <el-col :span="24" class="page">
+              <el-pagination background layout="prev, pager, next" :total="supplytotal" :page-size="supplylimit" v-model:current-page="currentPageone" @current-change="changePageone" @size-change="sizeChangeone" />
+            </el-col>
           </div>
-          <el-col :span="24" class="page">
-            <el-pagination background layout="prev, pager, next" :total="oneTotal" :page-size="onelimit" v-model:current-page="onecurrentPage" @current-change="onechangePage" @size-change="onesizeChange" />
-          </el-col>
         </div>
-        <div class="rightOne" v-if="twoTotal > 0 && dataType == '0'">
+        <div class="left_1">
           <div class="titleOne">
             <el-image class="image" :src="left" fit="fill" />
-            <div class="title_center">需求匹配结果</div>
+            <div class="title_center">需求信息</div>
             <el-image class="image" :src="right" fit="fill" />
           </div>
-          <div class="rightContent">
-            <div class="list" v-for="(item, index) in twoList" :key="index">
+          <el-empty v-if="demandtotal == 0" description="暂无数据" />
+          <div v-else class="leftOne">
+            <div class="list" v-for="(item, index) in demandList" :key="index">
               <div class="title">
-                {{ item.name || '暂无供给名称' }}
+                {{ item.name || '暂无需求名称' }}
               </div>
               <div class="other_1" v-if="user && user.id">
                 <span>需求企业：</span>
@@ -139,27 +67,48 @@
                 <span>投入预算：</span>
                 <span class="textOne">{{ item.money || '面议' }}</span>
               </div>
-              <div class="other_1" v-if="user && user.id">
-                <span>推荐指数：</span>
-                <el-rate size="large" v-model="item._recommend" disabled show-score text-color="#ff9900" :score-template="`${item._recommend} 星`" />
-              </div>
               <div class="button">
                 <div @click="toView(item, '1')" class="detail1">查看详情</div>
+                <div @click="toMate(item, '1')" class="detail2">匹配</div>
               </div>
             </div>
+            <el-col :span="24" class="page">
+              <el-pagination background layout="prev, pager, next" :total="demandtotal" :page-size="demandlimit" v-model:current-page="currentPagetwo" @current-change="changePagetwo" @size-change="sizeChangetwo" />
+            </el-col>
           </div>
-          <el-col :span="24" class="page">
-            <el-pagination background layout="prev, pager, next" :total="twoTotal" :page-size="twolimit" v-model:current-page="twocurrentPage" @current-change="twochangePage" @size-change="twosizeChange" />
-          </el-col>
         </div>
-        <div class="rightOne" v-if="twoTotal > 0 && dataType == '1'">
-          <div class="titleOne">
-            <el-image class="image" :src="left" fit="fill" />
-            <div class="title_center">供给匹配结果</div>
-            <el-image class="image" :src="right" fit="fill" />
-          </div>
-          <div class="rightContent">
-            <div class="list" v-for="(item, index) in twoList" :key="index">
+      </div>
+      <div class="center"></div>
+      <div class="right" v-if="total > 0">
+        <div class="titleOne">
+          <el-image class="image" :src="left" fit="fill" />
+          <div class="title_center">匹配结果</div>
+          <el-image class="image" :src="right" fit="fill" />
+        </div>
+        <div class="rightContent">
+          <div class="list" v-for="(item, index) in list" :key="index">
+            <div v-if="item._source == 'achievement'" @click="toView(item, '2')">
+              <div class="title">
+                {{ item.name || '暂无成果名称' }}
+              </div>
+              <div class="other_1" v-if="user && user.id">
+                <span>技术领域：</span>
+                <span class="textOne">{{ item.field || '暂无技术领域' }}</span>
+              </div>
+              <div class="other_1" v-if="user && user.id">
+                <span>负责人：</span>
+                <span class="textOne">{{ item.person || '暂无负责人' }}</span>
+              </div>
+              <div class="other_1" v-if="user && user.id">
+                <span>所在地：</span>
+                <span class="textOne">{{ getArea(item.area) || '暂无所在地' }}</span>
+              </div>
+              <div class="other_1" v-if="user && user.id">
+                <span>推荐指数：</span>
+                <el-rate size="large" v-model="item._recommend" disabled show-score text-color="#ff9900" :score-template="`${item._recommend} 星`" />
+              </div>
+            </div>
+            <div v-if="item._source == 'supply'" @click="toView(item, '0')">
               <div class="title">
                 {{ item.name || '暂无供给名称' }}
               </div>
@@ -179,15 +128,37 @@
                 <span>推荐指数：</span>
                 <el-rate size="large" v-model="item._recommend" disabled show-score text-color="#ff9900" :score-template="`${item._recommend} 星`" />
               </div>
-              <div class="button">
-                <div @click="toView(item, '0')" class="detail1">查看详情</div>
+            </div>
+            <div v-if="item._source == 'demand'" @click="toView(item, '1')">
+              <div class="title">
+                {{ item.name || '暂无需求名称' }}
+              </div>
+              <div class="other_1" v-if="user && user.id">
+                <span>需求企业：</span>
+                <span class="textOne">{{ item.company || '暂无需求企业' }}</span>
+              </div>
+              <div class="other_1" v-if="user && user.id">
+                <span>技术领域：</span>
+                <span class="textOne">{{ item.field || '暂无技术领域' }}</span>
+              </div>
+              <div class="other_1" v-if="user && user.id">
+                <span>所在地：</span>
+                <span class="textOne">{{ getArea(item.area) || '暂无所在地' }}</span>
+              </div>
+              <div class="other_1" v-if="user && user.id">
+                <span>投入预算：</span>
+                <span class="textOne">{{ item.money || '面议' }}</span>
+              </div>
+              <div class="other_1" v-if="user && user.id">
+                <span>推荐指数：</span>
+                <el-rate size="large" v-model="item._recommend" disabled show-score text-color="#ff9900" :score-template="`${item._recommend} 星`" />
               </div>
             </div>
           </div>
-          <el-col :span="24" class="page">
-            <el-pagination background layout="prev, pager, next" :total="twoTotal" :page-size="twolimit" v-model:current-page="twocurrentPage" @current-change="twochangePage" @size-change="twosizeChange" />
-          </el-col>
         </div>
+        <el-col :span="24" class="page">
+          <el-pagination background layout="prev, pager, next" :total="total" :page-size="limit" v-model:current-page="currentPage" @current-change="changePage" @size-change="sizeChange" />
+        </el-col>
       </div>
       <div class="right" v-else>
         <div class="titleOne">
@@ -231,21 +202,16 @@ const demandtotal = ref(0)
 const loading = ref(true)
 // 路由
 const router = useRouter()
-// 推荐的成果
-const oneList = ref([])
-// 推荐的需求或供给
-const twoList = ref([])
-// 类型
-const dataType = ref('0')
 const keyword = ref('')
 
-let oneskip = 0
-let onelimit = 3
-const oneTotal = ref(0)
+// 类型
+const dataType = ref('0')
+// 匹配结果
+const list = ref([])
+let skip = 0
+let limit = 9
+const total = ref(0)
 
-let twoskip = 0
-let twolimit = 3
-const twoTotal = ref(0)
 // 请求
 onMounted(async () => {
   setTimeout(async () => {
@@ -254,14 +220,14 @@ onMounted(async () => {
     await searchsupply({ supplyskip, supplylimit })
     await searchdemand({ demandskip, demandlimit })
     loading.value = false
-  }, 5000)
+  }, 6000)
 })
 const searchOther = async () => {}
 // 供给信息
 const searchsupply = async (query = { supplyskip, supplylimit }) => {
   supplyskip = query.supplyskip
   supplylimit = query.supplylimit
-  const info = { skip: query.supplyskip, limit: query.supplylimit, is_use: '0', status: '1', user: user.value.id }
+  const info = { skip: query.supplyskip, limit: query.supplylimit }
   let res = await supplyStore.list(info)
   if (res.errcode == '0') {
     supplyList.value = res.data
@@ -273,7 +239,7 @@ const searchsupply = async (query = { supplyskip, supplylimit }) => {
 const searchdemand = async (query = { demandskip, demandlimit }) => {
   demandskip = query.demandskip
   demandlimit = query.demandlimit
-  const info = { skip: query.demandskip, limit: query.demandlimit, is_use: '0', status: '1', user: user.value.id }
+  const info = { skip: query.demandskip, limit: query.demandlimit }
   let res = await demandStore.list(info)
   if (res.errcode == '0') {
     demandList.value = res.data
@@ -293,28 +259,15 @@ const toView = (item, type) => {
     else router.push({ path: '/achievement/detail', query: { id: item.id || item._id } })
   } else ElMessage({ message: '未登录！', type: 'error' })
 }
-const toMate = async (item, type) => {
+const toMate = async (item) => {
   loading.value = true
   let res
-  let arr
-  dataType.value = type
   keyword.value = item.name
-  if (type == '0') {
-    // 成果和需求
-    arr = await esStore.achievement({ skip: oneskip, limit: onelimit, keyword: item.name })
-    res = await esStore.demand({ skip: twoskip, limit: twolimit, keyword: item.name })
-  } else {
-    // 成果和供给
-    arr = await esStore.achievement({ skip: oneskip, limit: onelimit, keyword: item.name })
-    res = await esStore.supply({ skip: twoskip, limit: twolimit, keyword: item.name })
-  }
-  if (arr.errcode == '0') {
-    oneList.value = arr.data
-    oneTotal.value = arr.total
-  }
+  if (dataType.value == '0') res = await esStore.supply({ skip: skip, limit: limit, keyword: item.name })
+  else res = await esStore.demand({ skip: skip, limit: limit, keyword: item.name })
   if (res.errcode == '0') {
-    twoList.value = res.data
-    twoTotal.value = res.total
+    list.value = res.data
+    total.value = res.total
   }
   loading.value = false
 }
@@ -338,50 +291,29 @@ const sizeChangetwo = (limits) => {
   currentPagetwo.value = 1
   searchdemand({ demandskip: 0, demandlimit: demandlimit })
 }
-const onecurrentPage = ref(1)
-const twocurrentPage = ref(1)
-// 分页
-const onechangePage = (page = onecurrentPage.value) => {
-  searchOne({ oneskip: (page - 1) * onelimit, onelimit: onelimit })
-}
-const onesizeChange = (limits) => {
-  onelimit = limits
-  onecurrentPage.value = 1
-  searchOne({ oneskip: 0, onelimit: onelimit })
-}
-// 分页
-const twochangePage = (page = twocurrentPage.value) => {
-  searchTwo({ twoskip: (page - 1) * twolimit, twolimit: twolimit })
-}
-const twosizeChange = (limits) => {
-  twolimit = limits
-  twocurrentPage.value = 1
-  searchTwo({ twoskip: 0, twolimit: twolimit })
-}
-// 成果分页查询
-const searchOne = async (query = { oneskip, onelimit }) => {
-  oneskip = query.oneskip
-  onelimit = query.onelimit
-  const info = { skip: query.oneskip, limit: query.onelimit, keyword: keyword.value }
-  let res = await esStore.achievement(info)
-  if (res.errcode == '0') {
-    oneList.value = res.data
-    oneTotal.value = res.total
-  }
-}
-// 需求或供给分页查询
-const searchTwo = async (query = { twoskip, twolimit }) => {
-  twoskip = query.twoskip
-  twolimit = query.twolimit
-  const info = { skip: query.twoskip, limit: query.twolimit, keyword: keyword.value }
+// 匹配结果
+const search = async (query = { skip, limit }) => {
+  skip = query.skip
+  limit = query.limit
+  const info = { skip: query.skip, limit: query.limit, keyword: keyword.value }
   let res
-  if (dataType.value == '0') res = await esStore.demand(info)
-  else res = await esStore.supply(info)
+  if (dataType.value == '0') res = await esStore.supply(info)
+  else res = await esStore.demand(info)
   if (res.errcode == '0') {
-    twoList.value = res.data
-    twoTotal.value = res.total
+    list.value = res.data
+    total.value = res.total
   }
 }
+const currentPage = ref(1)
+// 分页
+const changePage = (page = currentPage.value) => {
+  search({ skip: (page - 1) * limit, limit: limit })
+}
+const sizeChange = (limits) => {
+  limit = limits
+  currentPage.value = 1
+  search({ skip: 0, limit: limit })
+}
 </script>
 <style scoped lang="scss">
 .main {
@@ -391,146 +323,42 @@ const searchTwo = async (query = { twoskip, twolimit }) => {
     display: flex;
     align-items: center;
     justify-content: center;
-    background-color: #03a9f4;
+    background-color: #5f5ff5;
+    .image {
+      height: 100%;
+    }
   }
   .one {
     display: flex;
     .left {
       width: 50%;
-      .titleOne {
-        display: flex;
-        align-items: end;
-        justify-content: center;
-        margin: 30px;
-        .image {
-          margin: 0 10px;
-          vertical-align: middle;
-          border-style: none;
-        }
-        .title_center {
-          font-size: $global-font-size-28;
-          font-weight: 600;
-        }
-      }
-      .leftOne {
-        display: flex;
-        justify-content: space-between;
-        flex-wrap: wrap;
+      .left_1 {
         margin: 10px 0;
-        background-color: $global-color-fff;
-        .list {
-          padding-bottom: 20px;
-          margin: 0 0 20px 0;
-          width: 270px;
-          font-size: 12px;
-          color: #666666;
-          border: 1px solid rgb(230, 230, 230);
-          .title {
-            color: #002147;
-            background-color: #c8e0fc;
-            width: 100%;
-            height: 36px;
-            text-align: center;
-            line-height: 36px;
-            font-family: PingFangSC-Medium;
-            font-size: 20px;
-            font-weight: 500;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -webkit-line-clamp: 1;
-            -webkit-box-orient: vertical;
-            margin-bottom: 16px;
-          }
-          .other_1 {
-            margin-bottom: 16px;
-            padding: 0 20px;
-            display: flex;
-            color: #666666;
-            font-size: 16px;
-            span:first-child {
-              max-width: 80px;
-            }
-            span:last-child {
-              max-width: 148px;
-            }
+        padding: 20px 0;
+        box-shadow: 0px 1px 9px 0px rgba(50, 122, 244, 0.12);
+        .titleOne {
+          display: flex;
+          align-items: end;
+          justify-content: center;
+          margin: 0 0 30px 0;
+          .image {
+            margin: 0 10px;
+            vertical-align: middle;
+            border-style: none;
           }
-          .button {
-            display: flex;
-            margin: 30px 0 0 0;
-            .detail1 {
-              font-size: 16px;
-              display: block;
-              margin: 0 auto;
-              width: 90px;
-              text-align: center;
-              line-height: 28px;
-              border-radius: 28px;
-              color: #2281ee;
-              border: 1px solid #2281ee;
-              cursor: default;
-            }
-            .detail2 {
-              font-size: 16px;
-              display: block;
-              margin: 0 auto;
-              width: 90px;
-              text-align: center;
-              line-height: 28px;
-              border-radius: 28px;
-              color: #2281ee;
-              border: 1px solid #2281ee;
-              cursor: default;
-            }
-            .detail1:hover {
-              color: #fff;
-              background-color: #2281ee;
-            }
-            .detail2:hover {
-              color: #fff;
-              background-color: #2281ee;
-            }
+          .title_center {
+            font-size: $global-font-size-28;
+            font-weight: 600;
           }
         }
-      }
-      .page {
-        display: flex;
-        justify-content: center;
-        margin: 20px 0;
-      }
-    }
-    .center {
-      margin: 10px;
-      border-left: 3px dashed #e5e5e5;
-    }
-    .right {
-      width: 50%;
-      .titleOne {
-        display: flex;
-        align-items: end;
-        justify-content: center;
-        margin: 30px;
-        .image {
-          margin: 0 10px;
-          vertical-align: middle;
-          border-style: none;
-        }
-        .title_center {
-          font-size: $global-font-size-28;
-          font-weight: 600;
-        }
-      }
-      .rightOne {
-        .rightContent {
+        .leftOne {
           display: flex;
-          justify-content: space-between;
           flex-wrap: wrap;
-          margin: 10px 0;
-          background-color: $global-color-fff;
+          background-color: #ffffff;
           .list {
             padding-bottom: 20px;
-            margin: 0 0 20px 0;
-            width: 270px;
+            margin: 0 10px 20px 0;
+            width: 265px;
             font-size: 12px;
             color: #666666;
             border: 1px solid rgb(230, 230, 230);
@@ -550,20 +378,18 @@ const searchTwo = async (query = { twoskip, twolimit }) => {
               -webkit-line-clamp: 1;
               -webkit-box-orient: vertical;
               margin-bottom: 16px;
-              padding: 0 10px;
             }
             .other_1 {
-              margin-bottom: 10px;
+              margin-bottom: 16px;
               padding: 0 20px;
               display: flex;
-              align-items: center;
               color: #666666;
               font-size: 16px;
               span:first-child {
                 max-width: 80px;
               }
               span:last-child {
-                max-width: 148px;
+                max-width: 140px;
               }
             }
             .button {
@@ -581,20 +407,125 @@ const searchTwo = async (query = { twoskip, twolimit }) => {
                 border: 1px solid #2281ee;
                 cursor: default;
               }
+              .detail2 {
+                font-size: 16px;
+                display: block;
+                margin: 0 auto;
+                width: 90px;
+                text-align: center;
+                line-height: 28px;
+                border-radius: 28px;
+                color: #2281ee;
+                border: 1px solid #2281ee;
+                cursor: default;
+              }
               .detail1:hover {
                 color: #fff;
                 background-color: #2281ee;
               }
+              .detail2:hover {
+                color: #fff;
+                background-color: #2281ee;
+              }
             }
           }
+          .list:first-child {
+            margin: 0 10px 20px 10px;
+          }
+          .list:nth-child(3n) {
+            margin: 0 0 20px 0 !important;
+          }
         }
-
         .page {
           display: flex;
           justify-content: center;
-          margin: 20px 0;
+          margin: 20px 0 0 0;
+        }
+      }
+      .left_1:first-child {
+        margin: 20px 0 20px 0;
+      }
+    }
+    .center {
+      margin: 10px;
+      border-left: 3px dashed #e5e5e5;
+    }
+    .right {
+      width: 50%;
+      .titleOne {
+        display: flex;
+        align-items: end;
+        justify-content: center;
+        margin: 30px;
+        .image {
+          margin: 0 10px;
+          vertical-align: middle;
+          border-style: none;
+        }
+        .title_center {
+          font-size: $global-font-size-28;
+          font-weight: 600;
+        }
+      }
+      .rightContent {
+        display: flex;
+        flex-wrap: wrap;
+        margin: 10px 0;
+        background-color: $global-color-fff;
+        .list {
+          margin: 0 10px 20px 0;
+          width: 272px;
+          font-size: 12px;
+          color: #666666;
+          border: 1px solid rgb(230, 230, 230);
+          .title {
+            color: #002147;
+            background-color: #c8e0fc;
+            width: 100%;
+            height: 36px;
+            text-align: center;
+            line-height: 36px;
+            font-family: PingFangSC-Medium;
+            font-size: 20px;
+            font-weight: 500;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            margin-bottom: 16px;
+            padding: 0 10px;
+            cursor: default;
+          }
+          .title:hover {
+            color: #fff;
+            background-color: #409eff;
+          }
+          .other_1 {
+            margin-bottom: 10px;
+            padding: 0 20px;
+            display: flex;
+            align-items: center;
+            color: #666666;
+            font-size: 16px;
+            span:first-child {
+              max-width: 80px;
+            }
+            span:last-child {
+              max-width: 148px;
+            }
+          }
+        }
+        .list:nth-child(3n) {
+          margin: 0 0 20px 0 !important;
         }
       }
+
+      .page {
+        display: flex;
+        justify-content: center;
+        margin: 10px 0;
+      }
     }
   }
 }