1

src/views/hall/direct.vue

@@ -54,11 +54,11 @@
                     <p class="textOver">{{ dockInfo.title }}</p>
                   </el-col>
                 </el-col>
-                <el-col :span="24" :class="[dockInfo.room_id == '1006' ? 'leftvideos' : 'leftvideo']">
-                  <span v-if="dockInfo.room_id == '1006'">
+                <el-col :span="24" class="leftvideos">
+                  <span>
                     <video id="videoElement" controls autoplay class="h5video"></video>
                   </span>
-                  <span v-else>
+                  <!-- <span v-else>
                     <el-col :span="24" class="videoTop">
                       <video :src="videoPath" autoplay="autoplay" controls="controls" v-if="videoData != ''" loop="loop">
                         您的浏览器不支持 video 标签。
@@ -74,7 +74,7 @@
                         </template>
                       </swiper>
                     </el-col>
-                  </span>
+                  </span> -->
                 </el-col>
               </el-col>
               <!-- 视频右侧 -->
@@ -104,7 +104,7 @@
                     <el-col :span="24" class="demandList">
                       <el-col :span="24" class="topList">
                         <el-col :span="4" class="list" v-for="(item, index) in demandList" :key="index" @click.native="oneBtnDetail(item)">
-                          <el-image :src="achievezb"></el-image>
+                          <!-- <el-image :src="achievezb"></el-image>
                           <el-col :span="24" class="company textOver">
                             {{ item.company }}
                           </el-col>
@@ -115,6 +115,14 @@
                           <el-col :span="24" class="cont">
                             <el-col :span="24" class="a-field">领域：{{ item.field }}</el-col>
                             <el-col :span="24" class="a-contacts">联系人：{{ item.contacts }}</el-col>
+                          </el-col> -->
+                          <el-col :span="24" class="text">
+                            <p class="name textOver">{{ item.name }}</p>
+                            <p class="brief">{{ item.achievebrief }}</p>
+                            <p class="other">
+                              <span class="textOver">领域：{{ item.field }}</span>
+                              <span class="textOver">联系人：{{ item.contacts }}</span>
+                            </p>
                           </el-col>
                           <el-col :span="24" class="clickBtn">
                             <el-button size="mini" type="primary" @click="oneBtnDetail(item)">详情</el-button>
@@ -192,26 +200,32 @@
                 </el-tab-pane>
                 <el-tab-pane label="专家智库">
                   <el-col :span="24" class="two">
-                    <el-col :span="12" class="twoList" v-for="(item, index) in expertList" :key="index">
-                      <el-col :span="4" class="image">
-                        <el-image :src="item.expertimage" style="width:70px;height: 70px;border: 1px solid #f1f1f1;" v-if="item.expertimage != ''"></el-image>
-                        <el-image :src="expertimage" style="width:70px;height: 70px;border: 1px solid #f1f1f1;" v-else></el-image>
-                      </el-col>
-                      <el-col :span="20" class="info">
-                        <el-col :span="16" class="name textOver">
-                          {{ item.name }}
+                    <el-col :span="24" style="height: 418px;overflow: hidden;">
+                      <el-col :span="12" class="twoList" v-for="(item, index) in expertList" :key="index">
+                        <el-col :span="4" class="image">
+                          <el-image
+                            v-if="item.expertimage != null || undefined"
+                            :src="item.expertimage"
+                            style="width:70px;height: 70px;border: 1px solid #f1f1f1;"
+                          ></el-image>
+                          <el-image :src="expertimage" style="width:70px;height: 70px;border: 1px solid #f1f1f1;" v-else></el-image>
                         </el-col>
-                        <el-col :span="8">
-                          <el-button size="mini" type="primary" @click="twoBtnDetail(item)" style="margin:0 5px 0 5px">详情</el-button>
-                          <el-button
-                            size="mini"
-                            type="success"
-                            @click="$router.push({ path: '/live/hall/dock/zhanjiaduijie', query: { id: item._id, dockid: dock_id, user_id: user_id } })"
-                            >对接</el-button
-                          >
+                        <el-col :span="20" class="info">
+                          <el-col :span="16" class="name textOver">
+                            {{ item.name }}
+                          </el-col>
+                          <el-col :span="8">
+                            <el-button size="mini" type="primary" @click="twoBtnDetail(item)" style="margin:0 5px 0 5px">详情</el-button>
+                            <el-button
+                              size="mini"
+                              type="success"
+                              @click="$router.push({ path: '/live/hall/dock/zhanjiaduijie', query: { id: item._id, dockid: dock_id, user_id: user_id } })"
+                              >对接</el-button
+                            >
+                          </el-col>
+                          <el-col :span="24" class="txt textOver"> {{ item.zwzc || '暂无' }} </el-col>
+                          <el-col :span="24" class="txt textOver"> {{ item.company || '暂无' }} </el-col>
                         </el-col>
