修改精准匹配

.env.development

@@ -7,6 +7,8 @@ VITE_APP_PORT = 3003
 # 代理前缀
 VITE_APP_BASE_API = '/cxyy/api'
 
+VITE_APP_ES_API = '/cxyy/es'
+
 VITE_APP_BASE_APIWS ='/websocket/api'
 
 VITE_APP_HOME = "http://localhost:3000/"

.env.production

@@ -7,6 +7,8 @@ VITE_APP_PORT = 3003
 # 代理前缀
 VITE_APP_BASE_API = '/cxyy/api'
 
+VITE_APP_ES_API = '/cxyy/es'
+
 VITE_APP_BASE_APIWS ='/websocket/api'
 
 VITE_APP_HOST = ""

src/layout/site.js

@@ -39,7 +39,15 @@ export const menuList = [
   { key: '7', title: '中试平台', route: 'six', English: 'Project Selection', label: '中试平台' },
   { key: '8', title: '服务支撑', route: 'seven', English: 'Innovation Competition', label: '服务支撑' },
   { key: '9', title: '产业集群', route: 'eight', English: 'Innovation Competition', label: '产业集群' },
-  { key: '10', title: '行研产研', route: 'thirteen', English: 'Research Development', label: '行研产研' }
+  { key: '11', title: '孵化基地', route: 'eleven', English: 'Achievement Display', label: '孵化基地' },
+  {
+    key: '12',
+    title: '产业孵化大脑',
+    route: 'brain',
+    English: 'Achievement Display',
+    label: '产业孵化大脑'
+  },
+  { key: '13', title: '行研产研', route: 'thirteen', English: 'Research Development', label: '行研产研' }
 ]
 // 目录设置
 export const menuList3 = [

src/store/api/es.js

@@ -0,0 +1,70 @@
+import { defineStore } from 'pinia'
+import { AxiosWrapper } from '@/utils/axios-wrapper'
+const axios = new AxiosWrapper({ baseUrl: import.meta.env.VITE_APP_ES_API })
+export const EsStore = defineStore('es', () => {
+  const demand = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`/am/demand`, cond)
+    return res
+  }
+  const achievement = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`/am/achievement`, cond)
+    return res
+  }
+  const supply = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`/am/supply`, cond)
+    return res
+  }
+  const Scompany = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`/search/company`, cond)
+    return res
+  }
+  const Sproject = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`/search/project`, cond)
+    return res
+  }
+  const Sdemand = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`/search/demand`, cond)
+    return res
+  }
+  const Ssupply = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`/search/supply`, cond)
+    return res
+  }
+  const Sachievement = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`/search/achievement`, cond)
+    return res
+  }
+  return { supply, demand, achievement, Scompany, Sproject, Sdemand, Ssupply, Sachievement }
+})

src/store/api/util.js

@@ -10,5 +10,9 @@ export const UtilStore = defineStore('util', () => {
     const res = await axios.$post(`/util/toExport`, payload)
     return res
   }
-  return { toImport, toExport }
+  const toTotal = async (payload) => {
+    const res = await axios.$post(`/util/toTotal`, payload)
+    return res
+  }
+  return { toImport, toExport, toTotal }
 })

src/views/detail/industryDetail.vue

@@ -7,7 +7,7 @@
         </el-carousel-item>
       </el-carousel>
     </el-col>
-    <el-col :span="24" class="one">
+    <el-col :span="24" class="one" v-if="info.news && info.news.length > 0">
       <div class="title animate__animated animate__fadeInDown">
         <div class="title_1">新闻中心</div>
         <div class="title_2">News Center</div>
@@ -27,7 +27,7 @@
         </el-collapse>
       </div>
     </el-col>
-    <el-col :span="24" class="one">
+    <el-col :span="24" class="one" v-if="info.companyPerson && info.companyPerson.length > 0">
       <div class="title animate__animated animate__fadeInDown">
         <div class="title_1">企业成员</div>
         <div class="title_2">Enterprise Members</div>
@@ -63,38 +63,38 @@
     <el-col :span="24" class="one">
       <div class="one_3">
         <el-carousel height="900px">
-          <el-carousel-item>
+          <el-carousel-item v-if="info.brief">
             <div class="title animate__animated animate__fadeInDown">
               <div class="title_1">简介</div>
               <div class="title_2">Brief Introduction</div>
             </div>
