guhongwei 4 years ago
parent
commit
6f705f3ebd

+ 2 - 2
src/views/hall/direct.vue

@@ -44,7 +44,7 @@
             <el-col :span="24" class="livevideo">
               <el-col :span="12" class="left">
                 <el-col :span="24" class="lefttop">
-                  <span style="color: rgb(255, 132, 0);">现场</span>
+                  <span style="color: rgb(255, 132, 0);">视频</span>
                   <span>直播</span>
                 </el-col>
                 <el-col :span="24" class="leftvideo">
@@ -58,7 +58,7 @@
               </el-col>
               <el-col :span="12" class="right">
                 <el-tabs v-model="videoList" type="card">
-                  <el-tab-pane label="直播实况" name="first">
+                  <el-tab-pane label="图文直播" name="first">
                     <el-col :span="24" class="rightFirst">
                       <el-col :span="24" class="list" :style="{ height: `${this.user.role == 3 ? '390px' : '415px'}` }" id="chat">
                         <el-col :span="24" class="lunboList" v-for="(item, index) in lunboList" :key="index">

+ 1 - 1
src/views/market/detail/achiDetail.vue

@@ -11,7 +11,7 @@
             </el-carousel>
           </el-col>
           <el-col :span="7" v-else class="achieveImage">
-            <el-image :src="achievezb"></el-image>
+            <el-image :src="achievezb" style="height:345px;"></el-image>
             <el-col :span="24" class="aName">
               {{ detailInfo.name }}
             </el-col>

+ 65 - 1
src/views/market/detail/techDetail.vue

@@ -3,13 +3,24 @@
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="top">
-          <el-col :span="7" class="left">
+          <el-col :span="7" class="left" v-if="detailInfo.image != ''">
             <el-carousel trigger="click" height="305px" :autoplay="false">
               <el-carousel-item v-for="(item, index) in detailInfo.image" :key="index">
                 <el-image :src="item.url" style="width:99%;height:345px;border: 1px solid #ccc;"></el-image>
               </el-carousel-item>
             </el-carousel>
           </el-col>
+          <el-col :span="7" v-else class="achieveImage">
+            <el-image :src="achievezb" style="height:305px;"></el-image>
+            <el-col :span="24" class="aName">
+              {{ detailInfo.name }}
+            </el-col>
+            <el-col :span="24" class="a-brief">{{ detailInfo.requirementdesc }}</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>
+          </el-col>
           <el-col :span="17" class="right">
             <el-col :span="24" class="name textOver">
               {{ detailInfo.name || '暂无' }}
@@ -161,6 +172,7 @@ export default {
     return {
       dialogTableVisible: false,
       room: {},
+      achievezb: require('@/assets/3.png'),
     };
   },
   created() {},
@@ -260,5 +272,57 @@ export default {
       margin: 0 10px;
     }
   }