-                        <el-col :span="24" class="txt textOver"> {{ item.zwzc || '暂无' }} </el-col>
-                        <el-col :span="24" class="txt textOver"> {{ item.company || '暂无' }} </el-col>
                       </el-col>
                     </el-col>
                     <el-col :span="24" class="onmore">
@@ -360,7 +374,6 @@ export default {
     expeDetail, //专家详情
     trainList, //交易列表
     imagetxtList, //图文直播
-    swiper,
   },
   data: () => ({
     // 对接会详情
@@ -393,7 +406,7 @@ export default {
     dialogExport: false,
     exportInfo: {},
     displayBtn: false,
-    achievezb: require('@/assets/3.png'),
+    achievezb: require('@/assets/技术成果1.png'),
     expertimage: require('@/assets/live/222.png'),
     //  使用手册图片
     two: require('@/assets/live/top_bg.png'),
@@ -468,11 +481,21 @@ export default {
       var chanpinData = czxmNew.filter(item => item.type === '1');
       if (chanpinData) this.$set(this, `demandList`, chanpinData);
       // 专家
-      let exportdata = await this.expertQuery({ role: 6, limit: 8 });
+      let exportdata = await this.expertQuery({ role: 6, limit: 200 });
       if (this.$checkRes(exportdata)) {
-        this.$set(this, `expertList`, exportdata.data);
-        // 特邀嘉宾
-        this.$set(this.statNum, `tyjb`, exportdata.total);
+        console.log(exportdata.data);
+        let newRes = exportdata.data.filter(
+          i =>
+            i.company == '中科院长春分院' ||
+            i.company == '中国科学院东北地理与农业生态研究所' ||
+            i.company == '中国科学院长春应用化学研究所' ||
+            i.company == '中科院长春光学精密机械与物理研究所'
+        );
+        if (newRes) {
+          this.$set(this, `expertList`, newRes);
+          // 特邀嘉宾
+          this.$set(this.statNum, `tyjb`, newRes.length);
+        }
       }
       // 正在洽谈
       let qthe = await this.tquery({ status: 0, dockid: this.id });
@@ -924,66 +947,44 @@ export default {
           position: relative;
           margin: 5px 10px 0px 9px;
           width: 15%;
-          .el-image {
+          .text {
             width: 100%;
+            background: url('~@/assets/技术成果1.png');
             height: 205px;
-            overflow: hidden;
-            // border-radius: 5px;
-            // transition: all 0.4s linear;
-            position: relative;
-          }
-          .company {
-            position: absolute;
-            top: 3px;
-            left: 20px;
-            width: 86%;
-            color: #ec6c2d;
-            -webkit-text-stroke: 1px #f18d2c;
-            font-style: oblique;
-            -webkit-text-fill-color: #ec6c2d;
-            letter-spacing: 3px;
-          }
-          .aName {
-            position: absolute;
-            top: 30px;
-            left: 0px;
-            text-align: center;
-            transform: scale(0.8);
-            font-weight: bolder;
-            -webkit-text-stroke: 1px #f18d2c;
-            font-style: oblique;
-            -webkit-text-fill-color: transparent;
-            letter-spacing: 3px;
-          }
-          .a-brief {
-            margin: 10px 0px;
-            position: absolute;
-            top: 30px;
-            left: 0px;
-            overflow: hidden;
-            line-height: 20px;
-            letter-spacing: 2px;
-            text-overflow: ellipsis;
-            -webkit-line-clamp: 5;
-            word-break: break-all;
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            transform: scale(0.8);
-          }
-          .cont {
-            position: absolute;
-            left: 0px;
-            bottom: 50px;
-            transform: scale(0.8);
-            .a-field {
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            padding: 20px 19px;
+            .name {
+              font-size: 16px;
+              font-weight: bold;
+              margin: 0 0 5px 0;
+            }
+            .brief {
+              font-size: 12px;
               overflow: hidden;
               text-overflow: ellipsis;
-              white-space: nowrap;
+              -webkit-line-clamp: 5;
+              word-break: break-all;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              padding: 0 5px;
+            }
+            .other {
+              padding: 5px 0 0 0;
+              position: absolute;
+              bottom: 51px;
+              width: 83%;
+              span {
+                padding: 3px 0 0 0;
+                float: left;
+                width: 100%;
+                font-size: 12px;
+              }
             }
           }
           .clickBtn {
             position: relative;
-            top: -38px;
+            top: -30px;
             text-align: center;
             /deep/.el-button {
               padding: 5px 10px;