guhongwei 4 years ago
parent
commit
a69b1c68c7

BIN
src/assets/emotion/flower2.gif


BIN
src/assets/expert1.png


BIN
src/assets/技术成果2.png


BIN
src/assets/技术成果4.png


BIN
src/assets/技术成果6.png


BIN
src/assets/技术成果7.png


+ 0 - 1
src/views/hall/direct.vue

@@ -442,7 +442,6 @@ export default {
     trainList,
   },
   data: () => ({
-    hand: require('@/assets/emotion/flower2.gif'),
     achievezb: require('@/assets/3.png'),
     touxiang: require('@/assets/emotion/touxiang.png'),
     videodisplay: 'list',

+ 24 - 76
src/views/market/detail/achiDetail.vue

@@ -11,18 +11,12 @@
             </el-carousel>
           </el-col>
           <el-col :span="7" v-else class="achieveImage">
-            <el-image :src="detailInfo.company == '中科院长春分院' ? ccfy : achievezb" style="height:345px;"></el-image>
-            <el-col :span="24" class="company textOver">
-              {{ detailInfo.company }}
-            </el-col>
-            <el-col :span="24" class="aName textOver">
-              {{ detailInfo.name }}
-            </el-col>
-            <el-col :span="24" class="a-brief">{{ detailInfo.achievebrief }}</el-col>
-            <el-col :span="24" class="cont">
-              <el-col :span="24" class="a-field">领域:{{ detailInfo.field }}</el-col>
-              <el-col :span="24" class="a-contacts">联系人:{{ detailInfo.contacts }}</el-col>
-            </el-col>
+            <p class="name textOver">{{ detailInfo.name }}</p>
+            <p class="brief">{{ detailInfo.achievebrief }}</p>
+            <p class="other">
+              <span class="textOver">领域:{{ detailInfo.field }}</span>
+              <span class="textOver">联系人:{{ detailInfo.contacts }}</span>
+            </p>
           </el-col>
           <el-col :span="17" class="right">
             <el-col :span="24" class="name textOver">
@@ -122,14 +116,6 @@
                 <el-button type="primary" size="mini" @click="dialogTableVisible1 = true">专利信息</el-button>
               </el-col>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-col :span="8" class="otherInfo textOver">
-                专利状态
-              </el-col>
-              <el-col :span="16" class="otherInfo textOver">
-                {{ detailInfo.patentstatus || '暂无' }}
-              </el-col>
-            </el-col> -->
           </el-col>
         </el-col>
         <el-col :span="24" class="down">
@@ -211,8 +197,6 @@ export default {
       room: {},
       dialogTableVisible1: false,
       gridData: [],
-      achievezb: require('@/assets/3.png'),
-      ccfy: require('@/assets/ccfy1.png'),
     };
   },
   created() {},
@@ -289,73 +273,37 @@ export default {
         border: 1px solid #ccc;
       }
     }
-    // .img1 {
-    //   width: 100%;
-    //   height: 345px;
-    //   overflow: hidden;
-    // }
     .achieveImage {
       position: relative;
-      .el-image {
-        width: 100%;
-        height: 345px;
-        overflow: hidden;
-        // border-radius: 5px;
-        // transition: all 0.4s linear;
-        position: relative;
-      }
-      .aName {
-        position: absolute;
-        top: 40px;
-        left: 0px;
-        text-align: center;
-        transform: scale(0.8);
-        font-weight: bolder;
-        // color: transparent;
-        // 文字边框宽度和颜色
-        -webkit-text-stroke: 1px #f18d2c;
-        font-style: oblique;
-        // 文字填充色
-        -webkit-text-fill-color: transparent;
-        letter-spacing: 3px;
+      height: 348px;
+      background: url('~@/assets/技术成果1.png');
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+      padding: 28px 25px;
+      .name {
+        font-size: 16px;
+        font-weight: bold;
+        margin: 10px 0;
       }
       .a-brief {
-        margin: 10px 0px;
-        position: absolute;
-        top: 55px;
-        left: 0px;
+        font-size: 14px;
         overflow: hidden;
-        line-height: 20px;
-        letter-spacing: 2px;
         text-overflow: ellipsis;
-        -webkit-line-clamp: 12;
+        -webkit-line-clamp: 11;
         word-break: break-all;
         display: -webkit-box;
         -webkit-box-orient: vertical;
-        transform: scale(0.8);
       }
-      .cont {
+      .other {
         position: absolute;
-        left: 0px;
-        bottom: 20px;
-        transform: scale(0.8);
-        .a-field {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
+        bottom: 10px;
+        width: 82%;
+        font-size: 14px;
+        span {
+          display: inline-block;
+          width: 100%;
         }
       }
-      .company {
-        position: absolute;
-        top: 15px;
-        left: 30px;
-        width: 86%;
-        color: #ec6c2d;
-        -webkit-text-stroke: 1px #f18d2c;
-        font-style: oblique;
-        -webkit-text-fill-color: #ec6c2d;
-        letter-spacing: 3px;
-      }
     }
   }
   .down {

+ 12 - 17
src/views/market/index.vue

@@ -24,21 +24,14 @@
                   :key="index"
                   @click.native="$router.push({ path: '/market/marketlists', query: { type: '1', column_name: '技术成果', id: item._id } })"
                 >
-                  <span v-if="item.image && item.image.length > 0">
-                    <el-col :span="24" class="image">
-                      <el-image :src="item.image[0].url"></el-image>
-                    </el-col>
-                  </span>
-                  <span v-else>
-                    <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>
-                  </span>
+                  <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>
               </el-col>
             </el-col>
@@ -572,8 +565,6 @@ export default {
     return {
       gongqiuImage: require('@/assets/live/main2.png'),
       iconImage: require('@/assets/live/square_big.png'),
-      achievezb: require('@/assets/技术成果2.png'),
-      ccfy: require('@/assets/ccfy1.png'),
       expertimage: require('@/assets/live/222.png'),
       // 成果
       achieveList: [
@@ -965,6 +956,7 @@ export default {
       height: 450px;
       position: relative;
       .achieveList {
+        position: relative;
         overflow: hidden;
         height: 220px;
         margin: 0 10px 10px 0;
@@ -1005,6 +997,9 @@ export default {
           }
           .other {
             padding: 5px 0 0 0;
+            position: absolute;
+            bottom: 10px;
+            width: 83%;
             span {
               padding: 3px 0 0 0;
               float: left;