1

src/util/adveronet.js

@@ -0,0 +1,14 @@
+export const adveronetList = [
+  {
+    url: require('@a/advert1.png'),
+  },
+  {
+    url: require('@a/advert2.png'),
+  },
+  {
+    url: require('@a/advert3.png'),
+  },
+  {
+    url: require('@a/advert4.png'),
+  },
+];

src/views/halltwo/directTwo.vue

@@ -129,7 +129,7 @@
                     <el-tab-pane label="电子信息技术" name="second">
                       <achieve :list="achievetwoList" @xmdjBtn="xmdjBtn"></achieve>
                     </el-tab-pane>
-                    <el-tab-pane label="生物与新医学技术" name="third">
+                    <el-tab-pane label="生物与新医药技术" name="third">
                       <achieve :list="achievethreeList" @xmdjBtn="xmdjBtn"></achieve>
                     </el-tab-pane>
                     <el-tab-pane label="航空航天技术" name="fourth">
@@ -274,6 +274,7 @@ import dockchat from './parts/dockchat.vue';
 // 学校列表
 
 import { schoolList } from '@/util/school.js';
+import { adveronetList } from '@/util/adveronet.js';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
@@ -316,14 +317,7 @@ export default {
       // 达成1
       trainfourList: [],
       // 广告位
-      adveronetlist: [
-        {
-          url: require('@a/advert1.png'),
-        },
-        {
-          url: require('@a/advert2.png'),
-        },
-      ],
+      adveronetlist: adveronetList,
       // 技术成果项目
       achieveName: 'first',
       // 全部
@@ -393,8 +387,8 @@ export default {
             // 电子信息技术
             let achievetwoList = achieve.filter(i => i.field == '电子信息技术');
             this.$set(this, `achievetwoList`, achievetwoList);
-            // 生物与新医学技术
-            let achievethreeList = achieve.filter(i => i.field == '生物与新医学技术');
+            // 生物与新医药技术
+            let achievethreeList = achieve.filter(i => i.field == '生物与新医药技术');
             this.$set(this, `achievethreeList`, achievethreeList);
             // 航空航天技术
             let achievefourList = achieve.filter(i => i.field == '航空航天技术');

src/views/halltwo/liveCenter.vue

@@ -37,7 +37,15 @@
                 </p>
               </el-col>
               <el-col :span="24" class="three">
-                滚动
+                <marquee beavior="scroll" direction="up" onMouseOut="this.start()" onMouseOver="this.stop()">
+                  <p class="threeList" v-for="(item, index) in trainoneList" :key="index">
+                    <span class="textOver"><i class="el-icon-aim" style="color:#fff"></i> {{ getDate(item.meta.createdAt) }}</span>
+                    <span class="textOver">{{ item.market_username }}</span>
+                    <span class="textOver">与</span>
+                    <span class="textOver">{{ item.username }}</span>
+                    <span class="textOver"> {{ item.status == '0' ? '产生意向' : item.status == '1' ? '达成意向' : '实现对接' }}</span>
+                  </p>
+                </marquee>
               </el-col>
             </el-col>
             <el-col :span="24" class="down">
@@ -46,7 +54,7 @@
                   展会动态
                 </el-col>
                 <el-col :span="20" class="right">
-                  <marquee beavior="scroll">
+                  <marquee beavior="scroll" onMouseOut="this.start()" onMouseOver="this.stop()">
                     <span class="trainoneList" v-for="(item, index) in trainoneList" :key="index">
                       {{ item.market_username }}与{{ item.username }} {{ item.status == '0' ? '产生意向' : item.status == '1' ? '达成意向' : '实现对接' }}</span
                     >
@@ -109,7 +117,7 @@ export default {
         // 查询数目
         let statNum = {};
         // 当前时间
-        statNum.date = moment().format('yyyy-DD-mm');
+        statNum.date = moment().format('YYYY-MM-DD');
         // 总人数
         statNum.zrs = res.data.apply.length;
 
@@ -136,6 +144,10 @@ export default {
         this.$set(this, `statNum`, statNum);
       }
     },
+    getDate(value) {
+      let data = moment().format('HH:mm:ss');
+      if (data) return data;
+    },
   },
   computed: {
     ...mapState(['user']),
@@ -200,6 +212,7 @@ export default {
           background-color: #fdb21e;
           text-align: center;
           line-height: 58px;
+          font-size: 16px;
           span {
             color: blue;
           }
@@ -216,7 +229,31 @@ export default {
       }
       .three {
         height: 500px;
+        overflow: hidden;
         padding: 0 10px;
+        .threeList {
+          border-bottom: 1px dashed #ccc;
+          padding: 10px 0;
+          color: #fff;
+          font-size: 18px;
+          span:nth-child(1) {
+            color: #fde24e;
+            width: 12%;
+            display: inline-block;
+          }
+          span:nth-child(2n) {
+            display: inline-block;
+            width: 36%;
+          }
+          span:nth-child(3) {
+            display: inline-block;
+            width: 5%;
+          }
+          span:nth-child(5) {
+            width: 8%;
+            display: inline-block;
+          }
+        }
       }
     }
     .down {
@@ -246,6 +283,10 @@ export default {
             font-size: 16px;
             padding: 0 10px;
           }
+          .trainoneList:hover {
+            cursor: pointer;
+            color: #fdb21e;
+          }
         }
       }
       .two {