-            <div class="thr w_1300" v-if="info.brief" v-html="info.brief"></div>
+            <div class="thr w_1300" v-html="info.brief"></div>
           </el-carousel-item>
-          <el-carousel-item>
+          <el-carousel-item v-if="info.process">
             <div class="title animate__animated animate__fadeInDown">
               <div class="title_1">发展进程</div>
               <div class="title_2">Development Process</div>
             </div>
-            <div class="thr w_1300" v-if="info.process" v-html="info.process"></div>
+            <div class="thr w_1300" v-html="info.process"></div>
           </el-carousel-item>
-          <el-carousel-item>
+          <el-carousel-item v-if="info.situation">
             <div class="title animate__animated animate__fadeInDown">
               <div class="title_1">合作情况</div>
               <div class="title_2">Cooperation Situation</div>
             </div>
-            <div class="thr w_1300" v-if="info.situation" v-html="info.situation"></div>
+            <div class="thr w_1300" v-html="info.situation"></div>
           </el-carousel-item>
-          <el-carousel-item>
+          <el-carousel-item v-if="info.activity">
             <div class="title animate__animated animate__fadeInDown">
               <div class="title_1">重大活动</div>
               <div class="title_2">Major Events</div>
             </div>
-            <div class="thr w_1300" v-if="info.activity" v-html="info.activity"></div>
+            <div class="thr w_1300" v-html="info.activity"></div>
           </el-carousel-item>
         </el-carousel>
       </div>
     </el-col>
-    <el-col :span="24" class="one">
+    <el-col :span="24" class="one" v-if="info.partner && info.partner.length > 0">
       <div class="title animate__animated animate__fadeInDown">
         <div class="title_1">合作伙伴</div>
         <div class="title_2">Cooperative Partner</div>

src/views/one/index.vue

@@ -14,6 +14,8 @@ import { DesignStore } from '@/store/api/platform/design'
 import { FriendStore } from '@/store/api/platform/friend'
 import { IncubatorStore } from '@/store/api/user/incubator'
 import { AchievementStore } from '@/store/api/platform/achievement'
+import { UtilStore } from '@/store/api/util'
+const utilStore = UtilStore()
 const newsStore = NewsStore()
 const designStore = DesignStore()
 const incubatorStore = IncubatorStore()
@@ -25,13 +27,8 @@ const carouselList = ref([])
 const friendList = ref([])
 const incubatorList = ref([])
 const achieveList = ref([])
-const recordList = ref([
-  { name: '企业', num: '1000+', unit: '家' },
-  { name: '供给', num: '1000+', unit: '个' },
-  { name: '需求', num: '1000+', unit: '个' },
-  { name: '项目', num: '1000+', unit: '个' },
-  { name: '成果', num: '1000+', unit: '个' }
-])
+const recordList = ref([])
+
 // 新闻
 const newsList = ref([])
 // 分类
