1

src/router/index.js

@@ -153,6 +153,13 @@ const live = [
     meta: { title: '活动总结', subSite: true },
     component: () => import('../views/halltwo/detail.vue'),
   },
+  {
+    path: '/halltwo/xmcg',
+    name: 'xmcg',
+    meta: { title: '项目成果', subSite: true },
+    component: () => import('../views/halltwo/xmcg.vue'),
+  },
+
   {
     path: '/hall/productList/technologyList',
     name: 'live_technologyList',

src/views/halltwo/detail.vue

@@ -71,14 +71,14 @@
                   <el-tabs v-model="activeName">
                     <el-tab-pane label="参展项目(0)" name="first">
                       <el-table :data="tableData" stripe style="width: 100%">
-                        <el-table-column prop="classifi" label="行业分类" width="180"> </el-table-column>
+                        <el-table-column prop="field" label="所属领域" width="180"> </el-table-column>
                         <el-table-column prop="name" label="项目名称" width="180"> </el-table-column>
                         <el-table-column prop="type" label="技术类型">
                           <template slot-scope="scope">
-                            <span class="bgColor">{{ scope.row.type }}</span>
+                            <span class="bgColor">{{ scope.row.type == '0' ? '科技需求' : scope.row.type == '1' ? '技术成果' : '商务信息' }}</span>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="mode" label="交易方式"> </el-table-column>
+                        <el-table-column prop="cooperation" label="交易方式"> </el-table-column>
                       </el-table>
                       <el-col class="page1" :span="24">
                         <el-pagination
@@ -93,14 +93,18 @@
                     </el-tab-pane>
                     <el-tab-pane label="参展需求(0)" name="second">
                       <el-table :data="tableData1" stripe style="width: 100%">
-                        <el-table-column prop="type" label="需求类别" width="180"> </el-table-column>
+                        <el-table-column prop="type" label="需求类别">
+                          <template slot-scope="scope">
+                            <span>{{ scope.row.type == '0' ? '科技需求' : scope.row.type == '1' ? '技术成果' : '商务信息' }}</span>
+                          </template>
+                        </el-table-column>
                         <el-table-column prop="name" label="需求名称" width="180"> </el-table-column>
-                        <el-table-column prop="money" label="投入预算">
+                        <el-table-column prop="budget" label="投入预算">
                           <template slot-scope="scope">
-                            <span class="bgColor">{{ scope.row.money }}</span>
+                            <span class="bgColor">{{ scope.row.budget || '暂无' }}</span>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="site" label="所在地"> </el-table-column>
+                        <el-table-column prop="degreeurgency" label="需求紧急程度"> </el-table-column>
                       </el-table>
                       <el-col class="page1" :span="24">
                         <el-pagination
@@ -295,7 +299,14 @@ export default {
         let res = await this.dockFetch(this.id);
         if (this.$checkRes(res)) {
           this.$set(this, `dockInfo`, res.data);
-          console.log(this.dockInfo);
+          let czxm = res.data.apply.map(item => item.goodsList);
+          czxm = _.flattenDeep(czxm);
+          let czxmNew = czxm.filter(item => item.dockStatus == '1');
+          // 参展项目
+          this.$set(this, `tableData`, czxmNew);
+          // 科技需求
+          let techol = czxmNew.filter(i => i.type == '0');
+          this.$set(this, `tableData1`, techol);
         }
       }
       //查询专家列表

src/views/halltwo/directTwo.vue

@@ -22,7 +22,7 @@
           <div class="w_1200">
             <el-col :span="24" class="twotop">
               <el-col :span="18" class="left">
-                <p>{{ this.$route.query.title }}</p>
+                <p>{{ dockInfo.title }}</p>
                 <el-image :src="two1"></el-image>
               </el-col>
               <el-col :span="6" class="right">
@@ -128,10 +128,10 @@
                       <achieve :list="achievefourList"></achieve>
                     </el-tab-pane>
                   </el-tabs>
-                  <el-link :underline="false" class="more">更多></el-link>
+                  <el-link :underline="false" class="more" @click="$router.push({ path: '/halltwo/xmcg', query: { id: dockInfo.id } })">更多></el-link>
                 </el-col>
                 <el-col :span="24" class="leftbtn">
-                  <el-button>查看所有项目</el-button>
+                  <el-button @click="$router.push({ path: '/halltwo/xmcg', query: { id: dockInfo.id } })">查看所有项目</el-button>
                 </el-col>
               </el-col>
               <el-col :span="12" class="right">
@@ -150,10 +150,10 @@
                       <achieve :list="techolfourList"></achieve>
                     </el-tab-pane>
                   </el-tabs>
-                  <el-link :underline="false" class="more">更多></el-link>
+                  <el-link :underline="false" class="more" @click="$router.push({ path: '/halltwo/xmcg', query: { id: dockInfo.id } })">更多></el-link>
                 </el-col>
                 <el-col :span="24" class="leftbtn">
-                  <el-button>查看所有需求</el-button>
+                  <el-button @click="$router.push({ path: '/halltwo/xmcg', query: { id: dockInfo.id } })">查看所有需求</el-button>
                 </el-col>
               </el-col>
             </el-col>

src/views/halltwo/xmcg.vue

@@ -0,0 +1,32 @@
+<template>
+  <div id="xmcg">
+    <el-row>
+      <el-col :span="24">
+        <p>xmcg</p>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  name: 'xmcg',
+  props: {},
+  components: {},
+  data: function() {
+    return {};
+  },
+  created() {},
+  methods: {},
+  computed: {
+    ...mapState(['user']),
+  },
+  watch: {},
+};
+</script>
+
+<style lang="less" scoped></style>