修改首页

src/App.vue

@@ -16,7 +16,18 @@ import zhCN from 'ant-design-vue/es/locale/zh_CN'
 <style lang="scss">
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+  font-family:
+    Avenir,
+    Tahoma,
+    Arial,
+    PingFang SC,
+    Lantinghei SC,
+    Microsoft Yahei,
+    Hiragino Sans GB,
+    'Microsoft Sans Serif',
+    WenQuanYi Micro Hei,
+    Helvetica,
+    sans-serif;
 }
 
 .w_1300 {

src/components/custom/custom-layout.vue

@@ -37,9 +37,8 @@
       </div>
       <div class="header_3">
         <el-col :span="24" class="list">
-          <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="text" v-for="(item, index) in data" @click="selectMenu(item.route)" :class="[item.hover == '1' ? 'menuTrue' : '']" :key="index">
             <div class="title">{{ item.title }}</div>
-            <!-- <div class="line"></div> -->
           </div>
         </el-col>
         <el-col :span="24" class="info">
@@ -55,18 +54,26 @@
       <slot></slot>
     </div>
     <div class="footer" v-if="is_foot">
-      <div class="foot">
-        <div class="foot_2">
-          <div class="footer_left">
-            <div class="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="title">电话：{{ footInfos.Phone || footInfo.Phone }}</div>
-              <div class="title">邮箱：{{ footInfos.Email || footInfo.Email }}</div>
-              <div class="title">地址：{{ footInfos.Address || footInfo.Address }}</div>
+      <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 class="center">
-              <span>友情连接:</span>
+          </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>
@@ -76,16 +83,11 @@
                 </div>
               </div>
             </div>
-            <div class="right">
-              <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 class="title" @click="toHelp">关于我们</div>
-            </div>
-          </div>
-          <div class="footer_right">
-            {{ footInfo.Copyright }}
           </div>
         </div>
+        <div class="foot_2">
+          {{ footInfo.Copyright }}
+        </div>
       </div>
     </div>
   </div>
@@ -192,6 +194,9 @@ const search = async () => {
     }
   }
 }
+const toLink = (item) => {
+  window.open(item.href, '_blank') // 在新标签页中打开URL
+}
 // 登录|注册
 const toLogin = (status) => {
   router.push({ path: '/login', query: { status } })
@@ -210,10 +215,10 @@ const selectMenu = (item, query) => {
     else router.push({ path: `/${item}`, query })
   }
 }
-// 关于我们
-const toHelp = () => {
-  router.push({ path: `/help` })
-}
+// // 关于我们
+// const toHelp = () => {
+//   router.push({ path: `/help` })
+// }
 // 个人中心
 const toCenter = () => {
   const role = user.value.role.find((i) => i === 'Admin')
@@ -232,26 +237,9 @@ const toChat = () => {
     }
   }
 }
-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 getUrl = (item) => {
   if (item && item.length > 0) return `${import.meta.env.VITE_APP_HOST}${item[0].uri}`
 }
