修改

src/components/custom/custom-layout copy.vue

@@ -0,0 +1,537 @@
+<template>
+  <div id="c-layout">
+    <div class="header">
+      <div class="header_1 w_1700">
+        <div class="left">
+          <el-image class="image" :src="logo" fit="fill" />
+        </div>
+        <div class="right">
+          <div class="right_1" v-if="user && user.id">
+            <el-dropdown>
+              <span class="el-dropdown-link">
+                {{ user.nick_name || '暂无昵称' }}
+                <el-icon class="el-icon--right">
+                  <arrow-down />
+                </el-icon>
+              </span>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item @click="toCenter"> 个人中心 </el-dropdown-item>
+                  <el-dropdown-item @click="toOut"> 退出登录 </el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
+          </div>
+          <div class="right_1" v-else>
+            <span @click="toLogin('1')">登录</span>
+            <span>|</span>
+            <span @click="toLogin('0')">注册</span>
+          </div>
+          <div class="right_2" @click="toChat" v-if="user">
+            <el-badge :value="notReadNum">
+              <el-icon><Bell /></el-icon>
+            </el-badge>
+            <span>消息</span>
+          </div>
+        </div>
+      </div>
+      <div class="header_3">
+        <el-col :span="24" class="list" :class="[hasbrain == true ? 'listTrue' : '']">
+          <div class="text" v-for="(item, index) in data" @click="selectMenu(item.route)" :class="[item.hover == '1' ? 'menuTrue' : '']" :key="index" @mouseover="handleMouseOver(index)" @mouseout="handleMousOut(index)">
+            <div class="title">{{ item.title }}</div>
+            <div class="link"></div>
+          </div>
+        </el-col>
+        <el-col :span="24" class="info" :class="[hasbrain == true || isIncubator == true ? 'infoTrue' : '']">
+          <div class="info_1" v-if="info.key == '3'">
+            <div v-for="(tag, indexs) in info.children" :key="indexs" class="children" @click="selectMenu(tag.route)">
+              <span class="title"> {{ tag.title }}</span>
+            </div>
+          </div>
+        </el-col>
+      </div>
+    </div>
+    <div class="main">
+      <slot></slot>
+    </div>
+    <div class="footer" v-if="is_foot">
+      <div class="w_1700">
+        <div class="foot_1">
+          <div class="foot_left">
+            <el-image class="image" v-if="footInfos && footInfos.Logo && footInfos.Logo.length > 0" :src="getUrl(footInfos.Logo)" fit="fill" />
+            <el-image class="image" v-else :src="footInfo.Logo" fit="fill" />
+            <div class="foot_content">
+              <div class="content_left">
+                <el-image class="image" v-if="footInfos && footInfos.Code && footInfos.Code.length > 0" :src="getUrl(footInfos.Code)" fit="fill" />
+                <el-image class="image" v-else :src="footInfo.Code" fit="fill" />
+              </div>
+              <div class="content_right">
+                <div class="title">电话：{{ footInfos.Phone || footInfo.Phone }}</div>
+                <div class="title">邮箱：{{ footInfos.Email || footInfo.Email }}</div>
+                <div class="title">地址：{{ footInfos.Address || footInfo.Address }}</div>
+              </div>
+            </div>
+          </div>
+          <div class="foot_right">
+            <div class="right_1">友情连接:</div>
+            <div class="right_2">
+              <div class="list" v-for="(item, index) in typeList" :key="index">
+                <div class="list_1" v-if="item.list && item.list.length > 0">
+                  <div class="title">{{ item.title }}</div>
+                </div>
+                <div class="list_2">
+                  <div v-for="(tag, indexx) in item.list" :key="indexx" @click="toLink(tag)">{{ tag.name }}</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="foot_2">
+          {{ footInfo.Copyright }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+// 图片引入
+import logo from '/images/logohome-bg.png'
+
+import { initClient } from '../../utils/stomp'
+import { ArrowDown } from '@element-plus/icons-vue'
+import { cloneDeep, get } from 'lodash-es'
+import { footInfo, menuList } from '@/layout/site'
+// 接口
+import { DesignStore } from '@/store/api/platform/design'
+import { MessageStore } from '@/store/api/system/message'
+const designStore = DesignStore()
+const messageStore = MessageStore()
+import { UserStore } from '@/store/user'
+const userStore = UserStore()
+const user = computed(() => userStore.user)
+
+const router = useRouter()
+const route = useRoute()
+const $checkRes = inject('$checkRes')
+const props = defineProps({
+  is_foot: { type: Boolean, default: () => true },
+  is_carousel: { type: Boolean, default: () => false },
+  carouselList: { type: Array, default: () => [] }
+})
+const configInfo = ref({})
+const footInfos = ref({})
+const data = ref([])
+const info = ref({})
+const isIncubator = ref(false)
+const hasbrain = ref(false)
+const notReadNum = ref(0)
+const mqClient = ref()
+// 分类
+const typeList = ref([
+  { title: '热门高校', list: [] },
+  { title: '政府部门', list: [] },
+  { title: '科研机构', list: [] }
+])
+// 请求
+onMounted(async () => {
+  search()
+  searchMessage()
+})
+
+const toSubscribe = () => {
+  const userid = get(user, 'value.id')
+  const subscribes = { [`/exchange/userEx/${userid}`]: dealMsg }
+  mqClient.value = initClient(subscribes)
+}
+const dealMsg = () => {
+  searchMessage()
+}
+
+const searchMessage = async () => {
+  // 没有用户id就不查了
+  if (!get(user, 'value.id')) return
+  // 只要1个数据,主要是要总数
+  const res = await messageStore.checkNotRead()
+  if ($checkRes(res)) {
+    const nrn = get(res, 'data', 0)
+    notReadNum.value = nrn
+  }
+  toSubscribe()
+}
+
+const search = async () => {
+  for (const val of menuList) {
+    if (route.name === val.route) val.hover = true
+    else val.hover = false
+  }
+  let menus = cloneDeep(menuList)
+  // 判断, 如果没有孵化基地角色, 则不显示孵化基地菜单
+  if (user.value) {
+    const hasIncubator = get(user.value, 'role', []).find((f) => f === 'Incubator')
+    if (hasIncubator) isIncubator.value = true
+  }
+  if (!isIncubator.value) menus = menus.filter((f) => f.key !== '11')
+
+  // 特定用户查看产业大脑
+  if (user.value && user.value.id == 17) hasbrain.value = true
+  else hasbrain.value = false
+  if (!hasbrain.value) menus = menus.filter((f) => f.key !== '12')
+
+  data.value = menus
+
+  // 基础设置
+  const result = await designStore.query({})
+  if ($checkRes(result)) {
+    configInfo.value = result.data[0] || {}
+    footInfo.value = result.data[0].footInfo || {}
+    const friendship = result.data[0].friendship || []
+    for (const val of friendship) {
+      for (const tag of typeList.value) {
+        if (val.type == tag.title) {
+          tag.list.push(val)
+        }
+      }
+    }
+  }
+}
+const handleMouseOver = (index) => {
+  data.value[index].hover = true
+  info.value = data.value[index]
+}
+const handleMousOut = (index) => {
+  data.value[index].hover = false
+  const arr = data.value.every((i) => i.hover === false)
+  if (arr) {
+    for (const val of data.value) {
+      if (route.name === val.route) val.hover = true
+      else val.hover = false
+    }
+  }
+}
+const toLink = (item) => {
+  window.open(item.href, '_blank') // 在新标签页中打开URL
+}
+// 登录|注册
+const toLogin = (status) => {
+  router.push({ path: '/login', query: { status } })
+}
+const selectMenu = (item, query) => {
+  if (item) {
+    for (const val of data.value) {
+      if (route.name === val.route) val.hover = true
+      else val.hover = false
+    }
+    if (item == 'two' || item == 'twelve') {
+      if (user.value.id) {
+        router.push({ path: `/${item}`, query })
+      } else ElMessage({ message: '未登录！', type: 'error' })
+    } else if (item == 'brain') window.open(`/brain`)
+    else router.push({ path: `/${item}`, query })
+  }
+}
+// // 关于我们
+// const toHelp = () => {
+//   router.push({ path: `/help` })
+// }
+// 个人中心
+const toCenter = () => {
+  const role = user.value.role.find((i) => i === 'Admin')
+  if (role) window.open(`/cxyyAdmin`)
+  else router.push({ path: `/center/basic` })
+}
+// 消息
+const toChat = () => {
+  const role = user.value.role.find((i) => i === 'Admin')
+  if (role) window.open(`/cxyyAdmin/message/index`)
+  else {
+    if (user.value && user.value.id) {
+      router.push({ path: `/center/notice` })
+    } else {
+      router.push({ path: '/login', query: { status: '1' } })
+    }
+  }
+}
+const getUrl = (item) => {
+  if (item && item.length > 0) return `${import.meta.env.VITE_APP_HOST}${item[0].uri}`
+}
+// 退出登录
+const toOut = () => {
+  userStore.logOut()
+  router.push({ path: '/login', query: { status: '1' } })
+}
+</script>
+
+<style lang="scss" scoped>
+#c-layout {
+  .header {
+    position: relative;
+    background: $global-color-fff;
+    .header_1 {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 10px 0;
+      .right {
+        display: flex;
+        font-size: $global-font-size-18;
+        cursor: pointer; /* 改变鼠标样式为手形 */
+        .right_1 {
+          display: flex;
+          align-items: center;
+          color: $global-color-107;
+          margin: 0 10px 0 0;
+          span {
+            margin: 0 5px;
+          }
+          .el-dropdown-link {
+            font-size: $global-font-size-18;
+            cursor: pointer;
+            color: #409eff;
+            display: flex;
+            align-items: center;
+          }
+        }
+        .right_2 {
+          display: flex;
+          align-items: center;
+          margin: 0 5px;
+          span {
+            margin: 0 0 0 5px;
+          }
+        }
+      }
+    }
+    .header_3 {
+      height: 74px;
+      background: linear-gradient(to bottom, #009fff, #0077ff);
+
+      .list {
+        height: 100%;
+        max-width: 1700px;
+        margin: 0 auto;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: $global-font-size-26;
+        color: #ffffff;
+        .text {
+          width: 10%;
+          display: flex;
+          justify-content: center;
+          cursor: default;
+        }
+        .line {
+          margin: 0 0 0 24px;
+          width: 1px;
+          height: 21px;
+          background: linear-gradient(180deg, rgba(255, 255, 255, 1) 0%, #1c66e7 50%, rgba(255, 255, 255, 1) 100%);
+        }
+      }
+      .info {
+        display: none;
+        .info_1 {
+          z-index: 100;
+          position: absolute;
+          left: 448px;
+          top: 147px;
+          cursor: default;
+          width: 170px;
+          background: #0077ff;
+
+          .children {
+            padding: 10px;
+            text-align: center;
+            .title {
+              font-size: $global-font-size-22;
+              color: #ffffff;
+            }
+            .title:hover {
+              font-weight: bold;
+            }
+          }
+          .children:hover {
+            background: #0165e7;
+          }
+        }
+      }
+      .infoTrue {
+        .info_1 {
+          left: 407px !important;
+        }
+      }
+      .listTrue {
+        font-size: $global-font-size-25 !important;
+      }
+      .menuTrue {
+        position: relative;
+        flex-direction: column;
+        align-items: center;
+        font-weight: bold;
+        .link {
+          position: absolute;
+          top: 40px;
+          width: 60px;
+          height: 5px;
+          background: #ffffff;
+          border-radius: 5px;
+        }
+      }
+    }
+  }
+  .header:hover {
+    .header_3 {
+      .info {
+        display: block !important;
+      }
+    }
+  }
+  .main {
+    min-height: 50vh;
+  }
+  .footer {
+    font-family: PingFangSC-Regular;
+    padding: 25px 0;
+    background: linear-gradient(to bottom, #009fff, #0077ff);
+    box-shadow: 0 6px 10px 0 rgba(0, 0, 0, 0.2);
+    color: $global-color-fff;
+    font-size: $global-font-size-18;
+    .foot_1 {
+      display: flex;
+      .foot_left {
+        width: 50%;
+        .foot_content {
+          margin: 40px 0 10px 0;
+          display: flex;
+          align-items: center;
+          .content_right {
+            margin: 0 0 0 30px;
+            .title {
+              cursor: default;
+              margin: 8px 0 0 0;
+            }
+            .title:first-child {
+              margin: 0;
+            }
+          }
+        }
+      }
+      .foot_right {
+        width: 50%;
+        .right_1 {
+          font-size: $global-font-size-21;
+          margin: 0 0 40px 0;
+        }
+        .right_2 {
+          display: flex;
+          justify-content: space-between;
+          .list_1 {
+            .title {
+              font-size: $global-font-size-21;
+              background: #fff;
+              width: 113px;
+              height: 33px;
+              line-height: 33px;
+              border-radius: 16px;
+              margin: 0 0 10px 0;
+              color: #0078ff;
+              text-align: center;
+              font-family: PingFangSC-Semibold;
+            }
+          }
+          .list_2 {
+            font-size: $global-font-size-18;
+            margin: 15px 0 0 15px;
+            cursor: default;
+          }
+        }
+      }
+    }
+    .foot_2 {
+      text-align: center;
+      padding: 10px 0 0 0;
+    }
+
+    .foot {
+      margin: 0 20px;
+      .foot_2 {
+        color: $global-color-fff;
+        font-size: $global-font-size-16;
+        .footer_left {
+          padding: 10px 0;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          // border-bottom: 1px solid rgba(229, 241, 255, 0.7);
+          .left {
+            .image {
+              width: 334px;
+              height: auto;
+              margin: 0 0 10px 0;
+            }
+            .title {
+              margin: 5px 0 0 0;
+            }
+          }
+          .center {
+            color: $global-color-fff;
+            font-size: $global-font-size-16;
+            display: flex;
+            margin: 10px 0;
+            padding: 0 0 10px 0;
+
+            span {
+              width: 80px;
+            }
+            .list {
+              width: 250px;
+              text-align: center;
+              .list_1 {
+                margin: 0 0 10px 0;
+              }
+              .list_2 {
+                display: flex;
+                flex-wrap: wrap;
+                justify-content: center;
+                cursor: default;
+                div {
+                  margin: 0 5px 5px 0;
+                  cursor: default;
+                }
+              }
+            }
+          }
+          .right {
+            text-align: center;
+            .image {
+              width: 120px;
+              height: 120px;
+            }
+            .title {
+              margin: 5px 0 0 0;
+              cursor: default;
+            }
+          }
+        }
+        .footer_right {
+          text-align: center;
+          padding: 10px 0 0 0;
+          border-top: 1px solid rgba(229, 241, 255, 0.7);
+        }
+      }
+    }
+  }
+}
+@media screen and (max-width: 1280px) {
+  #c-layout {
+    min-width: 1920px;
+    margin: 0 auto;
+  }
+}
+@media screen and (min-width: 1921px) {
+  #c-layout {
+    max-width: 1920px;
+    margin: 0 auto;
+  }
+}
+</style>

src/components/custom/custom-layout.vue

@@ -35,20 +35,23 @@
           </div>
         </div>
       </div>
-      <div class="header_3">
-        <el-col :span="24" class="list" :class="[hasbrain == true ? 'listTrue' : '']">
-          <div class="text" v-for="(item, index) in data" @click="selectMenu(item.route)" :class="[item.hover == '1' ? 'menuTrue' : '']" :key="index" @mouseover="handleMouseOver(index)" @mouseout="handleMousOut(index)">
-            <div class="title">{{ item.title }}</div>
-            <div class="link"></div>
-          </div>
-        </el-col>
-        <el-col :span="24" class="info" :class="[hasbrain == true || isIncubator == true ? 'infoTrue' : '']">
-          <div class="info_1" v-if="info.key == '3'">
-            <div v-for="(tag, indexs) in info.children" :key="indexs" class="children" @click="selectMenu(tag.route)">
-              <span class="title"> {{ tag.title }}</span>
+      <div class="header_3" v-if="is_menu">
+        <!-- 导航 -->
+        <nav class="nav_bg1" :class="{ nav_bg2: y }">
+          <div class="list" v-for="(item, index) in data" :key="index" @click="selectMenu(item.route)" @mouseover="handleMouseOver(index)" @mouseout="handleMousOut(index)">
+            <div class="nav_title" :class="[item.hover == true ? 'activeLink' : '']">
+              {{ item.title }}
+            </div>
+            <div :class="[item.hover == true ? 'link1' : 'link2']"></div>
+            <div class="info" v-if="info.key == '3' && item.key == '3'">
+              <div class="info_1">
+                <div v-for="(tag, indexs) in info.children" :key="indexs" class="children" @click="selectMenu(tag.route)">
+                  <span class="info_title"> {{ tag.title }}</span>
+                </div>
+              </div>
             </div>
           </div>
-        </el-col>
+        </nav>
       </div>
     </div>
     <div class="main">
@@ -115,6 +118,7 @@ const router = useRouter()
 const route = useRoute()
 const $checkRes = inject('$checkRes')
 const props = defineProps({
+  is_menu: { type: Boolean, default: () => true },
   is_foot: { type: Boolean, default: () => true },
   is_carousel: { type: Boolean, default: () => false },
   carouselList: { type: Array, default: () => [] }
@@ -127,6 +131,9 @@ const isIncubator = ref(false)
 const hasbrain = ref(false)
 const notReadNum = ref(0)
 const mqClient = ref()
+
+// 获取滚动条y轴坐标
+const { y } = useWindowScroll({ behavior: 'smooth' })
 // 分类
 const typeList = ref([
   { title: '热门高校', list: [] },
@@ -195,20 +202,6 @@ const search = async () => {
     }
   }
 }
-const handleMouseOver = (index) => {
-  data.value[index].hover = true
-  info.value = data.value[index]
-}
-const handleMousOut = (index) => {
-  data.value[index].hover = false
-  const arr = data.value.every((i) => i.hover === false)
-  if (arr) {
-    for (const val of data.value) {
-      if (route.name === val.route) val.hover = true
-      else val.hover = false
-    }
-  }
-}
 const toLink = (item) => {
   window.open(item.href, '_blank') // 在新标签页中打开URL
 }
@@ -260,6 +253,20 @@ const toOut = () => {
   userStore.logOut()
   router.push({ path: '/login', query: { status: '1' } })
 }
+const handleMouseOver = (index) => {
+  data.value[index].hover = true
+  info.value = data.value[index]
+}
+const handleMousOut = (index) => {
+  data.value[index].hover = false
+  const arr = data.value.every((i) => i.hover === false)
+  if (arr) {
+    for (const val of data.value) {
+      if (route.name === val.route) val.hover = true
+      else val.hover = false
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -303,91 +310,102 @@ const toOut = () => {
       }
     }
     .header_3 {
-      height: 74px;
-      background: linear-gradient(to bottom, #009fff, #0077ff);
-
-      .list {
-        height: 100%;
-        max-width: 1700px;
-        margin: 0 auto;
+      .nav_bg1 {
         display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: $global-font-size-26;
-        color: #ffffff;
-        .text {
-          width: 10%;
-          display: flex;
-          justify-content: center;
-          cursor: default;
-        }
-        .line {
-          margin: 0 0 0 24px;
-          width: 1px;
-          height: 21px;
-          background: linear-gradient(180deg, rgba(255, 255, 255, 1) 0%, #1c66e7 50%, rgba(255, 255, 255, 1) 100%);
-        }
-      }
-      .info {
-        display: none;
-        .info_1 {
-          z-index: 100;
-          position: absolute;
-          left: 448px;
-          top: 147px;
-          cursor: default;
-          width: 170px;
-          background: #0077ff;
-
-          .children {
-            padding: 10px;
+        justify-content: space-between;
+        padding: 10px 110px;
+        .list {
+          position: relative;
+          .nav_title {
+            cursor: default;
             text-align: center;
-            .title {
-              font-size: $global-font-size-22;
-              color: #ffffff;
-            }
-            .title:hover {
-              font-weight: bold;
-            }
+            font-size: 24px;
+            padding: 20px 0;
+            font-weight: normal;
+            -webkit-transition: all 0.8s ease;
+            transition: all 0.8s ease;
+          }
+          .activeLink {
+            color: #0077ff;
+          }
+          .link1 {
+            width: 100%;
+            height: 2px;
+            background: linear-gradient(to bottom, #009fff, #0077ff);
           }
-          .children:hover {
-            background: #0165e7;
+          .link2 {
+            width: 100%;
+            height: 2px;
+          }
+          .info {
+            display: none;
+            position: absolute;
+            bottom: -100px;
+            left: -40px;
+            z-index: 100;
+            background: rgba(255, 255, 255, 0.9); /* 白色背景半透明 */
+            .info_1 {
+              .children {
+                width: 160px;
+                text-align: center;
+                line-height: 45px;
+                font-size: 18px;
+                cursor: default;
+              }
+              .children:hover {
+                background: linear-gradient(to bottom, #009fff, #0077ff);
+                color: #fff;
+              }
+            }
           }
         }
       }
-      .infoTrue {
-        .info_1 {
-          left: 407px !important;
+      .nav_bg1:hover {
+        background-color: #fff;
+        -webkit-transition: all 0.8s ease;
+        transition: all 0.8s ease;
+        .list {
+          color: #444;
+          .link1 {
+            width: 100%;
+            height: 2px;
+            background: linear-gradient(to bottom, #009fff, #0077ff);
+          }
+          .link2 {
+            width: 100%;
+            height: 2px;
+          }
+          .info {
+            display: block !important;
+          }
         }
       }
-      .listTrue {
-        font-size: $global-font-size-25 !important;
-      }
-      .menuTrue {
-        position: relative;
-        flex-direction: column;
-        align-items: center;
-        font-weight: bold;
-        .link {
-          position: absolute;
-          top: 40px;
-          width: 60px;
-          height: 5px;
-          background: #ffffff;
-          border-radius: 5px;
+      .nav_bg2 {
+        position: fixed;
+        left: 0;
+        top: 0;
+        width: 100%;
+        z-index: 1000;
+        background-color: #ffff;
+        -webkit-transition: all 0.8s ease;
+        transition: all 0.8s ease;
+        .list {
+          color: #444;
+          .link1 {
+            width: 100%;
+            height: 2px;
+            background: linear-gradient(to bottom, #009fff, #0077ff);
+          }
+          .link2 {
+            width: 100%;
+            height: 2px;
+          }
         }
       }
     }
   }
-  .header:hover {
-    .header_3 {
-      .info {
-        display: block !important;
-      }
-    }
-  }
   .main {
-    min-height: 50vh;
+    min-height: 45vh;
   }
   .footer {
     font-family: PingFangSC-Regular;

src/router/index.js

@@ -221,6 +221,12 @@ const router = createRouter({
       meta: { title: '产学研用协同创新数字化平台-合作伙伴' },
       component: () => import('@/views/detail/friendDetail.vue')
     },
+    {
+      path: '/preliminary',
+      name: 'preliminary',
+      meta: { title: '产学研用协同创新数字化平台-报名信息' },
+      component: () => import('@/views/detail/preliminary.vue')
+    },
     {
       path: '/chat',
       meta: { title: '产学研用协同创新数字化平台-消息' },

src/store/api/platform/matchExt.js

@@ -0,0 +1,40 @@
+import { defineStore } from 'pinia'
+import { AxiosWrapper } from '@/utils/axios-wrapper'
+import { get } from 'lodash-es'
+const url = '/matchExt'
+const axios = new AxiosWrapper()
+
+export const MatchExtStore = defineStore('matchExt', () => {
+  const query = 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(`${url}`, cond)
+    return res
+  }
+  const fetch = async (payload) => {
+    const res = await axios.$get(`${url}/${payload}`)
+    return res
+  }
+  const create = async (payload) => {
+    const res = await axios.$post(`${url}`, payload)
+    return res
+  }
+  const update = async (payload) => {
+    const id = get(payload, 'id', get(payload, '_id'))
+    const res = await axios.$post(`${url}/${id}`, payload)
+    return res
+  }
+  const del = async (payload) => {
+    const res = await axios.$delete(`${url}/${payload}`)
+    return res
+  }
+  return {
+    query,
+    fetch,
+    create,
+    update,
+    del
+  }
+})

src/store/api/platform/matchReg.js

@@ -0,0 +1,40 @@
+import { defineStore } from 'pinia'
+import { AxiosWrapper } from '@/utils/axios-wrapper'
+import { get } from 'lodash-es'
+const url = '/matchReg'
+const axios = new AxiosWrapper()
+
+export const MatchRegStore = defineStore('matchReg', () => {
+  const query = 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(`${url}`, cond)
+    return res
+  }
+  const fetch = async (payload) => {
+    const res = await axios.$get(`${url}/${payload}`)
+    return res
+  }
+  const create = async (payload) => {
+    const res = await axios.$post(`${url}`, payload)
+    return res
+  }
+  const update = async (payload) => {
+    const id = get(payload, 'id', get(payload, '_id'))
+    const res = await axios.$post(`${url}/${id}`, payload)
+    return res
+  }
+  const del = async (payload) => {
+    const res = await axios.$delete(`${url}/${payload}`)
+    return res
+  }
+  return {
+    query,
+    fetch,
+    create,
+    update,
+    del
+  }
+})

src/views/center/match.vue

@@ -30,6 +30,7 @@
             </el-table-column>
             <el-table-column align="center" label="操作" width="250">
               <template #default="{ row }">
+                <el-link v-if="row.form == '4'" :underline="false" type="primary" size="mini" @click="toPreliminary(row)" style="margin-right: 10px">查看初赛信息</el-link>
                 <el-link v-if="row.status == '-2'" :underline="false" type="warning" size="mini" @click="toExam(row)" style="margin-right: 10px">提交审核</el-link>
                 <el-link v-if="row.match_status == '2' && row.form != '3'" :underline="false" type="primary" size="mini" @click="toScore(row)" style="margin-right: 10px">分数</el-link>
                 <el-link :underline="false" type="warning" size="mini" @click="toSign(row)" style="margin-right: 10px">报名</el-link>
@@ -172,6 +173,25 @@
                 </template>
               </custom-form>
             </el-tab-pane>
+            <el-tab-pane label="报名信息设置" name="fourth" v-if="form.form == '4'">
+              <el-col :span="24" class="add">
+                <el-button type="primary" @click="addInvest()">添加</el-button>
+              </el-col>
+              <el-table :data="investigateList" border>
+                <el-table-column type="index" label="序号" width="80" align="center"> </el-table-column>
+                <el-table-column prop="problem" label="问题" align="center"> </el-table-column>
+                <el-table-column label="操作" align="center" width="200">
+                  <template #default="scope">
+                    <el-button size="mini" type="primary" @click="updateInvest(scope.row)">修改</el-button>
+                    <el-button size="mini" type="danger" @click="delInvest(scope.row)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="button">
+                <el-button type="warning" @click="InvestSave('-2')">保存草稿</el-button>
+                <el-button type="primary" @click="InvestSave('0')">保存并提交审核</el-button>
+              </div>
+            </el-tab-pane>
           </el-tabs>
         </el-col>
         <el-col :span="24" v-if="dialog.type == '2'">
@@ -187,8 +207,44 @@
         <el-col :span="24" v-if="dialog.type == '4'">
           <score :matchForm="form"></score>
         </el-col>
+        <el-col :span="24" v-if="dialog.type == '5'">
+          <preliminary :matchForm="form"></preliminary>
+        </el-col>
       </el-row>
     </el-dialog>
+    <el-dialog v-model="dialogVisible" title="调查问卷填写" width="800" :destroy-on-close="false" @close="toInvestClose">
+      <custom-form v-model="investigateForm" :fields="fourformFields" :rules="fourRules" @save="toInvestigateSave" submitText="保存" :DraftSave="false">
+        <template #type>
+          <el-option v-for="i in proTypeList" :key="i.value" :label="i.label" :value="i.value"></el-option>
+        </template>
+        <template #answer>
+          <div class="answer" v-if="investigateForm.type == '0' || investigateForm.type == '1' || investigateForm.type == '2' || investigateForm.type == '6'">
+            <el-col :span="24" class="add">
+              <el-button type="primary" @click="addAnswer()">添加</el-button>
+            </el-col>
+            <el-table :data="answerList" border>
+              <el-table-column type="index" label="序号" width="80" align="center"> </el-table-column>
+              <el-table-column prop="text" label="答案" align="center" width="500">
+                <template #default="scope">
+                  <el-input v-model="scope.row.text" placeholder="请输入答案" />
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="100">
+                <template #default="scope">
+                  <el-button type="danger" @click="delAnswer(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="answer" v-if="investigateForm.type == '7'">
+            <custom-upload model="file" :list="answerFile" :limit="1" url="/files/web/cxyy_match/upload" @change="onaUpload"></custom-upload>
+          </div>
+        </template>
+        <template #is_must>
+          <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
+        </template>
+      </custom-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -197,6 +253,7 @@
 import moment from 'moment'
 import sign from './parts/sign.vue'
 import score from './parts/score.vue'
+import preliminary from './parts/preliminaryMatch.vue'
 import { Search } from '@element-plus/icons-vue'
 import { cloneDeep, get } from 'lodash-es'
 const $checkRes = inject('$checkRes')
@@ -288,6 +345,38 @@ const rulesFields = ref([
   { label: '赛事联络', model: 'rules11', custom: true },
   { label: '赛事交流', model: 'rules12', custom: true }
 ])
+// 调查问卷
+const investigateList = ref([])
+const investigateForm = ref({})
+const fourformFields = ref([
+  { label: '问题', model: 'problem' },
+  { label: '类型', model: 'type', type: 'select' },
+  {
+    label: '答案',
+    model: 'answer',
+    custom: true,
+    display: () => investigateForm.value.type == '0' || investigateForm.value.type == '1' || investigateForm.value.type == '2' || investigateForm.value.type == '6' || investigateForm.value.type == '7'
+  },
+  { label: '是否必填', model: 'is_must', type: 'radio' },
+  { label: '备注', model: 'remark', type: 'textarea' }
+])
+const fourRules = reactive({
+  problem: [{ required: true, message: '请输入问题', trigger: 'blur' }]
+})
+const dialogVisible = ref(false)
+const proTypeList = ref([
+  { value: '0', label: '单选' },
+  { value: '1', label: '多选' },
+  { value: '2', label: '下拉' },
+  { value: '3', label: '单行文本' },
+  { value: '4', label: '多行文本' },
+  { value: '5', label: '图片/文件' },
+  { value: '6', label: '数组' },
+  { value: '7', label: '附件模板' }
+])
+// 答案
+const answerList = ref([])
+const answerFile = ref([])
 // 请求
 onMounted(async () => {
   loading.value = true
@@ -359,10 +448,14 @@ const toAdd = () => {
 }
 // 修改
 const toEdit = async (data) => {
-  data.time = [data.start_time, data.end_time]
-  form.value = data
-  await searchProcess()
-  dialog.value = { type: '1', show: true, title: '修改赛事' }
+  let res = await store.fetch(data.id)
+  if (res.errcode == '0') {
+    res.data.time = [data.start_time, data.end_time]
+    form.value = res.data
+    if (res.data.ext_info && res.data.ext_info.length > 0) investigateList.value = res.data.ext_info
+    await searchProcess()
+    dialog.value = { type: '1', show: true, title: '修改赛事' }
+  }
 }
 // 报名
 const toSign = (data) => {
@@ -379,6 +472,11 @@ const toScore = (data) => {
   form.value = data
   dialog.value = { type: '4', show: true, title: '分数管理' }
 }
+// 查看初赛信息
+const toPreliminary = (data) => {
+  form.value = data
+  dialog.value = { type: '5', show: true, title: '初赛信息' }
+}
 // 删除
 const toDelete = (data) => {
   ElMessageBox.confirm(`您确认删除${data.name}该数据?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' })
@@ -392,7 +490,7 @@ const toDelete = (data) => {
 }
 const toSave = async () => {
   const data = cloneDeep(form.value)
-  const other = { status: '0', user: user.value.id, form: searchForm.value.form }
+  const other = { status: '0', user: user.value.id }
   if (data.time && data.time.length > 1) {
     data.start_time = data.time[0]
     data.end_time = data.time[1]
@@ -496,6 +594,69 @@ const sizeChange = (limits) => {
   currentPage.value = 1
   search({ skip: 0, limit: limit })
 }
+// 调查问卷填写
+const addInvest = () => {
+  dialogVisible.value = true
+  investigateForm.value = { sid: moment().valueOf(), problem: '', type: '', is_must: '', reply: '', answer: '', remark: '' }
+}
+// 调查问卷修改
+const updateInvest = (e) => {
+  dialogVisible.value = true
+  if (e.answer && e.answer.length > 0) answerList.value = e.answer
+  investigateForm.value = e
+}
+// 删除调查问卷
+const delInvest = async (e) => {
+  let list = investigateList.value.filter((i) => i.sid != e.sid)
+  investigateList.value = list
+}
+// 保存
+const toInvestigateSave = (data) => {
+  if (answerList.value && answerList.value.length > 0) data.answer = answerList.value
+  else data.answer = answerFile.value
+  let investigate = investigateList.value.find((i) => i.sid == data.sid)
+  if (investigate) {
+    investigateList.value = investigateList.value.map((i) => {
+      if (i.sid == data.sid) return data
+      else return i
+    })
+  } else investigateList.value.push(data)
+  toInvestClose()
+}
+const toInvestClose = () => {
+  investigateForm.value = {}
+  answerList.value = []
+  dialogVisible.value = false
+}
+// 答案添加
+const addAnswer = () => {
+  let list = answerList.value || []
+  list.push({ sid: moment().valueOf(), text: '' })
+  answerList.value = list
+}
+//  答案删除
+const delAnswer = async (e) => {
+  let list = answerList.value.filter((i) => i.sid != e.sid)
+  answerList.value = list
+}
+//  保存并提交审核
+const InvestSave = async (status) => {
+  const data = cloneDeep(form.value)
+  const other = { status, user: user.value.id }
+  let res
+  if (get(data, 'id')) res = await store.update({ id: data.id, ext_info: investigateList.value, ...other, ...data })
+  else res = await store.create({ ext_info: investigateList.value, ...other, ...data })
+  if (res.errcode == 0) {
+    ElMessage({ message: `发布成功可以上历史发布查看`, type: 'success' })
+    search({ skip, limit })
+    toClose()
+  }
+}
+// 上传图片
+const onaUpload = (e) => {
+  const { value } = e
+  answerFile.value = value
+}
 </script>
 <style scoped lang="scss">
 .main {
@@ -527,6 +688,13 @@ const sizeChange = (limits) => {
     margin: 20px 0 0 0;
   }
 }
+.add {
+  margin: 0 0 10px 0;
+}
+.button {
+  text-align: center;
+  margin: 10px 0 0 0;
+}
 .tables {
   .tables_1 {
     margin: 0 0 10px 0;

src/views/center/parts/preliminaryMatch.vue

@@ -0,0 +1,200 @@
+<template>
+  <div class="main" v-loading="loading">
+    <el-col :span="24" class="one">
+      <el-table :data="list" style="width: 100%" size="large" :header-cell-style="{ backgroundColor: '#edf3ff' }">
+        <template #empty>
+          <el-empty description="暂无数据" />
+        </template>
+        <el-table-column prop="no" align="center" label="编号" width="100"> </el-table-column>
+        <el-table-column prop="user_name" align="center" label="用户"> </el-table-column>
+        <el-table-column prop="time" align="center" label="报名时间" />
+        <el-table-column prop="status" align="center" label="状态" width="100">
+          <template #default="scope">
+            <el-tag v-if="scope.row.status == '0'" type="success">符合要求</el-tag>
+            <el-tag v-else type="info">已退回</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="180">
+          <template #default="{ row }">
+            <el-link v-if="row.status == '0'" :underline="false" type="warning" size="mini" @click="toView(row)" style="margin-right: 10px">审核</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-col>
+    <el-col :span="24" class="two">
+      <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>
+    <el-dialog v-model="dialog.show" :title="dialog.title" :destroy-on-close="false" @close="toClose">
+      <el-descriptions title="报名信息" :column="1" border>
+        <template #extra>
+          <el-button type="danger" @click="toExam">退回报名申请</el-button>
+        </template>
+        <el-descriptions-item v-for="(item, index) in info" :key="index" :label="item.problem">
+          <div class="type" v-if="item.type == '0' || item.type == '2' || item.type == '3' || item.type == '4'">{{ item.reply || '暂无内容' }}</div>
+          <div class="type" v-if="item.type == '1'">{{ item.reply.join(',') }}</div>
+          <div class="type" v-if="item.type == '5'">
+            <div v-for="(as, img) in item.reply" :key="img">
+              <el-link :href="getUrl(as)" target="_blank">{{ as.name }}</el-link>
+            </div>
+          </div>
+          <div class="type" v-if="item.type == '6'">
+            <div class="list">
+              <div v-for="(aa, ina) in item.answer" :key="ina" class="name">{{ aa.text }}</div>
+            </div>
+            <div class="list" v-for="(gg, inx) in item.reply" :key="inx">
+              <div v-for="(aa, ina) in item.answer" :key="ina" class="input">
+                {{ gg[aa.text] }}
+              </div>
+            </div>
+          </div>
+          <div class="type" v-if="item.type == '7'">
+            <div v-for="(as, img) in item.answer" :key="img">
+              <el-link :href="getUrl(as)" target="_blank">{{ as.name }}</el-link>
+            </div>
+          </div>
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { get } from 'lodash-es'
+const $checkRes = inject('$checkRes')
+// 加载中
+const loading = ref(false)
+const id = ref('')
+const props = defineProps({
+  matchForm: { type: Object }
+})
+const match = computed({
+  get() {
+    return props.matchForm
+  }
+})
+// 接口
+import { MatchRegStore } from '@/store/api/platform/matchReg'
+const store = MatchRegStore()
+// 列表
+const list = ref([])
+let skip = 0
+let limit = inject('limit')
+const total = ref(0)
+const currentPage = ref(1)
+
+const info = ref([])
+
+const form = ref({})
+const dialog = ref({ type: '1', show: false, title: '审核报名信息' })
+
+const search = async (query = { skip, limit }) => {
+  skip = query.skip
+  limit = query.limit
+  const info = {
+    skip: query.skip,
+    limit: query.limit,
+    match_id: id.value
+  }
+  const res = await store.query(info)
+  if (res.errcode == '0') {
+    list.value = res.data
+    total.value = res.total
+  }
+}
+// 审核
+const toView = (data) => {
+  form.value = data
+  info.value = data.info
+  dialog.value = { type: '1', show: true, title: '审核报名信息' }
+}
+// 图片处理
+const getUrl = (e) => {
+  if (e) return `${import.meta.env.VITE_APP_HOST}${get(e, 'uri')}`
+}
+// 审核
+const toExam = () => {
+  ElMessageBox.confirm('确定将该报名信息退回?', '审核信息', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(async () => {
+      const data = form.value
+      const res = await store.update({ id: data.id, status: '-1' })
+      if ($checkRes(res, true)) {
+        toClose()
+      }
+    })
+    .catch(() => {})
+}
+// 分页
+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 })
+}
+const toClose = async () => {
+  form.value = {}
+  dialog.value = { show: false }
+  await search({ skip, limit })
+}
+watch(
+  match,
+  async (item) => {
+    id.value = item.id
+    loading.value = true
+    await search({ skip, limit })
+    loading.value = false
+  },
+  {
+    immediate: true //初始化立即执行
+  }
+)
+</script>
+<style scoped lang="scss">
+.main {
+  .two {
+    display: flex;
+    justify-content: center;
+    margin: 20px 0 0 0;
+  }
+  .type {
+    .image {
+      width: 100%;
+    }
+  }
+
+  .list {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 10px 0;
+
+    .name {
+      width: 50%;
+      text-align: center;
+    }
+
+    .input {
+      width: 50%;
+      margin: 0 5px 0 0;
+      border: 1px solid #e5e5e5;
+      border-radius: 5px;
+      text-align: center;
+
+      .name {
+        width: 50%;
+        text-align: center;
+        margin: 0 0 10px 0;
+      }
+    }
+  }
+  :deep(.el-descriptions__body .el-descriptions__table.is-bordered .el-descriptions__cell) {
+    text-align: center;
+    width: 10px !important; /* 设置你想要的宽度 */
+  }
+}
+</style>

src/views/center/parts/preliminaryUser.vue

@@ -0,0 +1,318 @@
+<template>
+  <div class="main" v-loading="loading">
+    <el-col :span="24" class="one">
+      <el-table :data="list" style="width: 100%" size="large" :header-cell-style="{ backgroundColor: '#edf3ff' }">
+        <template #empty>
+          <el-empty description="暂无数据" />
+        </template>
+        <el-table-column prop="no" align="center" label="编号" width="100"> </el-table-column>
+        <el-table-column prop="user_name" align="center" label="用户"> </el-table-column>
+        <el-table-column prop="time" align="center" label="报名时间" />
+        <el-table-column prop="status" align="center" label="状态" width="100">
+          <template #default="scope">
+            <el-tag v-if="scope.row.status == '0'" type="success">符合要求</el-tag>
+            <el-tag v-else type="info">已退回</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="180">
+          <template #default="{ row }">
+            <el-link v-if="row.status == '-1'" :underline="false" type="warning" size="mini" @click="toEdit(row)" style="margin-right: 10px">修改</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-col>
+    <el-col :span="24" class="two">
+      <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>
+    <el-dialog v-model="dialog.show" :title="dialog.title" :destroy-on-close="false" @close="toClose">
+      <div class="list" v-for="(item, index) in investigate" :key="index">
+        <div class="problem">
+          <el-icon v-if="item.is_must == '0'" color="red"><StarFilled /></el-icon>
+          <span style="margin: 0 0 0 10px" v-if="item.is_must == '0'">{{ item.problem }}</span>
+          <span style="margin: 0 0 0 10px" v-else>{{ item.problem }}</span>
+        </div>
+        <div class="type" v-if="item.type == '0'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-radio-group v-model="item.reply">
+            <el-radio v-for="(i, radio) in item.answer" :key="radio" :value="i.text">{{ i.text }}</el-radio>
+          </el-radio-group>
+        </div>
+        <div class="type" v-if="item.type == '1'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-checkbox-group v-model="checkbox" @change="checkChange($event, item)">
+            <el-checkbox v-for="(i, checkbox) in item.answer" :key="checkbox" :label="i.text" :value="i.text">
+              {{ i.text }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </div>
+        <div class="type" v-if="item.type == '2'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-select v-model="item.reply" placeholder="请选择" size="large" style="width: 100%">
+            <el-option v-for="(i, select) in item.answer" :key="select" :label="i.text" :value="i.text" />
+          </el-select>
+        </div>
+        <div class="type" v-if="item.type == '3'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-input size="large" v-model="item.reply" :placeholder="getField(item.problem)" />
+        </div>
+        <div class="type" v-if="item.type == '4'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-input v-model="item.reply" type="textarea" :placeholder="getField(item.problem)" />
+        </div>
+        <div class="type" v-if="item.type == '5'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <custom-upload model="reply" :list="file" :limit="1" url="/files/web/cxyy_match/upload" @change="onUpload($event, item)"></custom-upload>
+        </div>
+        <div class="type" v-if="item.type == '6'">
+          <div class="list">
+            <div v-for="(aa, ina) in item.answer" :key="ina" class="name">{{ aa.text }}</div>
+          </div>
+          <div class="list" v-for="(gg, inx) in item.reply" :key="inx">
+            <div v-for="(aa, ina) in item.answer" :key="ina" class="input">
+              <el-input size="large" v-model="gg[aa.text]" :placeholder="getField(item.problem)" />
+            </div>
+            <el-icon class="icon" size="25" @click="toDel(item, gg.sid)"><Close /></el-icon>
+          </div>
+          <div class="add" @click="toAdd(item)">+新增一行</div>
+        </div>
+        <div class="type" v-if="item.type == '7'">
+          <div v-for="(as, img) in item.answer" :key="img">
+            <el-link :href="getUrl(as)" target="_blank">{{ as.name }}</el-link>
+          </div>
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+        </div>
+      </div>
+      <div class="button">
+        <el-button type="primary" @click="toSave()">保存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import moment from 'moment'
+import { get } from 'lodash-es'
+const $checkRes = inject('$checkRes')
+// 加载中
+const loading = ref(false)
+const id = ref('')
+const props = defineProps({
+  userInfo: { type: Object }
+})
+const user = computed({
+  get() {
+    return props.userInfo
+  }
+})
+// 接口
+import { MatchRegStore } from '@/store/api/platform/matchReg'
+const store = MatchRegStore()
+// 列表
+const list = ref([])
+let skip = 0
+let limit = inject('limit')
+const total = ref(0)
+const currentPage = ref(1)
+
+const investigate = ref([])
+const file = ref([])
+const checkbox = ref([])
+
+const form = ref({})
+const dialog = ref({ type: '1', show: false, title: '报名信息' })
+
+const search = async (query = { skip, limit }) => {
+  skip = query.skip
+  limit = query.limit
+  const info = {
+    skip: query.skip,
+    limit: query.limit,
+    user_id: id.value
+  }
+  const res = await store.query(info)
+  if (res.errcode == '0') {
+    list.value = res.data
+    total.value = res.total
+  }
+}
+// 修改
+const toEdit = (data) => {
+  form.value = data
+  investigate.value = data.info
+  for (const val of data.info) {
+    if (val.type == '5') file.value = val.reply
+    if (val.type == '1') checkbox.value = val.reply
+  }
+  dialog.value = { type: '1', show: true, title: '报名信息' }
+}
+// 图片处理
+const getUrl = (e) => {
+  if (e) return `${import.meta.env.VITE_APP_HOST}${get(e, 'uri')}`
+}
+// 分页
+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 })
+}
+const toClose = async () => {
+  form.value = {}
+  investigate.value = []
+  dialog.value = { show: false }
+  await search({ skip, limit })
+}
+const getField = (data) => {
+  let res = '请输入内容'
+  if (data) res = `请输入${data}`
+  return res
+}
+// 上传图片
+const onUpload = (e, item) => {
+  const { value } = e
+  for (let val of investigate.value) {
+    if (val.sid == item.sid) val.reply = value
+  }
+}
+// 新增一行
+const toAdd = (item) => {
+  for (let val of investigate.value) {
+    if (val.sid == item.sid) {
+      let answer = []
+      let obj = {
+        sid: moment().valueOf()
+      }
+      for (let s of val.answer) {
+        obj[s.text] = ''
+      }
+      answer.push(obj)
+      if (val.reply) val.reply = [...val.reply, ...answer]
+      else val.reply = answer
+    }
+  }
+}
+// 删除一行
+const toDel = (item, sid) => {
+  if (item && item.reply && item.reply.length > 0) {
+    let answer = item.reply.filter((i) => i.sid != sid)
+    for (let val of investigate.value) {
+      if (val.sid == item.sid) {
+        val.reply = answer
+      }
+    }
+  }
+}
+const checkChange = (data, item) => {
+  for (let val of investigate.value) {
+    if (val.sid == item.sid) {
+      val.reply = data
+    }
+  }
+}
+const toSave = async () => {
+  const data = { id: form.value.id, status: '0', info: investigate.value }
+  const res = await store.update(data)
+  if ($checkRes(res, true)) {
+    toClose()
+  }
+}
+watch(
+  user,
+  async (item) => {
+    id.value = item.id
+    loading.value = true
+    await search({ skip, limit })
+    loading.value = false
+  },
+  {
+    immediate: true //初始化立即执行
+  }
+)
+</script>
+<style scoped lang="scss">
+.main {
+  .two {
+    display: flex;
+    justify-content: center;
+    margin: 20px 0 0 0;
+  }
+  .list {
+    .problem {
+      display: flex;
+      align-items: center;
+      font-size: 20px;
+      margin: 10px 0;
+    }
+
+    .type {
+      padding: 0 0 10px 15px;
+
+      .list {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 10px 0;
+
+        .name {
+          width: 50%;
+          text-align: center;
+        }
+
+        .input {
+          width: 50%;
+          margin: 0 5px 0 0;
+
+          .name {
+            width: 50%;
+            text-align: center;
+            margin: 0 0 10px 0;
+          }
+        }
+
+        .icon {
+          display: none;
+          margin: 5px 0 0 0;
+        }
+      }
+
+      .list:hover {
+        .icon {
+          display: block;
+        }
+      }
+
+      .add {
+        border: 1px solid #e5e5e5;
+        border-radius: 5px;
+        text-align: center;
+        padding: 10px;
+        cursor: pointer;
+      }
+
+      .image {
+        width: 100%;
+      }
+
+      .remark {
+        margin: 10px 0 10px 20px;
+        font-size: 14px;
+        color: red;
+      }
+    }
+  }
+
+  .button {
+    margin: 10px 0;
+    padding: 10px;
+    text-align: center;
+
+    button {
+      padding: 20px 0;
+      width: 240px;
+      background-color: #007aff;
+    }
+  }
+}
+</style>

src/views/center/sign.vue

@@ -2,35 +2,40 @@
   <div class="index">
     <el-row>
       <el-col :span="24" class="main" v-loading="loading">
-        <!-- <el-col :span="24" class="one">
-          <el-radio-group size="large" v-model="searchForm.type">
+        <el-col :span="24" class="one">
+          <el-radio-group size="large" v-model="type">
             <el-radio-button label="活动报名" value="1" />
             <el-radio-button label="大赛报名" value="2" />
           </el-radio-group>
-        </el-col> -->
-        <el-col :span="24" class="two">
-          <el-table :data="list" style="width: 100%" size="large" :header-cell-style="{ backgroundColor: '#edf3ff' }">
-            <template #empty>
-              <el-empty description="暂无数据" />
-            </template>
-            <el-table-column prop="matchInfo.name" align="center" label="活动名称" />
-            <el-table-column prop="time" align="center" label="报名时间" width="180" />
-            <el-table-column prop="status" align="center" label="状态" width="180">
-              <template #default="scope">
-                <div>{{ getDict(scope.row.status, 'status') }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="操作" width="180">
-              <template #default="{ row }">
-                <el-link :underline="false" type="primary" size="mini" @click="toView(row)" style="margin-right: 10px">查看活动</el-link>
-                <el-link :underline="false" v-if="row.status != '1'" type="warning" size="mini" @click="toEdit(row)" style="margin-right: 10px">修改报名信息</el-link>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-        <el-col :span="24" class="thr">
-          <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 v-if="type == '1'">
+          <el-col :span="24" class="two">
+            <el-table :data="list" style="width: 100%" size="large" :header-cell-style="{ backgroundColor: '#edf3ff' }">
+              <template #empty>
+                <el-empty description="暂无数据" />
+              </template>
+              <el-table-column prop="matchInfo.name" align="center" label="活动名称" />
+              <el-table-column prop="time" align="center" label="报名时间" width="180" />
+              <el-table-column prop="status" align="center" label="状态" width="180">
+                <template #default="scope">
+                  <div>{{ getDict(scope.row.status, 'status') }}</div>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="操作" width="180">
+                <template #default="{ row }">
+                  <el-link :underline="false" type="primary" size="mini" @click="toView(row)" style="margin-right: 10px">查看活动</el-link>
+                  <el-link :underline="false" v-if="row.status != '1'" type="warning" size="mini" @click="toEdit(row)" style="margin-right: 10px">修改报名信息</el-link>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+          <el-col :span="24" class="thr">
+            <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 v-else>
+          <preliminary :userInfo="user"></preliminary>
+        </div>
       </el-col>
     </el-row>
     <el-dialog v-model="dialog.show" :title="dialog.title" :destroy-on-close="false" @close="toClose">
@@ -48,6 +53,7 @@
 // 组件
 import form1 from './parts/form-1.vue'
 import form2 from './parts/form-2.vue'
+import preliminary from './parts/preliminaryUser.vue'
 
 import moment from 'moment'
 import { cloneDeep, get } from 'lodash-es'
@@ -74,6 +80,9 @@ const currentPage = ref(1)
 const dialog = ref({ type: '1', show: false, title: '修改报名信息' })
 const ruleFormRef = ref()
 const form = ref({ project_file: [] })
+
+const type = ref('1')
+
 const validatePhoneNumber = (rule, value, callback) => {
   const reg = /^1[3-9]\d{9}$/
   if (!value) {

src/views/detail/base.vue

@@ -51,7 +51,7 @@
             <div class="other_1">
               <el-image class="image" :src="getUrl(item.logo)" fit="fill">
                 <template v-slot:error>
-                  <el-image class="image" :src="companyLogo" fit="fill" />
+                  <el-image class="image" :src="baseLogo" fit="fill" />
                 </template>
               </el-image>
             </div>
@@ -72,6 +72,7 @@
 
 <script setup>
 // 图片引入
+import baseLogo from '/images/base.jpg'
 import lists from '/images/company.png'
 const $checkRes = inject('$checkRes')
 import { get } from 'lodash-es'

src/views/detail/matchDetail.vue

@@ -179,6 +179,8 @@ const collectionStore = CollectionStore()
 const loading = ref(false)
 // 路由
 const route = useRoute()
+// 路由
+const router = useRouter()
 const info = ref({})
 // 报名
 const signList = ref([])
@@ -269,9 +271,13 @@ const getDict = (data, model) => {
 }
 // 报名参赛
 const toSign = () => {
-  if (info.value.match_type == '1') {
-    window.open(info.value.href, '_blank') // 在新标签页中打开URL
-  } else dialog.value = true
+  if (info.value.form == '4') {
+    router.push({ path: `/preliminary`, query: { id: info.value.id || info.value._id } })
+  } else {
+    if (info.value.match_type == '1') {
+      window.open(info.value.href, '_blank') // 在新标签页中打开URL
+    } else dialog.value = true
+  }
 }
 const toClose = () => {
   dialog.value = false
@@ -440,6 +446,7 @@ provide('submitForm', submitForm)
         }
       }
       .button {
+        cursor: pointer;
         margin-top: 70px !important;
         justify-content: center;
         display: flex !important;
@@ -517,6 +524,7 @@ provide('submitForm', submitForm)
           }
         }
         .button {
+          cursor: pointer;
           margin-top: 70px !important;
           justify-content: center;
           display: flex !important;

src/views/detail/preliminary.vue

@@ -0,0 +1,336 @@
+<template>
+  <custom-layout class="main">
+    <el-col :span="24" class="w_1300 one">
+      <div v-if="!user.id">
+        <div class="text">注册信息</div>
+        <el-form ref="ruleFormRef" :model="form" :rules="rules" label-width="100px" class="form" label-position="left">
+          <el-form-item label="账号" prop="account">
+            <el-input size="large" clearable v-model="form.account" placeholder="请输入姓名/单位名称">
+              <template #prefix>
+                <el-icon>
+                  <Avatar />
+                </el-icon>
+              </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="手机号" prop="phone">
+            <el-input size="large" clearable v-model="form.phone" placeholder="请输入手机号">
+              <template #prefix>
+                <el-icon>
+                  <Iphone />
+                </el-icon>
+              </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="密码" prop="password">
+            <el-input size="large" v-model="form.password" type="password" show-password placeholder="请输入包含英文字母大小写、数字和特殊符号的 8-16 位组合">
+              <template #prefix>
+                <el-icon>
+                  <Unlock />
+                </el-icon>
+              </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="电子邮箱" prop="email">
+            <el-input size="large" clearable v-model="form.email" placeholder="请输入电子邮箱">
+              <template #prefix>
+                <el-icon>
+                  <Briefcase />
+                </el-icon>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="text">填报信息</div>
+      <div class="list" v-for="(item, index) in investigate" :key="index">
+        <div class="problem">
+          <el-icon v-if="item.is_must == '0'" color="red"><StarFilled /></el-icon>
+          <span style="margin: 0 0 0 10px" v-if="item.is_must == '0'">{{ item.problem }}</span>
+          <span style="margin: 0 0 0 10px" v-else>{{ item.problem }}</span>
+        </div>
+        <div class="type" v-if="item.type == '0'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-radio-group v-model="item.reply">
+            <el-radio v-for="(i, radio) in item.answer" :key="radio" :value="i.text">{{ i.text }}</el-radio>
+          </el-radio-group>
+        </div>
+        <div class="type" v-if="item.type == '1'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-checkbox-group v-model="checkbox" @change="checkChange($event, item)">
+            <el-checkbox v-for="(i, checkbox) in item.answer" :key="checkbox" :label="i.text" :value="i.text">
+              {{ i.text }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </div>
+        <div class="type" v-if="item.type == '2'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-select v-model="item.reply" placeholder="请选择" size="large" style="width: 100%">
+            <el-option v-for="(i, select) in item.answer" :key="select" :label="i.text" :value="i.text" />
+          </el-select>
+        </div>
+        <div class="type" v-if="item.type == '3'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-input size="large" v-model="item.reply" :placeholder="getField(item.problem)" />
+        </div>
+        <div class="type" v-if="item.type == '4'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <el-input v-model="item.reply" type="textarea" :placeholder="getField(item.problem)" />
+        </div>
+        <div class="type" v-if="item.type == '5'">
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+          <custom-upload model="reply" :list="file" :limit="1" url="/files/web/cxyy_match/upload" @change="onUpload($event, item)"></custom-upload>
+        </div>
+        <div class="type" v-if="item.type == '6'">
+          <div class="list">
+            <div v-for="(aa, ina) in item.answer" :key="ina" class="name">{{ aa.text }}</div>
+          </div>
+          <div class="list" v-for="(gg, inx) in item.reply" :key="inx">
+            <div v-for="(aa, ina) in item.answer" :key="ina" class="input">
+              <el-input size="large" v-model="gg[aa.text]" :placeholder="getField(item.problem)" />
+            </div>
+            <el-icon class="icon" size="25" @click="toDel(item, gg.sid)"><Close /></el-icon>
+          </div>
+          <div class="add" @click="toAdd(item)">+新增一行</div>
+        </div>
+        <div class="type" v-if="item.type == '7'">
+          <div v-for="(as, img) in item.answer" :key="img">
+            <el-link :href="getUrl(as)" target="_blank">{{ as.name }}</el-link>
+          </div>
+          <div class="remark" v-if="item.remark">{{ item.remark }}</div>
+        </div>
+      </div>
+      <div class="button">
+        <el-button type="primary" @click="toBack()">返回上一页</el-button>
+        <el-button type="primary" @click="toSave()">保存</el-button>
+      </div>
+    </el-col>
+  </custom-layout>
+</template>
+
+<script setup>
+import moment from 'moment'
+import { get } from 'lodash-es'
+const $checkRes = inject('$checkRes')
+// 接口
+import { MatchStore } from '@/store/api/platform/match'
+const store = MatchStore()
+import { MatchRegStore } from '@/store/api/platform/matchReg'
+const matchRegStore = MatchRegStore()
+import { UserStore } from '@/store/user'
+const userStore = UserStore()
+const user = computed(() => userStore.user)
+// 加载中
+const loading = ref(false)
+// 路由
+const route = useRoute()
+const info = ref({})
+const investigate = ref([])
+const file = ref([])
+const form = ref({ gender: '0', role: ['User'] })
+const checkbox = ref([])
+// 表单验证
+const ruleFormRef = ref()
+const validatePhoneNumber = (rule, value, callback) => {
+  const reg = /^1[3-9]\d{9}$/
+  if (!value) {
+    return callback(new Error('手机号不能为空'))
+  }
+  if (!reg.test(value)) {
+    return callback(new Error('请输入正确的手机号'))
+  }
+  callback()
+}
+const passwordValValidate = (rule, value, callback) => {
+  if (!value) {
+    return callback(new Error('请输入密码'))
+  } else if (/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[._~!@#$^&*])[A-Za-z0-9._~!@#$^&*]{8,16}$/g.test(value)) {
+    return callback()
+  } else {
+    return callback(new Error('请输入包含英文字母大小写、数字和特殊符号的 8-16 位组合'))
+  }
+}
+const rules = reactive({
+  nick_name: [{ required: true, message: '请输入昵称', trigger: 'blur' }],
+  phone: [{ required: true, validator: validatePhoneNumber, trigger: 'blur' }],
+  account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
+  password: [{ required: true, validator: passwordValValidate, trigger: 'blur' }],
+  email: [{ required: true, message: '请输入电子邮箱', trigger: 'blur' }],
+  checkCode: [{ required: true, message: '请输入验证码', trigger: 'blur' }]
+})
+
+// 请求
+onMounted(async () => {
+  loading.value = true
+  await search()
+  loading.value = false
+})
+const search = async () => {
+  let id = route.query.id
+  if (id) {
+    let res = await store.fetch(id)
+    if (res.errcode == '0') {
+      info.value = res.data
+      if (res.data.ext_info && res.data.ext_info.length > 0) investigate.value = res.data.ext_info
+    }
+  }
+}
+const getField = (data) => {
+  let res = '请输入内容'
+  if (data) res = `请输入${data}`
+  return res
+}
+// 图片处理
+const getUrl = (e) => {
+  if (e) return `${import.meta.env.VITE_APP_HOST}${get(e, 'uri')}`
+}
+// 上传图片
+const onUpload = (e, item) => {
+  const { value } = e
+  for (let val of investigate.value) {
+    if (val.sid == item.sid) val.reply = value
+  }
+}
+// 新增一行
+const toAdd = (item) => {
+  for (let val of investigate.value) {
+    if (val.sid == item.sid) {
+      let answer = []
+      let obj = {
+        sid: moment().valueOf()
+      }
+      for (let s of val.answer) {
+        obj[s.text] = ''
+      }
+      answer.push(obj)
+      if (val.reply) val.reply = [...val.reply, ...answer]
+      else val.reply = answer
+    }
+  }
+}
+// 删除一行
+const toDel = (item, sid) => {
+  if (item && item.reply && item.reply.length > 0) {
+    let answer = item.reply.filter((i) => i.sid != sid)
+    for (let val of investigate.value) {
+      if (val.sid == item.sid) {
+        val.reply = answer
+      }
+    }
+  }
+}
+const checkChange = (data, item) => {
+  for (let val of investigate.value) {
+    if (val.sid == item.sid) {
+      val.reply = data
+    }
+  }
+}
+const toSave = async () => {
+  const data = { match_id: info.value.id, info: investigate.value }
+  if (user.value.id) data.user_id = user.value.id
+  else {
+    form.value.nick_name = form.value.account
+    data.user = form.value
+  }
+  const res = await matchRegStore.create(data)
+  if ($checkRes(res, true)) {
+    toBack()
+  }
+}
+// 返回上一页
+const toBack = () => {
+  window.history.go(-1)
+}
+</script>
+<style scoped lang="scss">
+.main {
+  .one {
+    .text {
+      margin: 0 0 10px 0;
+      color: #000;
+      display: inline-block;
+      padding-bottom: 20px;
+      font-size: 30px;
+      border-bottom: 5px solid #378cff;
+      cursor: pointer;
+    }
+    .list {
+      .problem {
+        display: flex;
+        align-items: center;
+        font-size: 20px;
+        margin: 10px 0;
+      }
+
+      .type {
+        padding: 0 0 10px 15px;
+
+        .list {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin: 10px 0;
+
+          .name {
+            width: 50%;
+            text-align: center;
+          }
+
+          .input {
+            width: 50%;
+            margin: 0 5px 0 0;
+
+            .name {
+              width: 50%;
+              text-align: center;
+              margin: 0 0 10px 0;
+            }
+          }
+
+          .icon {
+            display: none;
+            margin: 5px 0 0 0;
+          }
+        }
+
+        .list:hover {
+          .icon {
+            display: block;
+          }
+        }
+
+        .add {
+          border: 1px solid #e5e5e5;
+          border-radius: 5px;
+          text-align: center;
+          padding: 10px;
+          cursor: pointer;
+        }
+
+        .image {
+          width: 100%;
+        }
+
+        .remark {
+          margin: 10px 0 10px 20px;
+          font-size: 14px;
+          color: red;
+        }
+      }
+    }
+
+    .button {
+      margin: 10px 0;
+      padding: 10px;
+      text-align: center;
+
+      button {
+        padding: 20px 0;
+        width: 240px;
+        background-color: #007aff;
+      }
+    }
+  }
+}
+</style>

src/views/five/index.vue

@@ -4,16 +4,18 @@
       <div class="w_1300">
         <el-col :span="24" class="two_1">
           <el-row class="two_1_1">
-            <el-col :span="12" class="oneLeft">
+            <el-col :span="16" class="oneLeft">
               <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                 <el-tab-pane label="全部比赛" name="-1"></el-tab-pane>
                 <el-tab-pane label="大奖赛" name="0"></el-tab-pane>
                 <el-tab-pane label="经典赛" name="1"></el-tab-pane>
                 <el-tab-pane label="训练赛" name="2"></el-tab-pane>
                 <el-tab-pane label="活动路演" name="3"></el-tab-pane>
+                <el-tab-pane label="数字化平台" name="4"></el-tab-pane>
+                <el-tab-pane label="其他" name="5"></el-tab-pane>
               </el-tabs>
             </el-col>
-            <el-col :span="12" class="oneRight">
+            <el-col :span="8" class="oneRight">
               <el-input size="large" clearable v-model="searchForm.name" placeholder="请输入赛题名称搜索..." class="input">
                 <template #append>
                   <el-button :icon="Search" @click="onSearch" />

src/views/one/index.vue

@@ -1,14 +1,20 @@
 <template>
-  <custom-layout v-loading="loading">
-    <page :carouselList="carouselList" :friendList="friendList" :recordList="recordList" :incubatorList="incubatorList" :achieveList="achieveList" :list="newsList" @toActive="toActive"></page>
+  <custom-layout v-loading="loading" :is_menu="false">
+    <page :linkList="linkList" :friendList="friendList" :recordList="recordList" :incubatorList="incubatorList" :achieveList="achieveList" :list="newsList" @toActive="toActive"></page>
   </custom-layout>
 </template>
 
 <script setup>
+import { menuList } from '@/layout/site'
 import { onBeforeRouteLeave } from 'vue-router'
 // 组件
 import page from './page.vue'
 const $checkRes = inject('$checkRes')
+const route = useRoute()
+import { UserStore } from '@/store/user'
+const userStore = UserStore()
+const user = computed(() => userStore.user)
+import { cloneDeep, get } from 'lodash-es'
 // 接口
 import { NewsStore } from '@/store/api/platform/news'
 import { DesignStore } from '@/store/api/platform/design'
@@ -29,7 +35,10 @@ const friendList = ref([])
 const incubatorList = ref([])
 const achieveList = ref([])
 const recordList = ref([])
-
+// 导航
+const isIncubator = ref(false)
+const hasbrain = ref(false)
+const linkList = ref([])
 // 新闻
 const newsList = ref([])
 // 分类
@@ -42,10 +51,30 @@ const active = ref('0')
 // 请求
 onMounted(async () => {
   loading.value = true
+  await search()
   await searchOther()
   await searchNew()
   loading.value = false
 })
+const search = async () => {
+  for (const val of menuList) {
+    if (route.name === val.route) val.hover = true
+    else val.hover = false
+  }
+  let menus = cloneDeep(menuList)
+  // 判断, 如果没有孵化基地角色, 则不显示孵化基地菜单
+  if (user.value) {
+    const hasIncubator = get(user.value, 'role', []).find((f) => f === 'Incubator')
+    if (hasIncubator) isIncubator.value = true
+  }
+  if (!isIncubator.value) menus = menus.filter((f) => f.key !== '11')
+
+  // 特定用户查看产业大脑
+  if (user.value && user.value.id == 17) hasbrain.value = true
+  else hasbrain.value = false
+  if (!hasbrain.value) menus = menus.filter((f) => f.key !== '12')
+  linkList.value = menus
+}
 const searchOther = async () => {
   let res
   // 合作伙伴
@@ -75,7 +104,7 @@ const searchOther = async () => {
   }
 }
 const searchNew = async () => {
-  const info = { skip: 0, limit: 10, type: active.value, is_use: '0', status: '1', is_show: '0' }
+  const info = { skip: 0, limit: 8, type: active.value, is_use: '0', status: '1', is_show: '0' }
   let res
   // 政策新闻
   res = await newsStore.query(info)

src/views/one/page copy.vue

@@ -0,0 +1,657 @@
+<template>
+  <div class="page">
+    <div class="one" data-aos="fade-up" data-aos-duration="1000">
+      <div class="one_left">
+        <el-carousel height="680px">
+          <el-carousel-item v-for="(item, index) in carouselList" :key="index">
+            <el-image class="image" :src="getUrl(item)" fit="fill" @click="toRedirect(item)" />
+          </el-carousel-item>
+        </el-carousel>
+      </div>
+      <div class="one_right">
+        <div class="right_1">
+          <div class="right_left">
+            <span class="tab" :class="[item.value == active ? 'active' : '']" v-for="(item, index) in newList" :key="index" @click="toActive(item)">{{ item.label }}</span>
+          </div>
+          <div class="right_right">
+            <div class="more_title" @click="toMore(0)">查看更多</div>
+            <el-icon size="24"><ArrowRight /></el-icon>
+          </div>
+        </div>
+        <div class="right_2">
+          <vue3-seamless-scroll :list="list" :hover="true" :step="0.5" :limit-scroll-num="3" :wheel="true" :isWatch="true">
+            <div class="list" v-for="(item, index) in list" :key="index" @click="toView(item, '0')">
+              <div class="left">
+                <el-image class="image" v-if="item.logo && item.logo.length > 0" :src="getFile(item.logo)" fit="fill">
+                  <template v-slot:error>
+                    <el-image v-if="item.type == '0'" class="image" :src="new_1" fit="fill" />
+                    <el-image v-else-if="item.type == '1'" class="image" :src="new_2" fit="fill" />
+                    <el-image v-else class="image" :src="new_2" fit="fill" />
+                  </template>
+                </el-image>
+                <div v-else>
+                  <el-image v-if="item.type == '0'" class="image" :src="new_1" fit="fill" />
+                  <el-image v-else-if="item.type == '1'" class="image" :src="new_2" fit="fill" />
+                  <el-image class="image" v-else :src="new_3" fit="fill" />
+                </div>
+              </div>
+              <div class="right">
+                <div class="new_title textOne">
+                  {{ item.title || '暂无标题' }}
+                </div>
+                <div class="new_content textMore">{{ removeHtmlStyle(item.content) || '暂无内容' }}</div>
+              </div>
+            </div>
+          </vue3-seamless-scroll>
+        </div>
+      </div>
+    </div>
+    <div class="thr" data-aos="fade-up" data-aos-duration="1000">
+      <div class="title">
+        <!-- <el-image class="image" :src="left" fit="fill" /> -->
+        <div class="title_center">成果展示</div>
+        <div class="title_brief">产学研用协同创新数字化平台</div>
+        <!-- <el-image class="image" :src="right" fit="fill" /> -->
+      </div>
+      <div class="thr_1">
+        <div class="w_1700">
+          <div class="list" v-for="(item, index) in achieveList" :key="index" @click="toView(item, '2')">
+            <div class="list_left">
+              <el-image class="image" :src="icon" fit="fill" />
+            </div>
+            <div class="list_right">
+              <div class="other_1">
+                <div class="name">{{ item.name || '暂无成果名称' }}</div>
+              </div>
+              <div class="other_2" v-if="user && user.id"><span>技术领域：</span>{{ item.field || '暂无' }}</div>
+              <div class="other_2" v-if="user && user.id"><span>负责人：</span>{{ item.person || '暂无' }}</div>
+              <div class="other_2" v-if="user && user.id"><span>来源：</span>{{ item.source || '暂无' }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="more">
+        <div class="more_title" @click="toMore(2)">查看更多</div>
+        <el-icon size="24"><ArrowRight /></el-icon>
+      </div>
+    </div>
+    <div class="four" data-aos="fade-up" data-aos-duration="1000">
+      <div class="title">
+        <!-- <el-image class="image" :src="left" fit="fill" /> -->
+        <div class="title_center">孵化体系</div>
+        <div class="title_brief">产学研用协同创新数字化平台</div>
+        <!-- <el-image class="image" :src="right" fit="fill" /> -->
+      </div>
+      <div class="four_1">
+        <div class="list" v-for="(item, index) in incubatorList" :key="index">
+          <el-image class="image" :src="getFile(item.logo)" fit="fill">
+            <template v-slot:error>
+              <el-image class="image" :src="baseLogo" fit="fill" />
+            </template>
+          </el-image>
+          <div class="content">
+            <div class="name">{{ item.name || '暂无孵化基地名称' }}</div>
+            <div class="other_1"><span>负责人姓名：</span>{{ item.person || '暂无' }}</div>
+            <div class="other_1"><span>负责人联系电话：</span>{{ item.person_phone || '暂无' }}</div>
+            <div class="other_1"><span>地址：</span>{{ getArea(item.area) || '暂无' }}</div>
+            <div class="button">
+              <button @click="toView(item, '1')">查看详情</button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="more">
+        <div class="more_title" @click="toMore(1)">查看更多</div>
+        <el-icon size="24"><ArrowRight /></el-icon>
+      </div>
+      <div class="join">
+        <div class="join_bg"></div>
+        <div class="join_scroll">
+          <div class="join_shadow">
+            <div class="join_shadow_left"></div>
+            <div class="join_shadow_right"></div>
+          </div>
+          <div class="join_top">
+            <div class="join_item" v-for="(item, index) in friendList" :key="index" @click="toFriend(item)">
+              <el-image class="image" :src="getFile(item.file)" fit="fill">
+                <template v-slot:error>
+                  <el-image class="image" :src="friend" fit="fill" />
+                </template>
+              </el-image>
+              <div class="name">{{ item.name }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { get } from 'lodash-es'
+import { useNumberAnimation } from '@/utils/animation'
+
+// 图片引入
+import icon from '/images/icon.png'
+import new_1 from '/images/new_1.png'
+import new_2 from '/images/new_2.png'
+import new_3 from '/images/new_3.png'
+import friend from '/images/friend.jpeg'
+import baseLogo from '/images/base.jpg'
+// 用户信息
+import { UserStore } from '@/store/user'
+const userStore = UserStore()
+const user = computed(() => userStore.user)
+
+// 路由
+const router = useRouter()
+
+const props = defineProps({
+  carouselList: { type: Array, default: () => [] },
+  friendList: { type: Array, default: () => [] },
+  incubatorList: { type: Array, default: () => [] },
+  achieveList: { type: Array, default: () => [] },
+  recordList: { type: Array, default: () => [] },
+  list: { type: Array, default: () => [] }
+})
+
+const { carouselList, incubatorList, recordList } = toRefs(props)
+
+const emits = defineEmits(['toActive'])
+
+const active = ref('0')
+const recordInfo = ref({})
+const newList = ref([
+  { value: '0', label: '政策信息' },
+  { value: '1', label: '新闻通知' },
+  { value: '2', label: '行业动态' }
+])
+
+const toActive = async (item) => {
+  active.value = item.value
+  emits('toActive', item.value)
+}
+const toRedirect = (data) => {
+  const to = get(data, 'to')
+  if (to) window.open(to)
+}
+const getUrl = (item) => {
+  if (item) return `${import.meta.env.VITE_APP_HOST}${item.uri}`
+}
+const getFile = (item) => {
+  if (item && item.length > 0) return `${import.meta.env.VITE_APP_HOST}${item[0].uri}`
+}
+// 查看详情
+const toView = (item, type) => {
+  if (type == '0') {
+    if (item.jump_type == '1') window.open(item.route, '_blank')
+    else router.push({ path: '/news/detail', query: { id: item.id || item._id } })
+  } else {
+    if (user.value.id) {
+      if (type == '1') router.push({ path: '/base/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 toMore = (type) => {
+  if (type == '0') router.push({ path: '/news' })
+  if (type == '1') router.push({ path: '/base' })
+  if (type == '2') router.push({ path: '/nine' })
+}
+// 地区
+const getArea = (data) => {
+  if (data) return data.join('-')
+  else return '暂无地区'
+}
+// 富文本处理
+const removeHtmlStyle = (html) => {
+  let relStyle = /style\s*?=\s*?([‘"])[\s\S]*?\1/g //去除样式
+  let relTag = /<.+?>/g //去除标签
+  let relClass = /class\s*?=\s*?([‘"])[\s\S]*?\1/g // 清除类名
+  let newHtml = ''
+  if (html) {
+    newHtml = html.replace(relStyle, '')
+    newHtml = newHtml.replace(relTag, '')
+    newHtml = newHtml.replace(relClass, '')
+  }
+  return newHtml
+}
+// 查看合作伙伴下级
+const toFriend = (item) => {
+  router.push({ path: '/friend/detail', query: { code: item.code } })
+}
+// 请求
+onMounted(() => {
+  setTimeout(async () => {
+    await Animation()
+  }, 2000)
+})
+// 选择数据分析
+const Animation = () => {
+  if (recordList.value && recordList.value.length > 0) {
+    for (const val of recordList.value) {
+      useNumberAnimation({
+        from: 0,
+        to: val.num,
+        duration: 3000,
+        onProgress: (v) => {
+          if (v) val.num = v.toFixed(0)
+        }
+      })
+    }
+  }
+}
+watch(
+  recordList,
+  (item) => {
+    recordInfo.value = item[0]
+  },
+  {
+    deep: true
+  }
+)
+</script>
+<style scoped lang="scss">
+.page {
+  .title {
+    text-align: center;
+    margin: 30px 0 50px;
+    .image {
+      margin: 0 10px;
+      vertical-align: middle;
+      border-style: none;
+    }
+    .title_center {
+      font-size: $global-font-size-40;
+      font-weight: 600;
+    }
+    .title_brief {
+      margin: 15px 0 0 0;
+      font-size: $global-font-size-24;
+      color: #999;
+    }
+  }
+  .one {
+    max-width: 1700px;
+    margin: 30px auto 0;
+    height: 680px;
+    display: flex;
+    justify-content: space-between;
+    .one_left {
+      width: 50%;
+      .image {
+        height: 100%;
+        width: 100%;
+      }
+    }
+    .one_right {
+      width: 48%;
+      padding: 0 0 0 10px;
+      .right_1 {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin: 0 0 10px 0;
+
+        .right_left {
+          font-size: $global-font-size-28;
+          .tab {
+            margin: 0 30px 0 0;
+            cursor: pointer;
+          }
+          .active {
+            font-size: 40px;
+          }
+        }
+        .right_right {
+          display: flex;
+          align-items: center;
+          font-size: 24px;
+          cursor: default;
+        }
+      }
+      .right_2 {
+        height: 630px;
+        overflow: hidden;
+        .list {
+          display: flex;
+          border-bottom: 1px solid #979797;
+          padding: 30px 0;
+          .left {
+            width: 200px;
+            margin: 0 10px 0 0;
+            .image {
+              width: 200px;
+              height: 150px;
+            }
+          }
+          .right {
+            width: 700px;
+            .new_title {
+              font-size: $global-font-size-24;
+              font-weight: 600;
+              color: #5f5f5f;
+              cursor: default;
+              margin: 0 0 10px 0;
+            }
+            .new_title:hover {
+              color: #006cff;
+            }
+            .new_content {
+              margin: 14px 0 0 0;
+              color: #9ea6b3;
+              font-size: $global-font-size-20;
+            }
+          }
+        }
+      }
+    }
+  }
+  .two {
+    max-width: 1700px;
+    margin: 0 auto 10px;
+    .two_1 {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 111px;
+      background-image: linear-gradient(0deg, #eeeffb 0, #fff 100%), linear-gradient(#fff, #fff);
+      background-blend-mode: normal, normal;
+      box-shadow: 0 0 16px 0 rgba(72, 117, 229, 0.5);
+      border-radius: 6px;
+      .twoList {
+        text-align: center;
+        width: 340px;
+        border-right: 1px solid #d6d9e2;
+        cursor: default;
+        .two_num {
+          color: #1054ee;
+
+          span:first-child {
+            font-size: 28px;
+            font-family: '微软雅黑';
+            line-height: 28px;
+            height: 28px;
+            overflow: hidden;
+            display: inline-block;
+            position: relative;
+            font-weight: bold;
+          }
+          span:last-child {
+            font-size: 20px;
+          }
+        }
+        .two_title {
+          margin: 10px 0 0 0;
+          font-size: 21px;
+          color: #676767;
+        }
+      }
+    }
+    .two_2 {
+      margin: 10px 0 0 0;
+      .two_title {
+        height: 90px;
+        line-height: 90px;
+        text-align: center;
+        font-size: 30px;
+        color: #323232;
+      }
+      .two_content {
+        margin: 20px 0 0 0;
+      }
+    }
+  }
+  .thr {
+    margin: 20px 0;
+    background: #f1f6f9;
+    background-image: url(/images/con1-bg.png);
+    background-size: 100% 100%;
+    padding: 10px 0 0 0;
+
+    .thr_1 {
+      padding: 10px 0 10px;
+      .w_1700 {
+        max-width: 1700px;
+        margin: 0 auto;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        .list {
+          margin-bottom: 15px;
+          padding-top: 18px;
+          width: 413px;
+          padding: 20px;
+          background-color: #ffffff;
+          border-radius: 10px;
+          display: flex;
+          .list_left {
+            margin: 0 10px 0 0;
+          }
+          .list_right {
+            width: 320px;
+            .other_1 {
+              display: flex;
+              align-items: center;
+              margin: 0 0 20px 0;
+              .name {
+                font-family: PingFangSC-Medium;
+                font-size: 20px;
+                font-weight: 600;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                display: -webkit-box;
+                -webkit-line-clamp: 1;
+                -webkit-box-orient: vertical;
+              }
+            }
+            .other_2 {
+              margin: 0 0 10px 0;
+              font-family: PingFangSC-Medium;
+              font-size: 18px;
+              font-weight: 500;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-line-clamp: 1;
+              -webkit-box-orient: vertical;
+              span {
+                color: #7e8288;
+              }
+            }
+          }
+        }
+        .list:hover {
+          box-shadow: 0px 10px 30px #d5eaf3;
+        }
+      }
+    }
+    .more {
+      padding: 0 0 30px 0;
+      max-width: 1700px;
+      margin: 0 auto;
+      text-align: center;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      .more_title {
+        font-size: 24px;
+        cursor: default;
+      }
+    }
+  }
+  .four {
+    .four_1 {
+      max-width: 1700px;
+      margin: 0 auto 10px;
+      display: flex;
+      .list {
+        width: 400px;
+        margin: 0 30px 0 0;
+        box-shadow: 0px 2px 10px 1px rgba(0, 0, 0, 0.12);
+        .image {
+          width: 100%;
+          height: 280px;
+        }
+        .content {
+          margin: 20px 30px 30px;
+          .name {
+            font-weight: bold;
+            font-size: 22px;
+            margin-bottom: 14px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+          }
+          .other_1 {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 3;
+            -webkit-box-orient: vertical;
+            font-size: 16px;
+            line-height: 21px;
+            font-weight: 600;
+            margin-bottom: 10px;
+            span {
+              font-weight: 400;
+            }
+          }
+          .button {
+            text-align: center;
+            button {
+              width: 200px;
+              height: 40px;
+              line-height: 36px;
+              text-align: center;
+              color: #fff;
+              font-size: 16px;
+              background: linear-gradient(to bottom, #009fff, #0077ff);
+              margin: 40px auto 0px;
+              display: block;
+              border-radius: 30px;
+              border: none;
+            }
+          }
+        }
+      }
+      .list:last-child {
+        margin: 0;
+      }
+    }
+    .more {
+      padding: 30px 0;
+      max-width: 1700px;
+      margin: 0 auto;
+      text-align: center;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      .more_title {
+        font-size: 24px;
+        cursor: default;
+      }
+    }
+    .join {
+      margin: auto;
+      width: 100%;
+      position: relative;
+      overflow: hidden;
+      display: flex;
+      padding-top: 48px;
+      justify-content: center;
+      .join_bg {
+        margin: 0 auto;
+        max-width: 1700px;
+        position: absolute;
+        z-index: -100;
+        top: 0;
+        height: 300px;
+        background: linear-gradient(270deg, #7aa4ff 39.53%, #b7fff5 81.34%);
+        mix-blend-mode: normal;
+        opacity: 0.1;
+        filter: blur(67.957px);
+      }
+      .join_scroll {
+        margin: 0 auto;
+        max-width: 1920px;
+        min-width: 1700px;
+        position: relative;
+        overflow: hidden;
+        .join_shadow {
+          margin: 0 auto;
+          width: 100%;
+          min-width: 1700px;
+          position: absolute;
+          z-index: 1;
+          display: flex;
+          justify-content: space-between;
+          .join_shadow_left {
+            background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0, #fff 43.52%);
+            position: absolute;
+            z-index: 1;
+            width: 552px;
+            height: 400px;
+            top: 0;
+            right: -150px;
+            transform: matrix(0, 1, 1, 0, 0, 0);
+          }
+          .join_shadow_right {
+            background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0, #fff 43.52%);
+            position: absolute;
+            z-index: 1;
+            width: 552px;
+            height: 400px;
+            top: 0;
+            transform: rotate(90deg);
+            left: -150px;
+          }
+        }
+        .join_top {
+          display: flex;
+          transform: translate3d(-50%, 0, 0);
+          width: -webkit-max-content;
+          width: max-content;
+          animation: masked-animation 120s linear 1s infinite;
+          margin-left: 280px;
+          .join_item {
+            margin-right: 16px;
+            background: #fff;
+            opacity: 0.9;
+            border: 1px solid #fff;
+            border-radius: 4px;
+            padding: 20px;
+            width: 430px;
+            .image {
+              margin-bottom: 10px;
+              width: 200px;
+              height: 140px;
+              border-radius: 4px;
+            }
+            .name {
+              font-weight: 600;
+              font-size: 16px;
+              line-height: 26px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              cursor: default;
+            }
+          }
+        }
+        @keyframes masked-animation {
+          0% {
+            transform: translateZ(0);
+          }
+          100% {
+            transform: translate3d(-50%, 0, 0);
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/views/one/page.vue

@@ -1,48 +1,54 @@
 <template>
   <div class="page">
-    <div class="one" data-aos="fade-up" data-aos-duration="1000">
-      <div class="one_left">
-        <el-carousel height="680px">
-          <el-carousel-item v-for="(item, index) in carouselList" :key="index">
-            <el-image class="image" :src="getUrl(item)" fit="fill" @click="toRedirect(item)" />
-          </el-carousel-item>
-        </el-carousel>
-      </div>
-      <div class="one_right">
-        <div class="right_1">
-          <div class="right_left">
-            <span class="tab" :class="[item.value == active ? 'active' : '']" v-for="(item, index) in newList" :key="index" @click="toActive(item)">{{ item.label }}</span>
-          </div>
-          <div class="right_right">
-            <div class="more_title" @click="toMore(0)">查看更多</div>
-            <el-icon size="24"><ArrowRight /></el-icon>
-          </div>
-        </div>
-        <div class="right_2">
-          <vue3-seamless-scroll :list="list" :hover="true" :step="0.5" :limit-scroll-num="3" :wheel="true" :isWatch="true">
-            <div class="list" v-for="(item, index) in list" :key="index" @click="toView(item, '0')">
-              <div class="left">
-                <el-image class="image" v-if="item.logo && item.logo.length > 0" :src="getFile(item.logo)" fit="fill">
-                  <template v-slot:error>
-                    <el-image v-if="item.type == '0'" class="image" :src="new_1" fit="fill" />
-                    <el-image v-else-if="item.type == '1'" class="image" :src="new_2" fit="fill" />
-                    <el-image v-else class="image" :src="new_2" fit="fill" />
-                  </template>
-                </el-image>
-                <div v-else>
-                  <el-image v-if="item.type == '0'" class="image" :src="new_1" fit="fill" />
-                  <el-image v-else-if="item.type == '1'" class="image" :src="new_2" fit="fill" />
-                  <el-image class="image" v-else :src="new_3" fit="fill" />
+    <div class="one">
+      <div class="one_1">
+        <!-- 导航 -->
+        <nav class="nav_bg1" :class="{ nav_bg2: y }">
+          <div class="list" v-for="(item, index) in linkList" :key="index" @click="selectMenu(item.route)" @mouseover="handleMouseOver(index)" @mouseout="handleMousOut(index)">
+            <div class="nav_title" :class="[item.hover == true ? 'activeLink' : '']">
+              {{ item.title }}
+            </div>
+            <div :class="[item.hover == true ? 'link1' : 'link2']"></div>
+            <div class="info" v-if="info.key == '3' && item.key == '3'">
+              <div class="info_1">
+                <div v-for="(tag, indexs) in info.children" :key="indexs" class="children" @click="selectMenu(tag.route)">
+                  <span class="info_title"> {{ tag.title }}</span>
                 </div>
               </div>
-              <div class="right">
+            </div>
+          </div>
+        </nav>
+      </div>
+      <div class="one_2">
+        <div class="one_content w_1700">
+          <div class="one_left"></div>
+          <div class="one_right">
+            <div class="right_1">
+              <div class="right_button" :class="[item.value == active ? 'active' : '']" v-for="(item, index) in newList" :key="index" @click="toActive(item)">
+                <span class="tab">{{ item.label }}</span>
+              </div>
+            </div>
+            <div class="right_2">
+              <div class="list" v-for="(item, index) in list" :key="index" @click="toView(item, '0')">
                 <div class="new_title textOne">
                   {{ item.title || '暂无标题' }}
                 </div>
-                <div class="new_content textMore">{{ removeHtmlStyle(item.content) || '暂无内容' }}</div>
+                <!-- <div class="new_content textMore">{{ removeHtmlStyle(item.content) || '暂无内容' }}</div> -->
+              </div>
+              <div class="more">
+                <div class="more_title" @click="toMore(0)">查看更多</div>
+                <el-icon size="24"><ArrowRight /></el-icon>
               </div>
             </div>
-          </vue3-seamless-scroll>
+          </div>
+        </div>
+        <div class="one_video">
+          <div class="video-background">
+            <video ref="backgroundVideo" autoplay loop muted :playbackRate="0.5">
+              <source :src="homeBg" type="video/mp4" />
+              Your browser does not support the video tag.
+            </video>
+          </div>
         </div>
       </div>
     </div>
@@ -128,26 +134,27 @@
 </template>
 
 <script setup>
-import { get } from 'lodash-es'
+// import { get } from 'lodash-es'
 import { useNumberAnimation } from '@/utils/animation'
 
 // 图片引入
 import icon from '/images/icon.png'
-import new_1 from '/images/new_1.png'
-import new_2 from '/images/new_2.png'
-import new_3 from '/images/new_3.png'
 import friend from '/images/friend.jpeg'
 import baseLogo from '/images/base.jpg'
+import homeBg from '/images/home.mp4'
 // 用户信息
 import { UserStore } from '@/store/user'
 const userStore = UserStore()
 const user = computed(() => userStore.user)
 
+// 获取滚动条y轴坐标
+const { y } = useWindowScroll({ behavior: 'smooth' })
 // 路由
 const router = useRouter()
+const route = useRoute()
 
 const props = defineProps({
-  carouselList: { type: Array, default: () => [] },
+  linkList: { type: Array, default: () => [] },
   friendList: { type: Array, default: () => [] },
   incubatorList: { type: Array, default: () => [] },
   achieveList: { type: Array, default: () => [] },
@@ -155,12 +162,14 @@ const props = defineProps({
   list: { type: Array, default: () => [] }
 })
 
-const { carouselList, incubatorList, recordList } = toRefs(props)
+const { linkList, incubatorList, recordList } = toRefs(props)
 
 const emits = defineEmits(['toActive'])
 
 const active = ref('0')
 const recordInfo = ref({})
+const info = ref({})
+const backgroundVideo = ref(null)
 const newList = ref([
   { value: '0', label: '政策信息' },
   { value: '1', label: '新闻通知' },
@@ -171,13 +180,13 @@ const toActive = async (item) => {
   active.value = item.value
   emits('toActive', item.value)
 }
-const toRedirect = (data) => {
-  const to = get(data, 'to')
-  if (to) window.open(to)
-}
-const getUrl = (item) => {
-  if (item) return `${import.meta.env.VITE_APP_HOST}${item.uri}`
-}
+// const toRedirect = (data) => {
+//   const to = get(data, 'to')
+//   if (to) window.open(to)
+// }
+// const getUrl = (item) => {
+//   if (item) return `${import.meta.env.VITE_APP_HOST}${item.uri}`
+// }
 const getFile = (item) => {
   if (item && item.length > 0) return `${import.meta.env.VITE_APP_HOST}${item[0].uri}`
 }
@@ -193,6 +202,14 @@ const toView = (item, type) => {
     } else ElMessage({ message: '未登录！', type: 'error' })
   }
 }
+// 循环播放
+const restartVideo = () => {
+  if (backgroundVideo.value && backgroundVideo.value.paused) {
+    backgroundVideo.value.play().catch((error) => {
+      console.error('Auto play failed:', error)
+    })
+  }
+}
 // 查看更多
 const toMore = (type) => {
   if (type == '0') router.push({ path: '/news' })
@@ -204,6 +221,20 @@ const getArea = (data) => {
   if (data) return data.join('-')
   else return '暂无地区'
 }
+const selectMenu = (item, query) => {
+  if (item) {
+    for (const val of linkList.value) {
+      if (route.name === val.route) val.hover = true
+      else val.hover = false
+    }
+    if (item == 'two' || item == 'twelve') {
+      if (user.value.id) {
+        router.push({ path: `/${item}`, query })
+      } else ElMessage({ message: '未登录！', type: 'error' })
+    } else if (item == 'brain') window.open(`/brain`)
+    else router.push({ path: `/${item}`, query })
+  }
+}
 // 富文本处理
 const removeHtmlStyle = (html) => {
   let relStyle = /style\s*?=\s*?([‘"])[\s\S]*?\1/g //去除样式
@@ -221,11 +252,26 @@ const removeHtmlStyle = (html) => {
 const toFriend = (item) => {
   router.push({ path: '/friend/detail', query: { code: item.code } })
 }
+const handleMouseOver = (index) => {
+  linkList.value[index].hover = true
+  info.value = linkList.value[index]
+}
+const handleMousOut = (index) => {
+  linkList.value[index].hover = false
+  const arr = linkList.value.every((i) => i.hover === false)
+  if (arr) {
+    for (const val of linkList.value) {
+      if (route.name === val.route) val.hover = true
+      else val.hover = false
+    }
+  }
+}
 // 请求
 onMounted(() => {
   setTimeout(async () => {
     await Animation()
   }, 2000)
+  restartVideo()
 })
 // 选择数据分析
 const Animation = () => {
@@ -251,6 +297,15 @@ watch(
     deep: true
   }
 )
+watch(
+  route,
+  () => {
+    restartVideo()
+  },
+  {
+    deep: true
+  }
+)
 </script>
 <style scoped lang="scss">
 .page {
@@ -273,79 +328,200 @@ watch(
     }
   }
   .one {
-    max-width: 1700px;
-    margin: 30px auto 0;
-    height: 680px;
-    display: flex;
-    justify-content: space-between;
-    .one_left {
-      width: 50%;
-      .image {
-        height: 100%;
-        width: 100%;
-      }
-    }
-    .one_right {
-      width: 48%;
-      padding: 0 0 0 10px;
-      .right_1 {
+    position: relative;
+    height: 845px;
+    background: rgba(0, 0, 0, 0.2);
+    .one_1 {
+      .nav_bg1 {
         display: flex;
-        align-items: center;
         justify-content: space-between;
-        margin: 0 0 10px 0;
-
-        .right_left {
-          font-size: $global-font-size-28;
-          .tab {
-            margin: 0 30px 0 0;
-            cursor: pointer;
+        padding: 10px 110px;
+        -webkit-transition: all 0.8s ease;
+        transition: all 0.8s ease;
+        .list {
+          position: relative;
+          color: #fff;
+          .nav_title {
+            cursor: default;
+            text-align: center;
+            font-size: 24px;
+            padding: 20px 0;
+            font-weight: normal;
+          }
+          .activeLink {
+            color: #0077ff;
           }
-          .active {
-            font-size: 40px;
+          .link1 {
+            width: 100%;
+            height: 2px;
+            background: linear-gradient(to bottom, #009fff, #0077ff);
+          }
+          .link2 {
+            width: 100%;
+            height: 2px;
+          }
+          .info {
+            display: none;
+            position: absolute;
+            bottom: -100px;
+            left: -40px;
+            z-index: 100;
+            background: rgba(255, 255, 255, 0.9); /* 白色背景半透明 */
+            .info_1 {
+              .children {
+                width: 160px;
+                text-align: center;
+                line-height: 45px;
+                font-size: 18px;
+                cursor: default;
+              }
+              .children:hover {
+                background: linear-gradient(to bottom, #009fff, #0077ff);
+                color: #fff;
+              }
+            }
           }
         }
-        .right_right {
-          display: flex;
-          align-items: center;
-          font-size: 24px;
-          cursor: default;
+      }
+      .nav_bg1:hover {
+        background-color: #fff;
+        -webkit-transition: all 0.8s ease;
+        transition: all 0.8s ease;
+        .list {
+          color: #444;
+          .link1 {
+            width: 100%;
+            height: 2px;
+            background: linear-gradient(to bottom, #009fff, #0077ff);
+          }
+          .link2 {
+            width: 100%;
+            height: 2px;
+          }
+          .info {
+            display: block !important;
+          }
         }
       }
-      .right_2 {
-        height: 630px;
-        overflow: hidden;
+      .nav_bg2 {
+        position: fixed;
+        left: 0;
+        top: 0;
+        width: 100%;
+        z-index: 1000;
+        background-color: #ffff;
+        -webkit-transition: all 0.8s ease;
+        transition: all 0.8s ease;
         .list {
+          color: #444;
+          .link1 {
+            width: 100%;
+            height: 2px;
+            background: linear-gradient(to bottom, #009fff, #0077ff);
+          }
+          .link2 {
+            width: 100%;
+            height: 2px;
+          }
+        }
+      }
+      @media screen and (max-width: 1280px) {
+        .nav_bg2 {
+          min-width: 1920px;
+          margin: 0 auto;
+        }
+      }
+      @media screen and (min-width: 1921px) {
+        .nav_bg2 {
+          max-width: 1920px;
+          margin: 0 auto;
+        }
+      }
+    }
+    .one_2 {
+      .one_content {
+        margin: 30px auto 0;
+        display: flex;
+        justify-content: space-between;
+        color: #fff;
+        width: 100%;
+        font-size: 20px;
+        .one_left {
+          text-align: center;
+          width: 40%;
+        }
+        .one_right {
+          width: 60%;
           display: flex;
-          border-bottom: 1px solid #979797;
-          padding: 30px 0;
-          .left {
-            width: 200px;
-            margin: 0 10px 0 0;
-            .image {
-              width: 200px;
-              height: 150px;
+          .right_1 {
+            width: 25%;
+            .right_button {
+              font-size: $global-font-size-28;
+              border: 2px solid #fff;
+              padding: 20px 10px;
+              line-height: 28px;
+              display: block;
+              transition: 0.5s;
+              width: 170px;
+              text-align: center;
+              color: #fff;
+              margin: 90px 0;
+              .tab {
+                cursor: pointer;
+              }
             }
-          }
-          .right {
-            width: 700px;
-            .new_title {
-              font-size: $global-font-size-24;
-              font-weight: 600;
-              color: #5f5f5f;
-              cursor: default;
-              margin: 0 0 10px 0;
+            .active {
+              border: 2px solid #009fff;
+              background: linear-gradient(to bottom, #009fff, #0077ff);
+            }
+            .right_button:hover {
+              border: 2px solid #009fff;
+              background: linear-gradient(to bottom, #009fff, #0077ff);
             }
-            .new_title:hover {
-              color: #006cff;
+          }
+          .right_2 {
+            width: 75%;
+            .list {
+              padding: 40px 0 0 0;
+              .new_title {
+                font-size: $global-font-size-20;
+                font-weight: 600;
+                cursor: default;
+                margin: 0 0 10px 0;
+              }
+              .new_content {
+                margin: 15px 0 0 0;
+                font-size: $global-font-size-18;
+              }
             }
-            .new_content {
-              margin: 14px 0 0 0;
-              color: #9ea6b3;
-              font-size: $global-font-size-20;
+            .more {
+              display: flex;
+              align-items: center;
+              justify-content: flex-end;
+              font-size: 20px;
+              cursor: default;
+              margin: 40px 0 0 0;
             }
           }
         }
       }
+      .video-background {
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        min-width: 100%;
+        min-height: 100%;
+        width: auto;
+        height: auto;
+        z-index: -1;
+      }
+
+      .video-background video {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        object-fit: cover; /* Maintain aspect ratio */
+      }
     }
   }
   .two {

src/views/twelve/index.vue

@@ -7,9 +7,18 @@
       <div class="left">
         <div class="left_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 class="title_left">
+              <el-image class="image" :src="left" fit="fill" />
+              <div class="title_center">供给信息</div>
+              <el-image class="image" :src="right" fit="fill" />
+            </div>
+            <div class="title_right">
+              <el-input v-model="supply" size="large" clearable style="max-width: 300px" placeholder="请输入想要搜索的名称">
+                <template #append>
+                  <el-button @click="searchsupply({ supplyskip: 0, supplylimit: 3 })" :icon="Search" />
+                </template>
+              </el-input>
+            </div>
           </div>
           <el-empty v-if="supplytotal == 0" description="暂无数据" />
           <div class="leftOne" v-else>
@@ -41,9 +50,18 @@
         </div>
         <div class="left_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 class="title_left">
+              <el-image class="image" :src="left" fit="fill" />
+              <div class="title_center">需求信息</div>
+              <el-image class="image" :src="right" fit="fill" />
+            </div>
+            <div class="title_right">
+              <el-input v-model="demand" size="large" clearable style="max-width: 300px" placeholder="请输入想要搜索的名称">
+                <template #append>
+                  <el-button @click="searchdemand({ demandskip: 0, demandlimit: 3 })" :icon="Search" />
+                </template>
+              </el-input>
+            </div>
           </div>
           <el-empty v-if="demandtotal == 0" description="暂无数据" />
           <div v-else class="leftOne">
@@ -173,6 +191,7 @@
 </template>
 
 <script setup>
+import { Search } from '@element-plus/icons-vue'
 import { onBeforeRouteLeave } from 'vue-router'
 // 图片引入
 import left from '/images/top-left.png'
@@ -205,7 +224,9 @@ const loading = ref(true)
 const router = useRouter()
 const keyword = ref('')
 const keywordId = ref()
-
+// 搜索
+const demand = ref('')
+const supply = ref('')
 // 类型
 const dataType = ref('0')
 // 匹配结果
@@ -228,6 +249,7 @@ 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 }
+  if (supply.value) info.name = supply.value
   let res = await supplyStore.list(info)
   if (res.errcode == '0') {
     supplyList.value = res.data
@@ -240,6 +262,7 @@ 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 }
+  if (demand.value) info.name = demand.value
   let res = await demandStore.list(info)
   if (res.errcode == '0') {
     demandList.value = res.data
@@ -350,17 +373,27 @@ onBeforeRouteLeave((to, from, next) => {
         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;
+          .title_left {
+            width: 510px;
+            display: flex;
+            align-items: end;
+            justify-content: flex-end;
+            margin: 0 0 30px 0;
+            .image {
+              margin: 0 10px;
+              vertical-align: middle;
+              border-style: none;
+            }
+            .title_center {
+              font-size: $global-font-size-28;
+              font-weight: 600;
+            }
           }
-          .title_center {
-            font-size: $global-font-size-28;
-            font-weight: 600;
+          .title_right {
+            width: 320px;
+            display: flex;
+            justify-content: flex-end;
+            align-items: flex-start;
           }
         }
         .leftOne {

src/views/two/add/match.vue

@@ -126,9 +126,61 @@
               </template>
             </custom-form>
           </el-tab-pane>
+          <el-tab-pane label="报名信息设置" name="fourth" v-if="form.form == '4'">
+            <el-col :span="24" class="add">
+              <el-button type="primary" @click="addInvest()">添加</el-button>
+            </el-col>
+            <el-table :data="investigateList" border>
+              <el-table-column type="index" label="序号" width="80" align="center"> </el-table-column>
+              <el-table-column prop="problem" label="问题" align="center"> </el-table-column>
+              <el-table-column label="操作" align="center" width="200">
+                <template #default="scope">
+                  <el-button type="primary" @click="updateInvest(scope.row)">修改</el-button>
+                  <el-button size="mini" type="danger" @click="delInvest(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="button">
+              <el-button type="warning" @click="InvestSave('-2')">保存草稿</el-button>
+              <el-button type="primary" @click="InvestSave('0')">保存并提交审核</el-button>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </el-col>
     </el-row>
+    <el-dialog v-model="dialogVisible" title="报名信息设置填写" width="800" :destroy-on-close="false" @close="toClose">
+      <custom-form v-model="investigateForm" :fields="fourformFields" :rules="fourRules" @save="toInvestigateSave" submitText="保存" :DraftSave="false">
+        <template #type>
+          <el-option v-for="i in proTypeList" :key="i.value" :label="i.label" :value="i.value"></el-option>
+        </template>
+        <template #answer>
+          <div class="answer" v-if="investigateForm.type == '0' || investigateForm.type == '1' || investigateForm.type == '2' || investigateForm.type == '6'">
+            <el-col :span="24" class="add">
+              <el-button type="primary" @click="addAnswer()">添加</el-button>
+            </el-col>
+            <el-table :data="answerList" border>
+              <el-table-column type="index" label="序号" width="80" align="center"> </el-table-column>
+              <el-table-column prop="text" label="答案" align="center" width="500">
+                <template #default="scope">
+                  <el-input v-model="scope.row.text" placeholder="请输入答案" />
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="100">
+                <template #default="scope">
+                  <el-button type="danger" @click="delAnswer(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="answer" v-if="investigateForm.type == '7'">
+            <custom-upload model="file" :list="answerFile" :limit="1" url="/files/web/cxyy_match/upload" @change="onaUpload"></custom-upload>
+          </div>
+        </template>
+        <template #is_must>
+          <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
+        </template>
+      </custom-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -212,6 +264,38 @@ const rules = reactive({
   match_type: [{ required: true, message: '请选择赛事类型', trigger: 'blur' }],
   work: [{ required: true, message: '请输入组织单位', trigger: 'blur' }]
 })
+// 调查问卷
+const investigateList = ref([])
+const investigateForm = ref({})
+const fourformFields = ref([
+  { label: '问题', model: 'problem' },
+  { label: '类型', model: 'type', type: 'select' },
+  {
+    label: '答案',
+    model: 'answer',
+    custom: true,
+    display: () => investigateForm.value.type == '0' || investigateForm.value.type == '1' || investigateForm.value.type == '2' || investigateForm.value.type == '6' || investigateForm.value.type == '7'
+  },
+  { label: '是否必填', model: 'is_must', type: 'radio' },
+  { label: '备注', model: 'remark', type: 'textarea' }
+])
+const fourRules = reactive({
+  problem: [{ required: true, message: '请输入问题', trigger: 'blur' }]
+})
+const dialogVisible = ref(false)
+const proTypeList = ref([
+  { value: '0', label: '单选' },
+  { value: '1', label: '多选' },
+  { value: '2', label: '下拉' },
+  { value: '3', label: '单行文本' },
+  { value: '4', label: '多行文本' },
+  { value: '5', label: '图片/文件' },
+  { value: '6', label: '数组' },
+  { value: '7', label: '附件模板' }
+])
+// 答案
+const answerList = ref([])
+const answerFile = ref([])
 // 请求
 onMounted(async () => {
   loading.value = true
@@ -291,6 +375,11 @@ const onUpload = (e) => {
   const { model, value } = e
   form.value[model] = value
 }
+// 上传图片
+const onaUpload = (e) => {
+  const { value } = e
+  answerFile.value = value
+}
 // 流程添加
 const toProcessSave = async () => {
   for (const val of processList.value) {
@@ -318,9 +407,73 @@ const delProcess = async (e) => {
   }
   if (e.id) await processStore.del(e.id)
 }
+// 调查问卷填写
+const addInvest = () => {
+  dialogVisible.value = true
+  investigateForm.value = { sid: moment().valueOf(), problem: '', type: '', is_must: '', reply: '', answer: '', remark: '' }
+}
+// 删除调查问卷
+const delInvest = async (e) => {
+  let list = investigateList.value.filter((i) => i.sid != e.sid)
+  investigateList.value = list
+}
+// 保存
+const toInvestigateSave = (data) => {
+  if (answerList.value && answerList.value.length > 0) data.answer = answerList.value
+  else data.answer = answerFile.value
+  let investigate = investigateList.value.find((i) => i.sid == data.sid)
+  if (investigate) {
+    investigateList.value = investigateList.value.map((i) => {
+      if (i.sid == data.sid) return data
+      else return i
+    })
+  } else investigateList.value.push(data)
+  toClose()
+}
+const toClose = () => {
+  investigateForm.value = {}
+  answerList.value = []
+  dialogVisible.value = false
+}
+// 答案添加
+const addAnswer = () => {
+  let list = answerList.value || []
+  list.push({ sid: moment().valueOf(), text: '' })
+  answerList.value = list
+}
+//调查问卷修改
+const updateInvest = (e) => {
+  dialogVisible.value = true
+  if (e.answer && e.answer.length > 0) answerList.value = e.answer
+  investigateForm.value = e
+}
+//  答案删除
+const delAnswer = async (e) => {
+  let list = answerList.value.filter((i) => i.sid != e.sid)
+  answerList.value = list
+}
+//  保存并提交审核
+const InvestSave = async (status) => {
+  const data = cloneDeep(form.value)
+  const other = { status, user: user.value.id }
+  let res
+  if (get(data, 'id')) res = await store.update({ id: data.id, ext_info: investigateList.value, ...other, ...data })
+  else res = await store.create({ ext_info: investigateList.value, ...other, ...data })
+  if (res.errcode == 0) {
+    ElMessage({ message: `发布成功可以上历史发布查看`, type: 'success' })
+    form.value = { time: [], rules: {} }
+  }
+}
 </script>
 <style scoped lang="scss">
 .main {
+  .add {
+    margin: 0 0 10px 0;
+  }
+  .button {
+    text-align: center;
+    margin: 10px 0 0 0;
+  }
   .tables {
     .tables_1 {
       margin: 0 0 10px 0;