@@ -59,6 +56,9 @@ const searchOther = async () => {
   // 成果列表
   res = await achievementStore.query({ skip: 0, limit: 16, status: '1', is_use: '0' })
   if (res.errcode == '0') achieveList.value = res.data
+  // 数据总数
+  res = await utilStore.toTotal()
+  if (res.errcode == '0') recordList.value = res.data
   // 基础设置
   res = await designStore.query({})
   if ($checkRes(res)) {

src/views/one/page.vue

@@ -60,6 +60,14 @@
       </div>
       <div class="two_2">
         <div class="two_title">数据分析</div>
+        <div class="two_content">
+          <div class="left">
+            <cecharts1></cecharts1>
+          </div>
+          <div class="right">
+            <cecharts2></cecharts2>
+          </div>
+        </div>
       </div>
     </div>
 
@@ -159,7 +167,9 @@ import right from '/images/top-right.png'
 import new_4 from '/images/new_4.png'
 import friend from '/images/friend.jpeg'
 import baseLogo from '/images/base.jpg'
-
+// 组件
+import cecharts1 from './parts/company/echarts1.vue'
+import cecharts2 from './parts/company/echarts2.vue'
 // 用户信息
 import { UserStore } from '@/store/user'
 const userStore = UserStore()
@@ -187,6 +197,7 @@ const newList = ref([
   { value: '1', label: '新闻通知' },
   { value: '2', label: '行业动态' }
 ])
+
 const toActive = async (item) => {
   active.value = item.value
   emits('toActive', item.value)
@@ -245,6 +256,10 @@ const handleMousOut = (index) => {
 const toSelect = (item) => {
   console.log(item)
 }
+// 点击echarts
+const dataChange = (item) => {
+  console.log(item)
+}
 </script>
 <style scoped lang="scss">
 .page {
@@ -404,6 +419,16 @@ const toSelect = (item) => {
         font-size: 30px;
         color: #323232;
       }
+      .two_content {
+        display: flex;
+        justify-content: space-between;
+        .left {
+          width: 50%;
+        }
+        .right {
+          width: 50%;
+        }
+      }
     }
   }
   .thr {

src/views/one/parts/company/echarts1.vue

@@ -0,0 +1,91 @@
+<template>
+  <div ref="echarts1" class="echarts1"></div>
+</template>
+<style scoped lang="scss">
+.echarts1 {
+  height: 300px;
+  width: 100%;
+}
+</style>
+<script setup>
+import * as echarts from 'echarts'
+const echarts1 = ref()
+onMounted(() => {
+  echarts1View()
+})
+function echarts1View() {
+  const myChart1 = echarts.init(echarts1.value)
+  const option1 = {
+    tooltip: {
+      trigger: 'item',
+      formatter: '{b} : {c} ({d}%)'
+    },
+    legend: {
+      right: 0,
+      top: 20,
+      height: 260,
+      itemWidth: 10,
+      itemHeight: 10,
+      itemGap: 10,
+      textStyle: {
+        fontSize: 18
+      },
+      orient: 'vertical',
+      data: ['制造业', '服务业', '农业', '金融行业', '电子商务行业']
+    },
+    calculable: true,
+    series: [
+      {
+        name: ' ',
+        color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
+        type: 'pie',
+        radius: [30, 70],
+        center: ['35%', '50%'],
+        roseType: 'radius',
+        label: {
+          normal: {
+            show: true
+          },
+          emphasis: {
+            show: true
+          }
+        },
+        lableLine: {
+          normal: {
+            show: true
+          },
+          emphasis: {
+            show: true
+          }
+        },
+        data: [
+          {
+            value: 10,
+            name: '制造业'
+          },
+          {
+            value: 5,
+            name: '服务业'
+          },
+          {
+            value: 15,
+            name: '农业'
+          },
+          {
+            value: 25,
+            name: '金融行业'
+          },
+          {
+            value: 20,
+            name: '电子商务行业'
+          }
+        ]
+      }
+    ]
+  }
+  myChart1.setOption(option1)
+  window.addEventListener('resize', function () {
+    myChart1.resize()
+  })
+}
+</script>

src/views/one/parts/company/echarts2.vue

@@ -0,0 +1,91 @@
+<template>
+  <div ref="echarts2" class="echarts2"></div>
+</template>
+<style scoped lang="scss">
+.echarts2 {
+  height: 300px;
+  width: 100%;
+}
+</style>
+<script setup>
+import * as echarts from 'echarts'
+const echarts2 = ref()
+onMounted(() => {
+  echarts2View()
+})
+function echarts2View() {
+  const myChart2 = echarts.init(echarts2.value)
+  const option2 = {
+    tooltip: {
+      trigger: 'item',
+      formatter: '{b} : {c} ({d}%)'
+    },
+    legend: {
+      right: 0,
+      top: 20,
+      height: 260,
+      itemWidth: 10,
+      itemHeight: 10,
+      itemGap: 10,
+      textStyle: {
+        fontSize: 18
+      },
+      orient: 'vertical',
+      data: ['制造业', '服务业', '农业', '金融行业', '电子商务行业']
+    },
+    calculable: true,
+    series: [
+      {
+        name: ' ',
+        color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
+        type: 'pie',
+        radius: [30, 70],
+        center: ['35%', '50%'],
+        roseType: 'radius',
+        label: {
+          normal: {
+            show: true
+          },
+          emphasis: {
+            show: true
+          }
+        },
+        lableLine: {
+          normal: {
+            show: true
+          },
+          emphasis: {
+            show: true
+          }
+        },
+        data: [
+          {
+            value: 10,
+            name: '制造业'
+          },
+          {
+            value: 5,
+            name: '服务业'
+          },
+          {
+            value: 15,
+            name: '农业'
+          },
+          {
+            value: 25,
+            name: '金融行业'
+          },
+          {
+            value: 20,
+            name: '电子商务行业'
+          }
+        ]
+      }
+    ]
+  }
+  myChart2.setOption(option2)
+  window.addEventListener('resize', function () {
+    myChart2.resize()
+  })
+}
+</script>

src/views/search/index.vue

@@ -96,7 +96,7 @@ const remoteMethod = (query) => {
     searchLoading.value = true
     setTimeout(async () => {
       searchLoading.value = false
-      const info = { is_use: '0', status: '1', title: query }
+      const info = { is_use: '0', title: query }
       const res = await store.query(info)
       if (res.errcode == '0') tagsList.value = res.data
     }, 200)

src/views/search/parts/achievement.vue

@@ -194,11 +194,11 @@ import thr from '/images/achievement/bg-cgyx-list-icon3.png'
 
 const $checkRes = inject('$checkRes')
 // 接口
-import { AchievementStore } from '@/store/api/platform/achievement'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { RegionStore } from '@/store/api/system/region'
 import { SectorStore } from '@/store/api/platform/sector'
-const store = AchievementStore()
+import { EsStore } from '@/store/api/es'
+const esStore = EsStore()
 const dictDataStore = DictDataStore()
 const regionStore = RegionStore()
 const sectorStore = SectorStore()
@@ -245,8 +245,8 @@ const search = async (query = { skip, limit }) => {
   skip = query.skip
   limit = query.limit
   const info = { skip: query.skip, limit: query.limit, status: '1', is_use: '0', ...searchForm.value }
-  if (searchValue.value) info.tags = searchValue.value
-  const res = await store.query(info)
+  if (searchValue.value) info.keyword = searchValue.value
+  const res = await esStore.Sachievement(info)
   if (res.errcode == '0') {
     list.value = res.data
     total.value = res.total

src/views/search/parts/company.vue

@@ -112,11 +112,11 @@ import companyLogo from '/images/companyLogo.jpg'
 const $checkRes = inject('$checkRes')
 import { get } from 'lodash-es'
 // 接口
-import { CompanyStore } from '@/store/api/user/company'
 import { RegionStore } from '@/store/api/system/region'
 import { SectorStore } from '@/store/api/platform/sector'
 import { DictDataStore } from '@/store/api/system/dictData'
-const store = CompanyStore()
+import { EsStore } from '@/store/api/es'
+const esStore = EsStore()
 const regionStore = RegionStore()
 const sectorStore = SectorStore()
 const dictDataStore = DictDataStore()
@@ -182,8 +182,8 @@ const search = async (query = { skip, limit }) => {
   skip = query.skip
   limit = query.limit
   const info = { skip: query.skip, limit: query.limit, status: '1', ...searchForm.value }
-  if (searchValue.value) info.tags = searchValue.value
-  const res = await store.query(info)
+  if (searchValue.value) info.keyword = searchValue.value
+  const res = await esStore.Scompany(info)
   if (res.errcode == '0') {
     list.value = res.data
     total.value = res.total

src/views/search/parts/demand.vue

@@ -41,11 +41,11 @@
 
 <script setup>
 // 接口
-import { DemandStore } from '@/store/api/platform/demand'
 import { RegionStore } from '@/store/api/system/region'
 import { SectorStore } from '@/store/api/platform/sector'
 import { DictDataStore } from '@/store/api/system/dictData'
-const store = DemandStore()
+import { EsStore } from '@/store/api/es'
+const esStore = EsStore()
 const regionStore = RegionStore()
 const sectorStore = SectorStore()
 const dictDataStore = DictDataStore()
@@ -108,8 +108,8 @@ const search = async (query = { skip, limit }) => {
   skip = query.skip
   limit = query.limit
   const info = { skip: query.skip, limit: query.limit, is_use: '0', status: '1', ...searchForm.value }
-  if (searchValue.value) info.tags = searchValue.value
-  const res = await store.list(info)
+  if (searchValue.value) info.keyword = searchValue.value
+  const res = await esStore.Sdemand(info)
   if (res.errcode == '0') {
     list.value = res.data
     total.value = res.total

src/views/search/parts/project.vue

@@ -95,11 +95,11 @@
 <script setup>
 const $checkRes = inject('$checkRes')
 // 接口
-import { ProjectStore } from '@/store/api/platform/project'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { RegionStore } from '@/store/api/system/region'
 import { SectorStore } from '@/store/api/platform/sector'
-const store = ProjectStore()
+import { EsStore } from '@/store/api/es'
+const esStore = EsStore()
 const dictDataStore = DictDataStore()
 const regionStore = RegionStore()
 const sectorStore = SectorStore()
@@ -161,8 +161,8 @@ const search = async (query = { skip, limit }) => {
   skip = query.skip
   limit = query.limit
   const info = { skip: query.skip, limit: query.limit, status: '1', is_use: '0', ...searchForm.value }
-  if (searchValue.value) info.tags = searchValue.value
-  const res = await store.query(info)
+  if (searchValue.value) info.keyword = searchValue.value
+  const res = await esStore.Sproject(info)
   if (res.errcode == '0') {
     list.value = res.data
     total.value = res.total

src/views/search/parts/supply.vue

@@ -37,11 +37,11 @@
 
 <script setup>
 // 接口
-import { SupplyStore } from '@/store/api/platform/supply'
 import { RegionStore } from '@/store/api/system/region'
 import { SectorStore } from '@/store/api/platform/sector'
 import { DictDataStore } from '@/store/api/system/dictData'
-const store = SupplyStore()
+import { EsStore } from '@/store/api/es'
+const esStore = EsStore()
 const regionStore = RegionStore()
 const sectorStore = SectorStore()
 const dictDataStore = DictDataStore()
@@ -104,8 +104,8 @@ const search = async (query = { skip, limit }) => {
   skip = query.skip
   limit = query.limit
   const info = { skip: query.skip, limit: query.limit, is_use: '0', status: '1', ...searchForm.value }
-  if (searchValue.value) info.tags = searchValue.value
-  const res = await store.list(info)
+  if (searchValue.value) info.keyword = searchValue.value
+  const res = await esStore.Ssupply(info)
   if (res.errcode == '0') {
     list.value = res.data
     total.value = res.total

src/views/twelve/index.vue

@@ -1,6 +1,9 @@
 <template>
-  <custom-layout class="main" v-loading="loading">
-    <div class="w_1700 one">
+  <custom-layout class="main">
+    <div class="loading" v-if="loading">
+      <el-image class="image" :src="load" fit="fill" />
+    </div>
+    <div class="w_1700 one" v-else>
       <div class="left">
         <div class="titleOne">
           <el-image class="image" :src="left" fit="fill" />
@@ -26,7 +29,8 @@
               <span class="textOne">{{ item.source || '暂无来源' }}</span>
             </div>
             <div class="button">
-              <div @click="toView(item, '0')" class="detail">查看详情</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">
@@ -42,7 +46,7 @@
         <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>
@@ -61,7 +65,8 @@
               <span class="textOne">{{ item.money || '面议' }}</span>
             </div>
             <div class="button">
-              <div @click="toView(item, '1')" class="detail">查看详情</div>
+              <div @click="toView(item, '1')" class="detail1">查看详情</div>
+              <div @click="toMate(item, '1')" class="detail2">匹配</div>
             </div>
           </div>
           <el-col :span="24" class="page">
@@ -70,45 +75,127 @@
         </div>
       </div>
       <div class="center"></div>
-      <div class="right">
-        <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 class="right" v-if="oneTotal > 0 || twoTotal > 0">
+        <div class="rightOne" v-if="oneTotal > 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 oneList" :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.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 class="button">
+                <div @click="toView(item, '2')" class="detail1">查看详情</div>
+              </div>
+            </div>
+          </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">
-          <div class="list" v-for="(item, index) in list" :key="index">
-            <div class="list_1">
-              <el-rate size="large" v-model="item.rate" disabled show-score text-color="#ff9900" :score-template="item.score" />
+        <div class="rightOne" v-if="twoTotal > 0 && dataType == '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 twoList" :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="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>
             </div>
-            <div class="list_2">
-              <div class="tabulation" v-for="(tags, indexs) in item.list" :key="indexs">
-                <div class="title">
-                  {{ tags.name || '暂无供给名称' }}
-                </div>
-                <div class="other_1" v-if="user && user.id">
-                  <span>需求企业：</span>
-                  <span class="textOne">{{ tags.company || '暂无需求企业' }}</span>
-                </div>
-                <div class="other_1" v-if="user && user.id">
-                  <span>技术领域：</span>
-                  <span class="textOne">{{ tags.field || '暂无技术领域' }}</span>
-                </div>
-                <div class="other_1" v-if="user && user.id">
-                  <span>所在地：</span>
-                  <span class="textOne">{{ getArea(tags.area) || '暂无所在地' }}</span>
-                </div>
-                <div class="other_1" v-if="user && user.id">
-                  <span>投入预算：</span>
-                  <span class="textOne">{{ tags.money || '面议' }}</span>
-                </div>
-                <div class="button">
-                  <div @click="toView(tags, '1')" class="detail">查看详情</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>
+        <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 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="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, '0')" class="detail1">查看详情</div>
               </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>
+      </div>
+      <div class="right" v-else>
+        <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 description="暂无数据" />
       </div>
     </div>
   </custom-layout>
@@ -118,11 +205,14 @@
 // 图片引入
 import left from '/images/top-left.png'
 import right from '/images/top-right.png'
+import load from '/images/load.gif'
 // 接口
 import { DemandStore } from '@/store/api/platform/demand'
 import { SupplyStore } from '@/store/api/platform/supply'
+import { EsStore } from '@/store/api/es'
 const demandStore = DemandStore()
 const supplyStore = SupplyStore()
+const esStore = EsStore()
 // 用户信息
 import { UserStore } from '@/store/user'
 const userStore = UserStore()
@@ -130,32 +220,41 @@ const user = computed(() => userStore.user)
 // 列表
 const supplyList = ref([])
 let supplyskip = 0
-let supplylimit = inject('limit')
+let supplylimit = 6
 const supplytotal = ref(0)
 
 const demandList = ref([])
 let demandskip = 0
-let demandlimit = inject('limit')
+let demandlimit = 6
 const demandtotal = ref(0)
 // 加载中
-const loading = ref(false)
+const loading = ref(true)
 // 路由
 const router = useRouter()
-// 推荐结果
-const list = ref([
-  { rate: 5, score: '五星推荐数量:5个', list: [{ name: '供给名称' }] },
-  { rate: 4, score: '四星推荐数量:5个', list: [{ name: '供给名称' }] }
-  // { rate: 3, score: '三星推荐数量:5个', list: [{ name: '供给名称' }] },
-  // { rate: 2, score: '二星推荐数量:5个', list: [{ name: '供给名称' }] },
-  // { rate: 1, score: '一星推荐数量:5个', list: [{ name: '供给名称' }] }
-])
+// 推荐的成果
+const oneList = ref([])
+// 推荐的需求或供给
+const twoList = ref([])
+// 类型
+const dataType = ref('0')
+const keyword = ref('')
+
+let oneskip = 0
+let onelimit = 6
+const oneTotal = ref(0)
+
+let twoskip = 0
+let twolimit = 6
+const twoTotal = ref(0)
 // 请求
 onMounted(async () => {
-  loading.value = true
-  await searchOther()
-  await searchsupply({ supplyskip, supplylimit })
-  await searchdemand({ demandskip, demandlimit })
-  loading.value = false
+  setTimeout(async () => {
+    loading.value = true
+    await searchOther()
+    await searchsupply({ supplyskip, supplylimit })
+    await searchdemand({ demandskip, demandlimit })
+    loading.value = false
+  }, 5000)
 })
 const searchOther = async () => {}
 // 供给信息
@@ -168,6 +267,7 @@ const searchsupply = async (query = { supplyskip, supplylimit }) => {
     supplyList.value = res.data
     supplytotal.value = res.total
   }
+  if (res.total > 0) await toMate(res.data[0], '0')
 }
 // 需求信息
 const searchdemand = async (query = { demandskip, demandlimit }) => {
@@ -189,9 +289,35 @@ const getArea = (data) => {
 const toView = (item, type) => {
   if (user.value.id) {
     if (type == '0') router.push({ path: '/supply/detail', query: { id: item.id || item._id } })
-    else router.push({ path: '/demand/detail', query: { id: item.id || item._id } })
+    else if (type == '1') router.push({ path: '/demand/detail', query: { id: item.id || item._id } })
+    else router.push({ path: '/achievement/detail', query: { id: item.id || item._id } })
   } else ElMessage({ message: '未登录！', type: 'error' })
 }
+const toMate = async (item, type) => {
+  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 (res.errcode == '0') {
+    twoList.value = res.data
+    twoTotal.value = res.total
+  }
+  loading.value = false
+}
 const currentPageone = ref(1)
 const currentPagetwo = ref(1)
 // 分页
@@ -212,9 +338,61 @@ 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 }
+  let res
+  if (dataType.value == '0') res = await esStore.demand(info)
+  else res = await esStore.supply(info)
+  if (res.errcode == '0') {
+    twoList.value = res.data
+    twoTotal.value = res.total
+  }
+}
 </script>
 <style scoped lang="scss">
 .main {
+  .loading {
+    width: 100%;
+    height: 70vh;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: #03a9f4;
+  }
   .one {
     display: flex;
     .left {
@@ -278,13 +456,13 @@ const sizeChangetwo = (limits) => {
             }
           }
           .button {
+            display: flex;
             margin: 30px 0 0 0;
-            .detail {
+            .detail1 {
               font-size: 16px;
               display: block;
               margin: 0 auto;
               width: 90px;
-              height: 28px;
               text-align: center;
               line-height: 28px;
               border-radius: 28px;
@@ -292,11 +470,23 @@ const sizeChangetwo = (limits) => {
               border: 1px solid #2281ee;
               cursor: default;
             }
-          }
-        }
-        .list:hover {
-          .button {
-            .detail {
+            .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;
             }
@@ -331,92 +521,78 @@ const sizeChangetwo = (limits) => {
         }
       }
       .rightOne {
-        .list {
-          .list_1 {
-            text-align: right;
-          }
-          .list_2 {
-            display: flex;
-            justify-content: space-between;
-            flex-wrap: wrap;
-            margin: 10px 0;
-            background-color: $global-color-fff;
-            .tabulation {
-              padding-bottom: 20px;
-              margin: 0 0 20px 0;
-              width: 270px;
-              font-size: 12px;
+        .rightContent {
+          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: 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;
+              padding: 0 10px;
+            }
+            .other_1 {
+              margin-bottom: 10px;
+              padding: 0 20px;
+              display: flex;
+              align-items: center;
               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;
-                }
+              font-size: 16px;
+              span:first-child {
+                max-width: 80px;
               }
-              .button {
-                margin: 30px 0 0 0;
-                .detail {
-                  font-size: 16px;
-                  display: block;
-                  margin: 0 auto;
-                  width: 90px;
-                  height: 28px;
-                  text-align: center;
-                  line-height: 28px;
-                  border-radius: 28px;
-                  color: #2281ee;
-                  border: 1px solid #2281ee;
-                  cursor: default;
-                }
+              span:last-child {
+                max-width: 148px;
               }
             }
-            .tabulation:hover {
-              .button {
-                .detail {
-                  color: #fff;
-                  background-color: #2281ee;
-                }
+            .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;
+              }
+              .detail1:hover {
+                color: #fff;
+                background-color: #2281ee;
               }
             }
           }
         }
-        :deep(.el-icon) {
-          svg {
-            height: 3em !important;
-            width: 3em !important;
-          }
-        }
-        :deep(.el-rate__icon) {
-          margin: 0 15px !important;
-        }
-        :deep(.el-rate__text) {
-          margin: 0 0 0 25px !important;
-          font-size: 20px !important;
+
+        .page {
+          display: flex;
+          justify-content: center;
+          margin: 20px 0;
         }
       }
     }

vite.config.js

@@ -40,6 +40,13 @@ export default defineConfig(({ mode }) => {
           target: 'http://127.0.0.1:19700', // https://broadcast.waityou24.cn
           changeOrigin: true
         },
+        /**
+         * env.VITE_APP_ES_API: /cxyy/es
+         */
+        [env.VITE_APP_ES_API]: {
+          changeOrigin: true,
+          target: 'http://192.168.1.197:9701'
+        },
         /**
          * env.VITE_APP_BASE_API: /dev-api
          */