+  .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;
+    }
+    .a-brief {
+      margin: 10px 0px;
+      position: absolute;
+      top: 55px;
+      left: 0px;
+      overflow: hidden;
+      line-height: 20px;
+      letter-spacing: 2px;
+      text-overflow: ellipsis;
+      -webkit-line-clamp: 12;
+      word-break: break-all;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      transform: scale(0.8);
+    }
+    .cont {
+      position: absolute;
+      left: 0px;
+      bottom: 20px;
+      transform: scale(0.8);
+      .a-field {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
 }
 </style>

+ 20 - 3
src/views/superAdminCenter/enterpriseProduct/index.vue

@@ -5,13 +5,13 @@
         <el-col :span="24" class="main">
           <el-tabs v-model="activeName" type="card">
             <el-tab-pane label="待审核" name="first">
-              <one :oneList="oneList" :total="oneTotal" @handleDelete="handleDelete" @handleEdit="handleEdit"></one>
+              <one :oneList="oneList" :total="oneTotal" @handleDelete="handleDelete" @handleEdit="handleEdit" @btndetail="btndetail"></one>
             </el-tab-pane>
             <el-tab-pane label="审核成功" name="second">
-              <two :oneList="twoList" :total="twoTotal" @handleDelete="handleDelete"></two>
+              <two :oneList="twoList" :total="twoTotal" @handleDelete="handleDelete" @btndetail="btndetail"></two>
             </el-tab-pane>
             <el-tab-pane label="审核失败" name="third">
-              <three :oneList="threeList" :total="threeTotal" @handleDelete="handleDelete"></three>
+              <three :oneList="threeList" :total="threeTotal" @handleDelete="handleDelete" @btndetail="btndetail"></three>
             </el-tab-pane>
           </el-tabs>
           <!-- <el-col :span="24" class="excel">
@@ -326,6 +326,9 @@
             </el-form-item>
           </el-form>
         </el-dialog>
+        <el-dialog title="信息详情" :visible.sync="dialogVisible" width="60%" :before-close="handleClosedetail">
+          <directDetail :directInfo="directInfo"></directDetail>
+        </el-dialog>
       </el-col>
     </el-row>
   </div>
@@ -336,6 +339,7 @@ import one from './parts/one.vue';
 import two from './parts/two.vue';
 import three from './parts/three.vue';
 import upload from '@/components/uploadProduct.vue';
+import directDetail from '@/layout/direct/directDetail.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: newmarketproduct } = createNamespacedHelpers('newmarketproduct');
 const { mapActions: markettype } = createNamespacedHelpers('markettype');
@@ -347,6 +351,7 @@ export default {
     two,
     three,
     upload,
+    directDetail,
   },
   data: function() {
     return {
@@ -367,6 +372,8 @@ export default {
       achievestatusList: [],
       // 合作方式
       cooperationList: [],
+      dialogVisible: false,
+      directInfo: {},
     };
   },
   created() {
@@ -488,6 +495,16 @@ export default {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
     },
+    // 查看详情
+    btndetail(data) {
+      this.$set(this, `directInfo`, data);
+      this.dialogVisible = true;
+    },
+    // 取消
+    handleClosedetail() {
+      this.directInfo = {};
+      this.dialogVisible = false;
+    },
   },
   computed: {
     ...mapState(['user']),

+ 15 - 1
src/views/superAdminCenter/enterpriseProduct/parts/one.vue

@@ -3,7 +3,14 @@
     <el-row>
       <el-col :span="24">
         <el-table :data="list" style="width: 100%" border>
-          <el-table-column prop="name" label="产品名称" align="center" show-overflow-tooltip> </el-table-column>
+          <el-table-column prop="name" label="产品名称" align="center">
+            <template slot-scope="scoped">
+              <el-tooltip content="点击查看详情" placement="left" effect="dark">
+                <!-- <el-button type="text" size="small" @click="handleEdit(scoped.row)">{{ scoped.row.name }}</el-button> -->
+                <p class="btndetail textOver" @click="btndetail(scoped.row)">{{ scoped.row.name }}</p>
+              </el-tooltip>
+            </template>
+          </el-table-column>
           <el-table-column label="产品类型 " align="center">
             <template v-slot="scoped">
               {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
@@ -71,6 +78,9 @@ export default {
     handleDelete(data) {
       this.$emit('handleDelete', data.id);
     },
+    btndetail(data) {
+      this.$emit('btndetail', data);
+    },
   },
   computed: {
     ...mapState(['user']),
@@ -98,4 +108,8 @@ export default {
 .page {
   text-align: center;
 }
+.btndetail:hover {
+  cursor: pointer;
+  color: #409eff;
+}
 </style>

+ 15 - 1
src/views/superAdminCenter/enterpriseProduct/parts/three.vue

@@ -3,7 +3,14 @@
     <el-row>
       <el-col :span="24">
         <el-table :data="list" style="width: 100%" border>
-          <el-table-column prop="name" label="产品名称" align="center" show-overflow-tooltip> </el-table-column>
+          <el-table-column prop="name" label="产品名称" align="center">
+            <template slot-scope="scoped">
+              <el-tooltip content="点击查看详情" placement="left" effect="dark">
+                <!-- <el-button type="text" size="small" @click="handleEdit(scoped.row)">{{ scoped.row.name }}</el-button> -->
+                <p class="btndetail textOver" @click="btndetail(scoped.row)">{{ scoped.row.name }}</p>
+              </el-tooltip>
+            </template>
+          </el-table-column>
           <el-table-column prop="totaltype" label="产品类型 " align="center">
             <template v-slot="scoped">
               {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
@@ -68,6 +75,9 @@ export default {
     handleDelete(data) {
       this.$emit('handleDelete', data.id);
     },
+    btndetail(data) {
+      this.$emit('btndetail', data);
+    },
   },
   computed: {
     ...mapState(['user']),
@@ -95,4 +105,8 @@ export default {
 .page {
   text-align: center;
 }
+.btndetail:hover {
+  cursor: pointer;
+  color: #409eff;
+}
 </style>

+ 15 - 1
src/views/superAdminCenter/enterpriseProduct/parts/two.vue

@@ -3,7 +3,14 @@
     <el-row>
       <el-col :span="24">
         <el-table :data="list" style="width: 100%" border>
-          <el-table-column prop="name" label="产品名称" align="center" show-overflow-tooltip> </el-table-column>
+          <el-table-column prop="name" label="产品名称" align="center">
+            <template slot-scope="scoped">
+              <el-tooltip content="点击查看详情" placement="left" effect="dark">
+                <!-- <el-button type="text" size="small" @click="handleEdit(scoped.row)">{{ scoped.row.name }}</el-button> -->
+                <p class="btndetail textOver" @click="btndetail(scoped.row)">{{ scoped.row.name }}</p>
+              </el-tooltip>
+            </template>
+          </el-table-column>
           <el-table-column prop="totaltype" label="产品类型 " align="center">
             <template v-slot="scoped">
               {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
@@ -65,6 +72,9 @@ export default {
     handleDelete(data) {
       this.$emit('handleDelete', data.id);
     },
+    btndetail(data) {
+      this.$emit('btndetail', data);
+    },
   },
   computed: {
     ...mapState(['user']),
@@ -92,4 +102,8 @@ export default {
 .page {
   text-align: center;
 }
+.btndetail:hover {
+  cursor: pointer;
+  color: #409eff;
+}
 </style>