-const toLink = (item) => {
-  window.open(item.href, '_blank') // 在新标签页中打开URL
-}
 // 退出登录
 const toOut = () => {
   userStore.logOut()
@@ -268,8 +256,9 @@ const toOut = () => {
       display: flex;
       align-items: center;
       justify-content: space-between;
-      margin: 0 20px;
       padding: 10px 0;
+      width: 1700px;
+      margin: 0 auto;
       .right {
         display: flex;
         font-size: $global-font-size-18;
@@ -302,7 +291,7 @@ const toOut = () => {
     }
     .header_3 {
       height: 70px;
-      background: linear-gradient(90deg, #1e79ef, #4585ed);
+      background: linear-gradient(to bottom, #009fff, #0077ff);
 
       .list {
         height: 100%;
@@ -374,9 +363,71 @@ const toOut = () => {
     min-height: 58.5vh;
   }
   .footer {
+    font-family: PingFangSC-Regular;
     padding: 10px 0;
-    background-image: linear-gradient(-45deg, #4826da, #1c66e7);
+    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;
+    .w_1700 {
+      width: 1700px;
+      margin: 10px auto;
+      .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;
+            }
+          }
+        }
+      }
+      .foot_2 {
+        text-align: center;
+        padding: 10px 0 0 0;
+      }
+    }
+
     .foot {
       margin: 0 20px;
       .foot_2 {

src/styles/variables.scss

@@ -22,6 +22,7 @@ $global-font-size-31: 31px;
 $global-font-size-32: 32px;
 $global-font-size-34: 34px;
 $global-font-size-36: 36px;
+$global-font-size-40: 40px;
 $global-font-size-46: 46px;
 $global-font-size-48: 48px;
 $global-color-003: #003894;

src/views/center/match.vue

@@ -48,116 +48,128 @@
     <el-dialog v-model="dialog.show" :title="dialog.title" :destroy-on-close="false" @close="toClose">
       <el-row>
         <el-col :span="24" v-if="dialog.type == '1'">
-          <custom-form v-model="form" :fields="formFields" :rules="rules" @save="toSave" @draftSave="toDraftSave">
-            <template #video>
-              <custom-upload model="video" :list="form.video" :limit="1" url="/files/web/cxyy_match/upload" @change="onUpload"></custom-upload>
-            </template>
-            <template #file>
-              <custom-upload model="file" :list="form.file" :limit="1" listType="picture-card" url="/files/web/cxyy_match/upload" @change="onUpload"></custom-upload>
-            </template>
-            <template #is_use>
-              <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
-            </template>
-            <template #industry>
-              <el-option v-for="i in industryList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-            </template>
-            <template #scale>
-              <el-radio v-for="i in scaleList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
-            </template>
-            <template #match_type>
-              <el-radio v-for="i in matchTypeList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
-            </template>
-            <template #type>
-              <el-option v-for="i in typeList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-            </template>
-            <template #form>
-              <el-option v-for="i in formList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-            </template>
-            <template #tags>
-              <el-select v-model="form.tags" multiple filterable allow-create default-first-option :reserve-keyword="false" placeholder="请选择标签" style="width: 100%">
-                <el-option v-for="item in tagsList" :key="item.id" :label="item.title" :value="item.title" />
-              </el-select>
-            </template>
-            <template #rules>
-              <div class="rules">
-                <custom-form v-model="form.rules" :fields="rulesFields" :useSave="false">
-                  <template #rules1>
-                    <WangEditor v-model="form.rules.rules1" />
-                  </template>
-                  <template #rules2>
-                    <WangEditor v-model="form.rules.rules2" />
-                  </template>
-                  <template #rules3>
-                    <WangEditor v-model="form.rules.rules3" />
-                  </template>
-                  <template #rules4>
-                    <WangEditor v-model="form.rules.rules4" />
-                  </template>
-                  <template #rules5>
-                    <WangEditor v-model="form.rules.rules5" />
-                  </template>
-                  <template #rules6>
-                    <WangEditor v-model="form.rules.rules6" />
-                  </template>
-                  <template #rules7>
-                    <WangEditor v-model="form.rules.rules7" />
-                  </template>
-                  <template #rules8>
-                    <WangEditor v-model="form.rules.rules8" />
-                  </template>
-                  <template #rules9>
-                    <WangEditor v-model="form.rules.rules9" />
-                  </template>
-                  <template #rules10>
-                    <WangEditor v-model="form.rules.rules10" />
-                  </template>
-                  <template #rules11>
-                    <WangEditor v-model="form.rules.rules11" />
-                  </template>
-                  <template #rules12>
-                    <WangEditor v-model="form.rules.rules12" />
-                  </template>
-                </custom-form>
-              </div>
-            </template>
-            <template #brief>
-              <WangEditor v-model="form.brief" />
-            </template>
-            <template #process>
-              <el-col :span="24" class="tables">
-                <el-col :span="24" class="tables_1">
-                  <el-button type="primary" @click="addProcess()">添加</el-button>
-                </el-col>
-                <el-col :span="24">
-                  <el-table :data="processList" border>
-                    <el-table-column type="index" label="序号" width="80" align="center"> </el-table-column>
-                    <el-table-column prop="name" label="流程名称" align="center">
-                      <template #default="scope">
-                        <el-input v-model="scope.row.name" placeholder="请输入流程名称" />
+          <el-tabs v-model="activeName" type="card">
+            <el-tab-pane label="基本信息" name="first">
+              <custom-form v-model="form" :fields="oneformFields" :rules="rules" @save="toSave" @draftSave="toDraftSave">
+                <template #video>
+                  <custom-upload model="video" :list="form.video" :limit="1" url="/files/web/cxyy_match/upload" @change="onUpload"></custom-upload>
+                </template>
+                <template #file>
+                  <custom-upload model="file" :list="form.file" :limit="1" listType="picture-card" url="/files/web/cxyy_match/upload" @change="onUpload"></custom-upload>
+                </template>
+                <template #is_use>
+                  <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
+                </template>
+                <template #industry>
+                  <el-option v-for="i in industryList" :key="i.id" :label="i.label" :value="i.value"></el-option>
+                </template>
+                <template #scale>
+                  <el-radio v-for="i in scaleList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
+                </template>
+                <template #match_type>
+                  <el-radio v-for="i in matchTypeList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
+                </template>
+                <template #type>
+                  <el-option v-for="i in typeList" :key="i.id" :label="i.label" :value="i.value"></el-option>
+                </template>
+                <template #form>
+                  <el-option v-for="i in formList" :key="i.id" :label="i.label" :value="i.value"></el-option>
+                </template>
+                <template #tags>
+                  <el-select v-model="form.tags" multiple filterable allow-create default-first-option :reserve-keyword="false" placeholder="请选择标签" style="width: 100%">
+                    <el-option v-for="item in tagsList" :key="item.id" :label="item.title" :value="item.title" />
+                  </el-select>
+                </template>
+              </custom-form>
+            </el-tab-pane>
+            <el-tab-pane label="拓展信息" name="second">
+              <custom-form v-model="form" :fields="twoformFields" :rules="{}" @save="toSave" @draftSave="toDraftSave">
+                <template #rules>
+                  <div class="rules">
+                    <custom-form v-model="form.rules" :fields="rulesFields" :useSave="false">
+                      <template #rules1>
+                        <WangEditor v-model="form.rules.rules1" />
                       </template>
-                    </el-table-column>
-                    <el-table-column prop="order_num" label="排序" align="center">
-                      <template #default="scope">
-                        <el-input v-model="scope.row.order_num" type="number" placeholder="请输入排序" />
+                      <template #rules2>
+                        <WangEditor v-model="form.rules.rules2" />
                       </template>
-                    </el-table-column>
-                    <el-table-column prop="is_use" label="是否启用" align="center">
-                      <template #default="scope">
-                        <el-select v-model="scope.row.is_use" placeholder="请选择是否启用">
-                          <el-option v-for="item in isUseList" :key="item.value" :label="item.label" :value="item.value" />
-                        </el-select>
+                      <template #rules3>
+                        <WangEditor v-model="form.rules.rules3" />
                       </template>
-                    </el-table-column>
-                    <el-table-column label="操作" align="center" width="100">
-                      <template #default="scope">
-                        <el-button type="danger" @click="delProcess(scope.row)">删除</el-button>
+                      <template #rules4>
+                        <WangEditor v-model="form.rules.rules4" />
                       </template>
-                    </el-table-column>
-                  </el-table>
-                </el-col>
-              </el-col>
-            </template>
-          </custom-form>
+                      <template #rules5>
+                        <WangEditor v-model="form.rules.rules5" />
+                      </template>
+                      <template #rules6>
+                        <WangEditor v-model="form.rules.rules6" />
+                      </template>
+                      <template #rules7>
+                        <WangEditor v-model="form.rules.rules7" />
+                      </template>
+                      <template #rules8>
+                        <WangEditor v-model="form.rules.rules8" />
+                      </template>
+                      <template #rules9>
+                        <WangEditor v-model="form.rules.rules9" />
+                      </template>
+                      <template #rules10>
+                        <WangEditor v-model="form.rules.rules10" />
+                      </template>
+                      <template #rules11>
+                        <WangEditor v-model="form.rules.rules11" />
+                      </template>
+                      <template #rules12>
+                        <WangEditor v-model="form.rules.rules12" />
+                      </template>
+                    </custom-form>
+                  </div>
+                </template>
+                <template #brief>
+                  <WangEditor v-model="form.brief" />
+                </template>
+              </custom-form>
+            </el-tab-pane>
+            <el-tab-pane label="流程信息" name="third">
+              <custom-form v-model="form" :fields="thrformFields" :rules="{}" @save="toSave" @draftSave="toDraftSave">
+                <template #process>
+                  <el-col :span="24" class="tables">
+                    <el-col :span="24" class="tables_1">
+                      <el-button type="primary" @click="addProcess()">添加</el-button>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-table :data="processList" border>
+                        <el-table-column type="index" label="序号" width="80" align="center"> </el-table-column>
+                        <el-table-column prop="name" label="流程名称" align="center">
+                          <template #default="scope">
+                            <el-input v-model="scope.row.name" placeholder="请输入流程名称" />
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="order_num" label="排序" align="center">
+                          <template #default="scope">
+                            <el-input v-model="scope.row.order_num" type="number" placeholder="请输入排序" />
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="is_use" label="是否启用" align="center">
+                          <template #default="scope">
+                            <el-select v-model="scope.row.is_use" placeholder="请选择是否启用">
+                              <el-option v-for="item in isUseList" :key="item.value" :label="item.label" :value="item.value" />
+                            </el-select>
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="操作" align="center" width="100">
+                          <template #default="scope">
+                            <el-button type="danger" @click="delProcess(scope.row)">删除</el-button>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                    </el-col>
+                  </el-col>
+                </template>
+              </custom-form>
+            </el-tab-pane>
+          </el-tabs>
         </el-col>
         <el-col :span="24" v-if="dialog.type == '2'">
           <sign :matchForm="form"></sign>
@@ -222,7 +234,8 @@ const processList = ref([])
 
 const form = ref({ time: [], rules: {} })
 const dialog = ref({ type: '1', show: false, title: '发布赛事' })
-const formFields = ref([
+const activeName = ref('first')
+const oneformFields = ref([
   { label: '封面', model: 'file', custom: true },
   { label: '赛事名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true },
@@ -234,13 +247,17 @@ const formFields = ref([
   { label: '行业', model: 'industry', type: 'select' },
   { label: '类别', model: 'form', type: 'select' },
   { label: '奖金(万元)', model: 'money' },
-  { label: '有效期', model: 'time', type: 'daterange' },
+  { label: '有效期', model: 'time', type: 'datetimerange' },
   { label: '是否启用', model: 'is_use', type: 'radio' },
-  { model: 'rules', custom: true },
-  { label: '简介', model: 'brief', custom: true },
   { label: '视频', model: 'video', custom: true },
-  { label: '赛事流程', model: 'process', custom: true }
+  { label: '地址', model: 'address', type: 'textarea' }
 ])
+const twoformFields = ref([
+  { model: 'rules', custom: true },
+  { label: '简介', model: 'brief', custom: true }
+])
+const thrformFields = ref([{ label: '赛事流程', model: 'process', custom: true }])
+
 const matchFields = ref([{ label: '赛事状态', model: 'match_status', type: 'select' }])
 const matchRules = reactive({ match_status: [{ required: true, message: '请选择赛事状态', trigger: 'blur' }] })
 const rules = reactive({
@@ -430,6 +447,7 @@ const toMatchSave = async (row) => {
 const toClose = () => {
   form.value = { time: [], rules: {} }
   dialog.value = { show: false }
+  activeName.value = 'first'
 }
 // 上传图片
 const onUpload = (e) => {

src/views/detail/matchDetail.vue

@@ -12,21 +12,21 @@
             <el-icon :size="24"><Star /></el-icon>
             <span>收藏</span>
           </div>
-          <p class="brief">{{ info.industry || '暂无' }}</p>
-          <p class="money" v-if="info.money">奖金：{{ info.money || '暂无' }}</p>
+          <p class="brief">{{ getDict(info.industry, 'industry') || '暂无行业' }}</p>
+          <p class="money" v-if="info.money">奖金：{{ info.money || '暂无奖金' }}</p>
           <div class="other" v-if="info.match_type">
             <span>活动类型：</span>
-            <span class="type">{{ getDict(info.match_type, 'type') || '暂无' }}</span>
+            <span class="type">{{ getDict(info.match_type, 'type') || '暂无活动类型' }}</span>
           </div>
           <div class="other" v-if="info.match_status">
             <span>赛事状态：</span>
             <span class="status" :class="[info.match_status == '0' ? 'status0' : info.match_status == '1' ? 'status1' : 'status2']">
-              {{ getDict(info.match_status, 'status') || '暂无' }}
+              {{ getDict(info.match_status, 'status') || '暂无赛事状态' }}
             </span>
           </div>
           <div class="time">
             <el-image class="image" :src="time" fit="fill"></el-image>
-            <span>{{ info.start_time || '暂无' }} ~ {{ info.end_time || '暂无' }}</span>
+            <span>{{ info.start_time || '暂无开始时间' }} ~ {{ info.end_time || '暂无结束时间' }}</span>
           </div>
           <div class="button" @click="toSign" v-if="info.match_status == '1'">活动报名</div>
         </div>
@@ -170,6 +170,7 @@ const info = ref({})
 const cardTypeList = ref([])
 const typeList = ref([])
 const statusList = ref([])
+const industryList = ref([])
 const ruleFormRef = ref()
 const form = ref({})
 const validatePhoneNumber = (rule, value, callback) => {
@@ -218,6 +219,9 @@ const searchOther = async () => {
   // 赛事状态
   result = await dictDataStore.query({ code: 'matchStatus', is_use: '0' })
   if ($checkRes(result)) statusList.value = result.data
+  // 行业
+  result = await dictDataStore.query({ code: 'matchIndustry', is_use: '0' })
+  if ($checkRes(result)) industryList.value = result.data
 }
 const search = async () => {
   let id = route.query.id
@@ -232,6 +236,7 @@ const getDict = (data, model) => {
     let res
     if (model == 'type') res = typeList.value.find((f) => f.value == data)
     else if (model == 'status') res = statusList.value.find((f) => f.value == data)
+    else if (model == 'industry') res = industryList.value.find((f) => f.value == data)
     return get(res, 'label')
   }
 }
@@ -331,6 +336,11 @@ provide('submitForm', submitForm)
         margin-top: 25px;
         color: #000;
       }
+      .money {
+        font-size: $global-font-size-20;
+        margin-top: 25px;
+        color: red;
+      }
       .other {
         display: flex;
         align-items: center;

src/views/detail/news.vue

@@ -164,7 +164,8 @@ const toActive = async (item) => {
 }
 // 查看
 const toView = (item) => {
-  router.push({ path: `/news/detail`, query: { id: item.id || item._id } })
+  if (item.jump_type == '1') window.open(item.route, '_blank')
+  else router.push({ path: '/news/detail', query: { id: item.id || item._id } })
 }
 // 查看更多
 const toMore = (type) => {

src/views/four/parts/index.vue

@@ -538,7 +538,10 @@ const toView = (item, type) => {
     if (type == '2') router.push({ path: '/company/detail', query: { id: item.id || item._id } })
     if (type == '4') router.push({ path: '/achievement/detail', query: { id: item.id || item._id } })
   } else ElMessage({ message: '未登录！', type: 'error' })
-  if (type == '3') router.push({ path: '/news/detail', query: { id: item.id || item._id } })
+  if (type == '3') {
+    if (item.jump_type == '1') window.open(item.route, '_blank')
+    else router.push({ path: '/news/detail', query: { id: item.id || item._id } })
+  }
 }
 // 查看更多
 const toMore = (type) => {

src/views/one/page.vue

@@ -1,10 +1,5 @@
 <template>
   <div class="page">
-    <div class="title">
-      <el-image class="image" :src="left" fit="fill" />
-      <div class="title_center">新闻资讯</div>
-      <el-image class="image" :src="right" fit="fill" />
-    </div>
     <div class="one" data-aos="fade-up" data-aos-duration="1000">
       <div class="one_left">
         <el-carousel height="680px">
@@ -21,7 +16,7 @@
           <div class="right_right" @click="toMore(0)">查看更多</div>
         </div>
         <div class="right_2">
-          <vue3-seamless-scroll :list="list" :hover="true" :step="0.5" :limit-scroll-num="6" :wheel="true" :isWatch="true">
+          <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">
@@ -42,103 +37,70 @@
                   {{ item.title || '暂无标题' }}
                 </div>
                 <div class="new_content textMore">{{ removeHtmlStyle(item.content) || '暂无内容' }}</div>
-                <div class="new_time">{{ moment(item.time).format('YYYY-MM-DD') || '暂无时间' }}</div>
               </div>
             </div>
           </vue3-seamless-scroll>
         </div>
       </div>
     </div>
-    <div class="two" data-aos="fade-up" data-aos-duration="1000">
-      <div class="title">
-        <el-image class="image" :src="left" fit="fill" />
-        <div class="title_center">数据展示</div>
-        <el-image class="image" :src="right" fit="fill" />
-      </div>
-      <div class="two_1">
-        <div class="twoList" v-for="(item, index) in recordList" :key="index" @click="toSelect(item)">
-          <div class="two_num">
-            <span>{{ item.num || 0 }}</span>
-            <span>{{ item.unit || '' }}</span>
-          </div>
-          <div class="two_title">{{ item.name || '暂无名称' }}</div>
-        </div>
-      </div>
-      <div class="two_2">
-        <div class="two_title">{{ recordInfo.name }}数据分析</div>
-        <div class="two_content">
-          <cecharts1 v-if="recordInfo.id == '1'"></cecharts1>
-          <secharts1 v-if="recordInfo.id == '2'"></secharts1>
-          <decharts1 v-if="recordInfo.id == '3'"></decharts1>
-          <pecharts1 v-if="recordInfo.id == '4'"></pecharts1>
-          <aecharts1 v-if="recordInfo.id == '5'"></aecharts1>
-        </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" />
+        <!-- <el-image class="image" :src="left" fit="fill" /> -->
         <div class="title_center">成果展示</div>
-        <el-image class="image" :src="right" fit="fill" />
-      </div>
-      <div class="more">
-        <div class="more_title" @click="toMore(2)">查看更多</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="other_1">
-              <div class="round"></div>
-              <div class="name">{{ item.name || '暂无成果名称' }}</div>
+            <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 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 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" />
+        <!-- <el-image class="image" :src="left" fit="fill" /> -->
         <div class="title_center">孵化体系</div>
-        <el-image class="image" :src="right" fit="fill" />
-      </div>
-      <div class="more">
-        <div class="more_title" @click="toMore(1)">查看更多</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" @mouseover="handleMouseOver(index)" @mouseout="handleMousOut(index)">
-          <div class="list_1" :class="[item.hover ? 'menuTrue' : '']">
-            <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="square" :class="`square` + [index]"></div>
-            <div class="content" :class="`content` + [index]">
-              <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 class="list_2" :class="[item.hover ? '' : 'menuTrue']">
-            <div class="content" :class="`content` + [index]">
-              <div class="name">{{ item.name || '暂无孵化基地名称' }}</div>
-              <div class="other_1">
-                {{ removeHtmlStyle(item.brief) || '暂无简介' }}
-              </div>
-              <div class="button">
-                <button @click="toView(item, '1')">查看详情</button>
-              </div>
+        <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(2)">查看更多</div>
+        <el-icon size="24"><ArrowRight /></el-icon>
+      </div>
       <div class="join">
         <div class="join_bg"></div>
         <div class="join_scroll">
@@ -163,23 +125,16 @@
 </template>
 
 <script setup>
-import moment from 'moment'
 import { get } from 'lodash-es'
 import { useNumberAnimation } from '@/utils/animation'
+
 // 图片引入
-import left from '/images/top-left.png'
-import right from '/images/top-right.png'
+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 cecharts1 from './parts/echarts1.vue'
-import secharts1 from './parts/echarts2.vue'
-import decharts1 from './parts/echarts3.vue'
-import pecharts1 from './parts/echarts4.vue'
-import aecharts1 from './parts/echarts5.vue'
 // 用户信息
 import { UserStore } from '@/store/user'
 const userStore = UserStore()
@@ -225,8 +180,10 @@ const getFile = (item) => {
 }
 // 查看详情
 const toView = (item, type) => {
-  if (type == '0') router.push({ path: '/news/detail', query: { id: item.id || item._id } })
-  else {
+  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 } })
@@ -257,16 +214,6 @@ const removeHtmlStyle = (html) => {
   }
   return newHtml
 }
-const handleMouseOver = (index) => {
-  incubatorList.value[index].hover = true
-}
-const handleMousOut = (index) => {
-  incubatorList.value[index].hover = false
-}
-// 选择数据分析
-const toSelect = (item) => {
-  recordInfo.value = item
-}
 // 查看合作伙伴下级
 const toFriend = (item) => {
   router.push({ path: '/friend/detail', query: { code: item.code } })
@@ -305,34 +252,38 @@ watch(
 <style scoped lang="scss">
 .page {
   .title {
-    display: flex;
-    align-items: end;
-    justify-content: center;
-    margin: 30px;
+    text-align: center;
+    margin: 30px 0 50px;
     .image {
       margin: 0 10px;
       vertical-align: middle;
       border-style: none;
     }
     .title_center {
-      font-size: $global-font-size-28;
+      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: 0 auto;
+    margin: 20px auto 0;
     height: 680px;
     display: flex;
+    justify-content: space-between;
     .one_left {
-      width: 65%;
+      width: 50%;
       .image {
         height: 100%;
         width: 100%;
       }
     }
     .one_right {
-      width: 35%;
+      width: 48%;
       padding: 0 0 0 10px;
       .right_1 {
         display: flex;
@@ -374,36 +325,35 @@ watch(
       .right_2 {
         height: 630px;
         overflow: hidden;
-        margin: 20px 0 0 0;
+        margin: 30px 0 0 0;
         .list {
           display: flex;
-          border-bottom: 1px dashed #e5e5e5;
+          border-bottom: 1px solid #979797;
+          padding: 30px 0;
           .left {
-            width: 150px;
+            width: 200px;
             margin: 0 10px 0 0;
             .image {
-              width: 150px;
-              height: 100px;
+              width: 200px;
+              height: 150px;
             }
           }
           .right {
-            width: 750px;
-            padding: 10px 0;
+            width: 700px;
             .new_title {
-              font-size: $global-font-size-18;
+              font-size: $global-font-size-24;
               font-weight: 600;
-              color: #2e343c;
+              color: #5f5f5f;
               cursor: default;
+              margin: 0 0 10px 0;
             }
             .new_title:hover {
               color: #006cff;
             }
             .new_content {
-              margin: 10px 0;
-            }
-            .new_time {
-              color: #999;
-              font-size: $global-font-size-14;
+              margin: 14px 0 0 0;
+              color: #9ea6b3;
+              font-size: $global-font-size-20;
             }
           }
         }
@@ -466,27 +416,12 @@ watch(
     }
   }
   .thr {
+    margin: 20px 0;
     background: #f1f6f9;
     background-image: url(/images/con1-bg.png);
     background-size: 100% 100%;
     padding: 10px 0 0 0;
-    .more {
-      max-width: 1700px;
-      margin: 0 auto 10px;
-      display: flex;
-      justify-content: flex-end;
-      .more_title {
-        font-size: 16px;
-        padding: 5px 10px;
-        color: #fff;
-        background-color: #006cff;
-        border-radius: 40px;
-        cursor: default;
-      }
-      .more_title:hover {
-        background-color: #475b86;
-      }
-    }
+
     .thr_1 {
       padding: 10px 0 10px;
       .w_1700 {
@@ -502,41 +437,40 @@ watch(
           padding: 20px;
           background-color: #ffffff;
           border-radius: 10px;
-          .other_1 {
-            display: flex;
-            align-items: center;
-            margin: 0 0 20px 0;
-            .round {
-              flex: 0 0 auto;
-              margin-right: 6px;
-              width: 12px;
-              height: 12px;
-              border-radius: 50%;
-              border: 2.4px solid #2374ff;
+          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;
+              }
             }
-            .name {
+            .other_2 {
+              margin: 0 0 10px 0;
               font-family: PingFangSC-Medium;
-              font-size: 20px;
+              font-size: 18px;
               font-weight: 500;
               overflow: hidden;
               text-overflow: ellipsis;
               display: -webkit-box;
               -webkit-line-clamp: 1;
               -webkit-box-orient: vertical;
-            }
-          }
-          .other_2 {
-            margin: 0 0 10px 22px;
-            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;
+              span {
+                color: #7e8288;
+              }
             }
           }
         }
@@ -545,190 +479,93 @@ watch(
         }
       }
     }
-  }
-  .four {
     .more {
+      padding: 0 0 30px 0;
       max-width: 1700px;
-      margin: 0 auto 10px;
+      margin: 0 auto;
+      text-align: center;
       display: flex;
-      justify-content: flex-end;
+      align-items: center;
+      justify-content: center;
       .more_title {
-        font-size: 16px;
-        padding: 5px 10px;
-        color: #fff;
-        background-color: #006cff;
-        border-radius: 40px;
+        font-size: 24px;
         cursor: default;
       }
-      .more_title:hover {
-        background-color: #475b86;
-      }
     }
+  }
+  .four {
     .four_1 {
       max-width: 1700px;
       margin: 0 auto 10px;
       display: flex;
-      justify-content: space-between;
       .list {
-        cursor: pointer;
-        width: 420px;
-        height: 500px;
-        position: relative;
-        transition: all 0.5s ease-in-out;
-        transform-style: preserve-3d;
-        .list_1 {
-          width: 420px;
-          height: 500px;
-          .image {
-            width: 420px;
-            height: 250px;
-          }
-          .square {
-            position: relative;
-            width: 0;
-            height: 0;
-            border-right: 238px solid transparent;
-            margin-top: -43px;
-            z-index: 1;
-          }
-          .square0 {
-            border-bottom: 40px solid #00a9bb;
-          }
-          .square1 {
-            border-bottom: 40px solid rgb(28, 102, 231);
-          }
-          .square2 {
-            border-bottom: 40px solid rgb(104, 45, 255);
-          }
-          .square3 {
-            border-bottom: 40px solid rgb(28, 102, 231);
+        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;
           }
-          .content {
-            padding: 12px 20px;
-            height: 250px;
-            .name {
-              height: 28px;
-              line-height: 28px;
-              font-family: PingFangSC-Medium;
-              font-size: 22px;
-              color: #fff;
-              font-weight: 500;
-              margin-bottom: 12px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-line-clamp: 1;
-              -webkit-box-orient: vertical;
-            }
-            .other_1 {
-              color: #fff;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-line-clamp: 3;
-              -webkit-box-orient: vertical;
-              font-size: 16px;
-              line-height: 21px;
+          .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;
-              margin-bottom: 10px;
-            }
-            .button {
-              text-align: center;
-              button {
-                width: 165px;
-                height: 40px;
-                border: 1px solid #fff;
-                line-height: 36px;
-                text-align: center;
-                color: #fff;
-                font-size: 16px;
-                background: inherit;
-                margin: 65px auto 0px;
-                display: block;
-              }
             }
           }
-          .content0 {
-            background-image: linear-gradient(180deg, rgba(0, 181, 182, 0), #00a9bb 0, #0098d2);
-          }
-          .content1 {
-            background-image: linear-gradient(rgba(28, 102, 231, 0) 0%, rgb(28, 102, 231) 0%, rgb(76, 81, 236) 100%);
-          }
-          .content2 {
-            background-image: linear-gradient(179deg, rgba(127, 76, 255, 0) 0%, rgb(104, 45, 255) 0%, rgb(117, 45, 255) 100%);
-          }
-          .content3 {
-            background-image: linear-gradient(rgba(28, 102, 231, 0) 0%, rgb(28, 102, 231) 0%, rgb(76, 81, 236) 100%);
-          }
-        }
-        .list_2 {
-          width: 420px;
-          height: 500px;
-          .content {
-            padding: 12px 20px;
-            height: 500px;
-            .name {
-              height: 28px;
-              line-height: 28px;
-              font-family: PingFangSC-Medium;
-              font-size: 24px;
-              color: #fff;
-              font-weight: 500;
-              margin-bottom: 12px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-line-clamp: 1;
-              -webkit-box-orient: vertical;
-            }
-            .other_1 {
-              height: 360px;
-              color: #fff;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-line-clamp: 9;
-              -webkit-box-orient: vertical;
-              font-size: 14px;
-              line-height: 21px;
-              font-weight: 400;
-              margin-bottom: 38px;
-            }
-            .button {
+          .button {
+            text-align: center;
+            button {
+              width: 200px;
+              height: 40px;
+              line-height: 36px;
               text-align: center;
-              button {
-                width: 165px;
-                height: 40px;
-                border: 1px solid #fff;
-                line-height: 36px;
-                text-align: center;
-                color: #fff;
-                font-size: 16px;
-                background: inherit;
-                margin: 30px auto 0px;
-                display: block;
-              }
+              color: #fff;
+              font-size: 16px;
+              background: linear-gradient(to bottom, #009fff, #0077ff);
+              margin: 40px auto 0px;
+              display: block;
+              border-radius: 30px;
+              border: none;
             }
           }
-          .content0 {
-            background-image: linear-gradient(180deg, rgba(0, 181, 182, 0), #00a9bb 0, #0098d2);
-          }
-          .content1 {
-            background-image: linear-gradient(rgba(28, 102, 231, 0) 0%, rgb(28, 102, 231) 0%, rgb(76, 81, 236) 100%);
-          }
-          .content2 {
-            background-image: linear-gradient(179deg, rgba(127, 76, 255, 0) 0%, rgb(104, 45, 255) 0%, rgb(117, 45, 255) 100%);
-          }
-          .content3 {
-            background-image: linear-gradient(rgba(28, 102, 231, 0) 0%, rgb(28, 102, 231) 0%, rgb(76, 81, 236) 100%);
-          }
-        }
-        .menuTrue {
-          display: none;
-          transition: all 0.5s ease-in-out;
-          transform-style: preserve-3d;
         }
       }
+      .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;

src/views/two/add/match.vue

@@ -2,116 +2,128 @@
   <div class="index">
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
-        <custom-form v-model="form" :fields="formFields" :rules="rules" @save="toSave" @draftSave="toDraftSave">
-          <template #video>
-            <custom-upload model="video" :list="form.video" :limit="1" url="/files/web/cxyy_match/upload" @change="onUpload"></custom-upload>
-          </template>
-          <template #file>
-            <custom-upload model="file" :list="form.file" :limit="1" listType="picture-card" url="/files/web/cxyy_match/upload" @change="onUpload"></custom-upload>
-          </template>
-          <template #is_use>
-            <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
-          </template>
-          <template #industry>
-            <el-option v-for="i in industryList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-          </template>
-          <template #scale>
-            <el-radio v-for="i in scaleList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
-          </template>
-          <template #match_type>
-            <el-radio v-for="i in matchTypeList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
-          </template>
-          <template #type>
-            <el-option v-for="i in typeList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-          </template>
-          <template #form>
-            <el-option v-for="i in formList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-          </template>
-          <template #tags>
-            <el-select v-model="form.tags" multiple filterable allow-create default-first-option :reserve-keyword="false" placeholder="请选择标签" style="width: 100%">
-              <el-option v-for="item in tagsList" :key="item.id" :label="item.title" :value="item.title" />
-            </el-select>
-          </template>
-          <template #rules>
-            <div class="rules">
-              <custom-form v-model="form.rules" :fields="rulesFields" :useSave="false">
-                <template #rules1>
-                  <WangEditor v-model="form.rules.rules1" />
-                </template>
-                <template #rules2>
-                  <WangEditor v-model="form.rules.rules2" />
-                </template>
-                <template #rules3>
-                  <WangEditor v-model="form.rules.rules3" />
-                </template>
-                <template #rules4>
-                  <WangEditor v-model="form.rules.rules4" />
-                </template>
-                <template #rules5>
-                  <WangEditor v-model="form.rules.rules5" />
-                </template>
-                <template #rules6>
-                  <WangEditor v-model="form.rules.rules6" />
-                </template>
-                <template #rules7>
-                  <WangEditor v-model="form.rules.rules7" />
-                </template>
-                <template #rules8>
-                  <WangEditor v-model="form.rules.rules8" />
-                </template>
-                <template #rules9>
-                  <WangEditor v-model="form.rules.rules9" />
-                </template>
-                <template #rules10>
-                  <WangEditor v-model="form.rules.rules10" />
-                </template>
-                <template #rules11>
-                  <WangEditor v-model="form.rules.rules11" />
-                </template>
-                <template #rules12>
-                  <WangEditor v-model="form.rules.rules12" />
-                </template>
-              </custom-form>
-            </div>
-          </template>
-          <template #brief>
-            <WangEditor v-model="form.brief" />
-          </template>
-          <template #process>
-            <el-col :span="24" class="tables">
-              <el-col :span="24" class="tables_1">
-                <el-button type="primary" @click="addProcess()">添加</el-button>
-              </el-col>
-              <el-col :span="24">
-                <el-table :data="processList" border>
-                  <el-table-column type="index" label="序号" width="80" align="center"> </el-table-column>
-                  <el-table-column prop="name" label="流程名称" align="center">
-                    <template #default="scope">
-                      <el-input v-model="scope.row.name" placeholder="请输入流程名称" />
+        <el-tabs v-model="activeName" type="card">
+          <el-tab-pane label="基本信息" name="first">
+            <custom-form v-model="form" :fields="oneformFields" :rules="rules" @save="toSave" @draftSave="toDraftSave">
+              <template #video>
+                <custom-upload model="video" :list="form.video" :limit="1" url="/files/web/cxyy_match/upload" @change="onUpload"></custom-upload>
+              </template>
+              <template #file>
+                <custom-upload model="file" :list="form.file" :limit="1" listType="picture-card" url="/files/web/cxyy_match/upload" @change="onUpload"></custom-upload>
+              </template>
+              <template #is_use>
+                <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
+              </template>
+              <template #industry>
+                <el-option v-for="i in industryList" :key="i.id" :label="i.label" :value="i.value"></el-option>
+              </template>
+              <template #scale>
+                <el-radio v-for="i in scaleList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
+              </template>
+              <template #match_type>
+                <el-radio v-for="i in matchTypeList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
+              </template>
+              <template #type>
+                <el-option v-for="i in typeList" :key="i.id" :label="i.label" :value="i.value"></el-option>
+              </template>
+              <template #form>
+                <el-option v-for="i in formList" :key="i.id" :label="i.label" :value="i.value"></el-option>
+              </template>
+              <template #tags>
+                <el-select v-model="form.tags" multiple filterable allow-create default-first-option :reserve-keyword="false" placeholder="请选择标签" style="width: 100%">
+                  <el-option v-for="item in tagsList" :key="item.id" :label="item.title" :value="item.title" />
+                </el-select>
+              </template>
+            </custom-form>
+          </el-tab-pane>
+          <el-tab-pane label="拓展信息" name="second">
+            <custom-form v-model="form" :fields="twoformFields" :rules="{}" @save="toSave" @draftSave="toDraftSave">
+              <template #rules>
+                <div class="rules">
+                  <custom-form v-model="form.rules" :fields="rulesFields" :useSave="false">
+                    <template #rules1>
+                      <WangEditor v-model="form.rules.rules1" />
                     </template>
-                  </el-table-column>
-                  <el-table-column prop="order_num" label="排序" align="center">
-                    <template #default="scope">
-                      <el-input v-model="scope.row.order_num" type="number" placeholder="请输入排序" />
+                    <template #rules2>
+                      <WangEditor v-model="form.rules.rules2" />
                     </template>
-                  </el-table-column>
-                  <el-table-column prop="is_use" label="是否启用" align="center">
-                    <template #default="scope">
-                      <el-select v-model="scope.row.is_use" placeholder="请选择是否启用">
-                        <el-option v-for="item in isUseList" :key="item.value" :label="item.label" :value="item.value" />
-                      </el-select>
+                    <template #rules3>
+                      <WangEditor v-model="form.rules.rules3" />
                     </template>
-                  </el-table-column>
-                  <el-table-column label="操作" align="center" width="100">
-                    <template #default="scope">
-                      <el-button type="danger" @click="delProcess(scope.row)">删除</el-button>
+                    <template #rules4>
+                      <WangEditor v-model="form.rules.rules4" />
                     </template>
-                  </el-table-column>
-                </el-table>
-              </el-col>
-            </el-col>
-          </template>
-        </custom-form>
+                    <template #rules5>
+                      <WangEditor v-model="form.rules.rules5" />
+                    </template>
+                    <template #rules6>
+                      <WangEditor v-model="form.rules.rules6" />
+                    </template>
+                    <template #rules7>
+                      <WangEditor v-model="form.rules.rules7" />
+                    </template>
+                    <template #rules8>
+                      <WangEditor v-model="form.rules.rules8" />
+                    </template>
+                    <template #rules9>
+                      <WangEditor v-model="form.rules.rules9" />
+                    </template>
+                    <template #rules10>
+                      <WangEditor v-model="form.rules.rules10" />
+                    </template>
+                    <template #rules11>
+                      <WangEditor v-model="form.rules.rules11" />
+                    </template>
+                    <template #rules12>
+                      <WangEditor v-model="form.rules.rules12" />
+                    </template>
+                  </custom-form>
+                </div>
+              </template>
+              <template #brief>
+                <WangEditor v-model="form.brief" />
+              </template>
+            </custom-form>
+          </el-tab-pane>
+          <el-tab-pane label="流程信息" name="third">
+            <custom-form v-model="form" :fields="thrformFields" :rules="{}" @save="toSave" @draftSave="toDraftSave">
+              <template #process>
+                <el-col :span="24" class="tables">
+                  <el-col :span="24" class="tables_1">
+                    <el-button type="primary" @click="addProcess()">添加</el-button>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-table :data="processList" border>
+                      <el-table-column type="index" label="序号" width="80" align="center"> </el-table-column>
+                      <el-table-column prop="name" label="流程名称" align="center">
+                        <template #default="scope">
+                          <el-input v-model="scope.row.name" placeholder="请输入流程名称" />
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="order_num" label="排序" align="center">
+                        <template #default="scope">
+                          <el-input v-model="scope.row.order_num" type="number" placeholder="请输入排序" />
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="is_use" label="是否启用" align="center">
+                        <template #default="scope">
+                          <el-select v-model="scope.row.is_use" placeholder="请选择是否启用">
+                            <el-option v-for="item in isUseList" :key="item.value" :label="item.label" :value="item.value" />
+                          </el-select>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="操作" align="center" width="100">
+                        <template #default="scope">
+                          <el-button type="danger" @click="delProcess(scope.row)">删除</el-button>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </el-col>
+                </el-col>
+              </template>
+            </custom-form>
+          </el-tab-pane>
+        </el-tabs>
       </el-col>
     </el-row>
   </div>
@@ -149,9 +161,9 @@ const matchTypeList = ref([])
 const scaleList = ref([])
 // 流程列表
 const processList = ref([])
-
+const activeName = ref('first')
 const form = ref({ time: [], rules: {} })
-const formFields = ref([
+const oneformFields = ref([
   { label: '封面', model: 'file', custom: true },
   { label: '赛事名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true },
@@ -165,11 +177,14 @@ const formFields = ref([
   { label: '奖金(万元)', model: 'money' },
   { label: '有效期', model: 'time', type: 'datetimerange' },
   { label: '是否启用', model: 'is_use', type: 'radio' },
-  { model: 'rules', custom: true },
-  { label: '简介', model: 'brief', custom: true },
   { label: '视频', model: 'video', custom: true },
-  { label: '赛事流程', model: 'process', custom: true }
+  { label: '地址', model: 'address', type: 'textarea' }
+])
+const twoformFields = ref([
+  { model: 'rules', custom: true },
+  { label: '简介', model: 'brief', custom: true }
 ])
+const thrformFields = ref([{ label: '赛事流程', model: 'process', custom: true }])
 // 赛事规则
 const rulesFields = ref([
   { label: '大赛背景', model: 'rules1', custom: true },