From aee64459edc5d7b07b90c02852bf580bba3fe799 Mon Sep 17 00:00:00 2001
From: unknown <binbin0314@126.com>
Date: Wed, 6 Jan 2021 17:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=96=B0=E5=B9=B3=E5=8F=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/platform.styl                      |  21 ++
 src/components/Introduce/CompanyProfile.vue   |   4 +-
 src/components/PlatformList/Fruit.vue         |  18 +-
 src/components/PlatformList/PlatformList.vue  | 155 ++++++++-----
 src/config/api.js                             |   8 +
 src/router/index.js                           |  17 ++
 src/store/modules/home/mutations.js           |  30 +++
 src/store/modules/home/state.js               |   3 +
 src/views/About/Children/SpinOffs.vue         |   2 +-
 src/views/NewPlatform/Children/Service.vue    |  68 +++++-
 src/views/NewPlatform/Children/ServiceDet.vue |  23 ++
 src/views/NewPlatform/Children/Share.vue      |  34 ++-
 .../Children/ShareChild/InsDet.vue            | 140 ++++++++++++
 .../Children/ShareChild/Institute.vue         | 209 ++++++++++++++++++
 src/views/NewPlatform/components/HNav.vue     |   2 +
 15 files changed, 664 insertions(+), 70 deletions(-)
 create mode 100644 src/views/NewPlatform/Children/ServiceDet.vue
 create mode 100644 src/views/NewPlatform/Children/ShareChild/InsDet.vue
 create mode 100644 src/views/NewPlatform/Children/ShareChild/Institute.vue

diff --git a/src/common/platform.styl b/src/common/platform.styl
index 5d7c37d..d464bb5 100644
--- a/src/common/platform.styl
+++ b/src/common/platform.styl
@@ -152,3 +152,24 @@
   font-size: 16px;
   color: rgba(0,0,0,0.65);
 }
+.flow-path {
+  background: -webkit-linear-gradient(left, #13ACC4 , #fff);
+  padding: 80px 9%;
+  position: relative;
+}
+.flow-title {
+  position: absolute;
+  top: 40%;
+  font-size: 30px;
+  color: #fff;
+}
+.flow-content {
+  margin-left: 20%;
+  width:30%;
+  font-size: 16px;
+  color: #fff;
+}
+.login-color {
+  color: #096DD9;
+  cursor: pointer;
+}
diff --git a/src/components/Introduce/CompanyProfile.vue b/src/components/Introduce/CompanyProfile.vue
index 6960334..61aacd3 100644
--- a/src/components/Introduce/CompanyProfile.vue
+++ b/src/components/Introduce/CompanyProfile.vue
@@ -24,9 +24,7 @@ export default {
   },
 
   data() {
-    return {
-      ModalText: 'Content of the modal',
-    };
+    return { ModalText: 'Content of the modal',  };
   },
 
   computed: mapState('home', ['profile']),
diff --git a/src/components/PlatformList/Fruit.vue b/src/components/PlatformList/Fruit.vue
index 8801fa0..10059c0 100644
--- a/src/components/PlatformList/Fruit.vue
+++ b/src/components/PlatformList/Fruit.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="inner d-flex justify-space-between flex-wrap">
-      <div v-for="(item, index) in list" :key="index" class="item-box">
+    <div class="inner d-flex flex-wrap">
+      <div v-for="(item, index) in list" :key="index" class="item-box" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
         <p class="font-24 my-3" style="cursor: pointer" @click="detail(item.id)">{{ item.name }}</p>
         <p class="font-16" style="color: rgba(0, 0, 0, 0.45); cursor: pointer" @click="detail(item.id)">编号：{{ item.identifier }}</p>
         <p class="font-16 baseColor item-more">
@@ -93,13 +93,25 @@ export default {
 }
 
 .item-box {
-  width: 24%;
+  position: relative;
+  width: 20.5%;
   background: #fff;
+  margin-right: 6%;
+  border-radius: 4px;
+  box-shadow: 6px 6px 6px #eee;
   margin-bottom: 40px;
   padding: 10px;
+  padding-bottom: 60px;
+}
+
+.margin-0 {
+  margin-right: 0% !important;
 }
 
 .item-more {
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
   text-align: right;
   margin-bottom: 0 !important;
   margin-top: 40px;
diff --git a/src/components/PlatformList/PlatformList.vue b/src/components/PlatformList/PlatformList.vue
index 652077f..283d09b 100644
--- a/src/components/PlatformList/PlatformList.vue
+++ b/src/components/PlatformList/PlatformList.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <div class="inner d-flex justify-space-between flex-wrap">
-      <div v-for="(item, index) in list" :key="index">
-        <img :src="item.imgUrl" style="height: 220px" />
-        <p class="font-24 my-4">{{ item.title }}</p>
-        <p class="font-16 baseColor" style="text-align: right; cursor: pointer">了解更多→</p>
+    <div class="inner d-flex flex-wrap">
+      <div v-for="(item, index) in list" :key="index" class="item-box" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
+        <img :src="item.imgUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
+        <p class="font-24 my-4">{{ item.name }}</p>
+        <p class="font-16 baseColor" style="text-align: right; cursor: pointer" @click="jump(item.id)">了解更多→</p>
       </div>
     </div>
     <div class="inner">
@@ -22,68 +22,83 @@
 </template>
 
 <script>
+import { mapMutations, mapState } from 'vuex';
 import { selInstrument, searchFront } from 'config/api';
 export default {
   name: 'PlatformList',
   data() {
     return {
-      list: [
-        {
-          imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-          title: 'XX实验平台',
-          id: 1,
-        },
-        {
-          imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-          title: 'XX实验平台',
-          id: 2,
-        },
-        {
-          imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-          title: 'XX实验平台',
-          id: 3,
-        },
-        {
-          imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-          title: 'XX实验平台',
-          id: 4,
-        },
-        {
-          imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-          title: 'XX实验平台',
-          id: 5,
-        },
-        {
-          imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-          title: 'XX实验平台',
-          id: 6,
-        },
-      ],
-      current: 1,
-      pageSize: 6,
+      list: [],
+      pageSize: 8,
       total: 20,
+      current: 1,
     };
   },
+  computed: mapState('home', ['listState', 'labList', 'LabIpt', 'insList', 'InsIpt', 'shareCurrent']),
+  watch: {
+    shareCurrent(val) {
+      console.log(val);
+      this.monitor(this.listState);
+    },
+    labList(val) {
+      if (this.shareCurrent === 1) {
+        this.monitor(this.listState);
+      }
+      this.current = 1;
+      this.setShareCurrent(1);
+    },
+    LabIpt(val) {
+      if (this.LabIpt.isBtn === 1) {
+        if (this.shareCurrent === 1) {
+          this.monitor(this.listState);
+        }
+        this.current = 1;
+        this.setShareCurrent(1);
+      }
+    },
+    insList(val) {
+      if (this.shareCurrent === 1) {
+        this.monitor(this.listState);
+      }
+      this.current = 1;
+      this.setShareCurrent(1);
+    },
+    InsIpt(val) {
+      if (this.InsIpt.isBtn === 1) {
+        if (this.shareCurrent === 1) {
+          this.monitor(this.listState);
+        }
+        this.current = 1;
+        this.setShareCurrent(1);
+      }
+    },
+  },
   created() {
-    this.getSelI();
-    this.getSear();
+    this.current = this.shareCurrent;
+    if (this.listState === 0) {
+      this.getSear();
+    } else {
+      this.getSelI();
+    }
   },
   methods: {
+    ...mapMutations('home', ['setShareCurrent']),
     // 查询仪器列表
     async getSelI() {
       try {
         const params = {
           param: {
-            content: '', // 搜索框内容
-            modelIds: [], // 分类ID数组
-            pageNum: 1,
-            pageSize: 6,
+            content: this.InsIpt.content, // 搜索框内容
+            modelIds: this.insList, // 分类ID数组
+            pageNum: this.shareCurrent,
+            pageSize: this.pageSize,
           },
         };
         const res = await selInstrument(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          console.log(data);
+          this.list = data.list;
+          this.total = parseInt(data.total);
         }
       } catch (error) {
         console.log(error);
@@ -94,16 +109,17 @@ export default {
       try {
         const params = {
           param: {
-            name: '', // 搜索框内容
-            moldIds: [], // 分类ID数组
-            pageNum: 1,
-            pageSize: 6,
+            name: this.LabIpt.content, // 搜索框内容
+            moldIds: this.labList, // 分类ID数组
+            pageNum: this.shareCurrent,
+            pageSize: this.pageSize,
           },
         };
         const res = await searchFront(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          console.log(data);
+          this.list = data.list;
+          this.total = parseInt(data.total);
         }
       } catch (error) {
         console.log(error);
@@ -111,8 +127,32 @@ export default {
     },
     // 改变单当前页数
     onShowSizeChange(current, size) {
-      console.log(current);
       this.current = current;
+      this.setShareCurrent(this.current);
+    },
+    // 监听触发搜索事件
+    monitor(val) {
+      if (val === 0) {
+        this.getSear();
+      } else {
+        this.getSelI();
+      }
+    },
+    // 查看 研究院/仪器 详情
+    jump(id) {
+      if (this.listState === 0) {
+        this.$router.push({
+          path: '/NewPlatform/Share/Institute',
+          name: 'Institute',
+          params: { id },
+        });
+      } else if (this.listState === 1) {
+        this.$router.push({
+          path: '/NewPlatform/Share/InsDet',
+          name: 'InsDet',
+          params: { id },
+        });
+      }
     },
   },
 };
@@ -123,4 +163,15 @@ export default {
   margin: 40px 0;
   text-align: right;
 }
+
+.item-box {
+  width: 20.5%;
+  margin-right: 6%;
+  border-radius: 4px;
+  box-shadow: 6px 6px 6px #eee;
+}
+
+.margin-0 {
+  margin-right: 0 !important;
+}
 </style>
diff --git a/src/config/api.js b/src/config/api.js
index cec7fe1..9e560af 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -58,9 +58,17 @@ export const FrontSearchCompany = params => axios.post(`${Business}/FrontSearchC
 export const selModel = params => axios.post(`${achInstr}/selModel`, params);
 // 仪器列表查询
 export const selInstrument = params => axios.post(`${achInstr}/selInstrument`, params);
+// 仪器详情查询
+export const selInstrumentMes = params => axios.post(`${achInstr}/selInstrumentMes`, params);
+// 通过研究院（实验室）Id查询仪器列表
+export const selInstrumentByRes = params => axios.post(`${achInstr}/selInstrumentByRes`, params);
 // 研究院（实验室）列表查询
 export const searchFront = params => axios.post(`${greenvalley}/institute/searchFront`, params);
+// 研究院团队详情查询
+export const teamSearch = params => axios.post(`${greenvalley}/teamGuide/teamSearch`, params);
 // 成果列表查询
 export const selRes = params => axios.post(`${achInstr}/selRes`, params);
 // 成果详情查询
 export const selResMes = params => axios.post(`${achInstr}/selResMes`, params);
+// 服务列表查询
+export const selService = params => axios.post(`${greenvalley}/serviceProject/selService`, params);
diff --git a/src/router/index.js b/src/router/index.js
index 5f90df2..174471a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -132,12 +132,29 @@ const routes = [
         name: 'Service',
         component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Service.vue'),
       },
+      {
+        path: '/NewPlatform/ServiceDet',
+        name: 'ServiceDet',
+        component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/ServiceDet.vue'),
+      },
       {
         // 科技资源开放共享服务平台
         path: '/NewPlatform/Share',
         name: 'Share',
         component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Share.vue'),
       },
+      {
+        // 科技资源开放共享服务平台 > 研究院（实验室）详情页
+        path: '/NewPlatform/Share/Institute',
+        name: 'Institute',
+        component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/ShareChild/Institute.vue'),
+      },
+      {
+        // 科技资源开放共享服务平台 > 仪器详情页
+        path: '/NewPlatform/Share/InsDet',
+        name: 'InsDet',
+        component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/ShareChild/InsDet.vue'),
+      },
       {
         // 知识产权与技术转移转化服务平台
         path: '/NewPlatform/Transfer',
diff --git a/src/store/modules/home/mutations.js b/src/store/modules/home/mutations.js
index 30a7e6d..b0918cb 100644
--- a/src/store/modules/home/mutations.js
+++ b/src/store/modules/home/mutations.js
@@ -170,6 +170,25 @@ const mutations = {
   setAchId(state, num) {
     state.achId = num;
   },
+
+  /**
+   * 科技资源开放共享服务平台-列表展示数据（0：实验室，1：仪器//默认0）
+   * @param {object} state
+   * @param {number} num
+   */
+  setListState(state, num) {
+    state.listState = num;
+  },
+
+  /**
+   * 科技资源开放共享服务平台-列表当前处于第几页
+   * @param {object} state
+   * @param {number} num
+   */
+  setShareCurrent(state, num) {
+    state.shareCurrent = num;
+  },
+
   /**
    * 改变科技资源开放共享服务平台-实验室所选类型
    * @param {object} state
@@ -178,6 +197,7 @@ const mutations = {
   setLabList(state, list) {
     state.labList = list;
   },
+
   /**
    * 改变科技资源开放共享服务平台-实验室搜索框内容
    * @param {object} state
@@ -195,6 +215,7 @@ const mutations = {
   setInsList(state, list) {
     state.insList = list;
   },
+
   /**
    * 改变科技资源开放共享服务平台-仪器搜索框内容
    * @param {object} state
@@ -203,6 +224,15 @@ const mutations = {
   setInsIpt(state, obj) {
     state.InsIpt = { ...obj };
   },
+
+  /**
+   * 改变当前查看的研究院 详情的 id
+   * @param {object} state
+   * @param {number} num
+   */
+  setLabId(state, num) {
+    state.LabId = num;
+  },
 };
 
 export default mutations;
diff --git a/src/store/modules/home/state.js b/src/store/modules/home/state.js
index 4063f3f..b5ca6a7 100644
--- a/src/store/modules/home/state.js
+++ b/src/store/modules/home/state.js
@@ -31,6 +31,8 @@ const state = {
   },
   achCurrent: 1, // 知识产权与技术转移转化服务平台-成果列表页数
   achId: 0, // 知识产权与技术转移转化服务平台-成果详情页Id
+  listState: 0, // 科技资源开放共享服务平台-列表展示数据（0：实验室，1：仪器//默认0）
+  shareCurrent: 1, // 科技资源开放共享服务平台-列表当前处于第几页
   labList: [], // 科技资源开放共享服务平台-实验室所选类型
   LabIpt: {
     // 实验室搜索框内容
@@ -43,6 +45,7 @@ const state = {
     content: '',
     isBtn: 0,
   },
+  LabId: 0, // 当前研究院详情Id
 };
 
 export default state;
diff --git a/src/views/About/Children/SpinOffs.vue b/src/views/About/Children/SpinOffs.vue
index 863020d..3c35361 100644
--- a/src/views/About/Children/SpinOffs.vue
+++ b/src/views/About/Children/SpinOffs.vue
@@ -4,7 +4,7 @@
     <div class="inner">
       <bread-crumb :arr="arr" />
       <div class="py-5">
-        <derive-enterprise :title="title" :typeOfPlatform="typeOfPlatform" />
+        <derive-enterprise :title="title" :type-ofP-platform="typeOfPlatform" />
       </div>
     </div>
   </div>
diff --git a/src/views/NewPlatform/Children/Service.vue b/src/views/NewPlatform/Children/Service.vue
index 2a54c23..b494841 100644
--- a/src/views/NewPlatform/Children/Service.vue
+++ b/src/views/NewPlatform/Children/Service.vue
@@ -1,24 +1,82 @@
 <template>
   <div>
+    <rotation />
     <h-nav />
-    {{ str }}
-    {{ str }}
-    {{ str }}
+    <div class="flow-path">
+      <div class="flow-title">服务流程</div>
+      <div class="flow-content">
+        您 <span class="login-color">注册、登录</span> 后通过直接申请或加入购物车进行申请服务， 直接申请后在个人中心查看， 加入
+        <span class="login-color">购物车</span> 后可通过顶部菜单栏的购物车查看。
+      </div>
+    </div>
+    <div class="inner d-flex flex-wrap">
+      <div v-for="(item, index) in list" :key="index" class="item-box" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
+        <img :src="item.imgUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
+        <p class="font-24 my-4">{{ item.name }}</p>
+        <p class="font-16 baseColor" style="text-align: right; cursor: pointer" @click="jump(item.id)">了解更多→</p>
+      </div>
+    </div>
+    <div class="inner">
+      <a-pagination
+        :current="current"
+        :total="total"
+        :page-size="pageSize"
+        @change="onShowSizeChange"
+        class="pagination"
+        show-less-items
+        show-quick-jumper
+      />
+    </div>
   </div>
 </template>
 
 <script>
+import Rotation from 'components/Rotation/Rotation.vue';
 import HNav from './../components/HNav.vue';
 export default {
   name: 'Service',
-  components: { HNav },
+  components: { HNav, Rotation },
   data() {
     return {
       str: '这是服务界面',
       list: [],
+      current: 1,
+      pageSize: 8,
+      total: 0,
     };
   },
+  methods: {
+    // 改变单当前页数
+    onShowSizeChange(current, size) {
+      this.current = current;
+    },
+    // 查看 服务 详情
+    jump(id) {
+      console.log(id);
+      this.$router.push({
+        path: '/NewPlatform/ServiceDet',
+        name: 'ServiceDet',
+        params: { id },
+      });
+    },
+  },
 };
 </script>
 
-<style lang="stylus" scoped></style>
+<style lang="stylus" scoped>
+.pagination {
+  margin: 40px 0;
+  text-align: right;
+}
+
+.item-box {
+  width: 20.5%;
+  margin-right: 6%;
+  border-radius: 4px;
+  box-shadow: 6px 6px 6px #eee;
+}
+
+.margin-0 {
+  margin-right: 0 !important;
+}
+</style>
diff --git a/src/views/NewPlatform/Children/ServiceDet.vue b/src/views/NewPlatform/Children/ServiceDet.vue
new file mode 100644
index 0000000..32f5cb6
--- /dev/null
+++ b/src/views/NewPlatform/Children/ServiceDet.vue
@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <div class="inner service-box">服务详情页</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ServiceDet',
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.service-box {
+  margin: 60px auto;
+  min-height: 400px;
+  padding: 20px;
+  background: #fff;
+}
+</style>
diff --git a/src/views/NewPlatform/Children/Share.vue b/src/views/NewPlatform/Children/Share.vue
index e35afcf..ec519ad 100644
--- a/src/views/NewPlatform/Children/Share.vue
+++ b/src/views/NewPlatform/Children/Share.vue
@@ -17,7 +17,7 @@
             </span>
           </div>
           <div class="flex-1 align-center">
-            <a-input-search class="item-search" v-model="InsIpt" placeholder="搜索实验室" enter-button="搜索" @search="searchIns" />
+            <a-input-search class="item-search" v-model="LabIpt" placeholder="搜索实验室" enter-button="搜索" @search="searchLab" />
           </div>
         </div>
         <div style="border-top: 1px solid rgba(0, 0, 0, 0.06)" class="flex-3 flex-wrap">
@@ -34,7 +34,7 @@
             </span>
           </div>
           <div class="flex-1 align-center">
-            <a-input-search class="item-search" v-model="LabIpt" placeholder="搜索仪器" enter-button="搜索" @search="searchLab" />
+            <a-input-search class="item-search" v-model="InsIpt" placeholder="搜索仪器" enter-button="搜索" @search="searchIns" />
           </div>
         </div>
       </div>
@@ -91,7 +91,7 @@ export default {
     this.getType(2);
   },
   methods: {
-    ...mapMutations('home', ['setLabList', 'setInsList', 'setLabIpt', 'setInsIpt']),
+    ...mapMutations('home', ['setLabList', 'setInsList', 'setLabIpt', 'setInsIpt', 'setListState']),
     async getType(num) {
       try {
         const params = { param: { model: num } };
@@ -119,7 +119,11 @@ export default {
       const that = this;
       if (num === 0) {
         this.labList = [];
-        const { laboratory } = this;
+        const { laboratory, instrument } = this;
+        for (let i = 0; i < instrument.length; i++) {
+          instrument[i].isActive = false;
+        }
+        this.setListState(0);
         laboratory[index].isActive = !laboratory[index].isActive;
         this.laboratory = [...laboratory];
         for (let i = 0; i < laboratory.length; i++) {
@@ -130,7 +134,11 @@ export default {
         this.setLabList(this.labList);
       } else if (num === 1) {
         this.insList = [];
-        const { instrument } = this;
+        const { laboratory, instrument } = this;
+        for (let i = 0; i < laboratory.length; i++) {
+          laboratory[i].isActive = false;
+        }
+        this.setListState(1);
         instrument[index].isActive = !instrument[index].isActive;
         this.instrument = [...instrument];
         for (let i = 0; i < instrument.length; i++) {
@@ -138,10 +146,17 @@ export default {
             this.insList.push(instrument[i].id);
           }
         }
-        this.setLabList(this.insList);
+        this.setInsList(this.insList);
       }
     },
     searchLab() {
+      const { instrument } = this;
+      for (let i = 0; i < instrument.length; i++) {
+        instrument[i].isActive = false;
+      }
+      this.instrument = [...instrument];
+      this.setListState(0);
+      this.InsIpt = '';
       const obj = {
         content: this.LabIpt,
         isBtn: 1,
@@ -149,6 +164,13 @@ export default {
       this.setLabIpt(obj);
     },
     searchIns() {
+      const { laboratory } = this;
+      for (let i = 0; i < laboratory.length; i++) {
+        laboratory[i].isActive = false;
+      }
+      this.laboratory = [...laboratory];
+      this.setListState(1);
+      this.LabIpt = '';
       const obj = {
         content: this.InsIpt,
         isBtn: 1,
diff --git a/src/views/NewPlatform/Children/ShareChild/InsDet.vue b/src/views/NewPlatform/Children/ShareChild/InsDet.vue
new file mode 100644
index 0000000..2f2fe08
--- /dev/null
+++ b/src/views/NewPlatform/Children/ShareChild/InsDet.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="inner equ-box">
+    <div class="equ-info d-flex">
+      <img :src="obj.img" alt="" />
+      <div class="equ-info-box">
+        <p class="equ-name">{{ obj.name }}</p>
+        <div class="d-flex flex-wrap">
+          <div style="width: 200px" class="equ-info-left">
+            <p>仪器名字：</p>
+            <p>制造商：</p>
+            <p>型号：</p>
+            <p>规格：</p>
+            <p>性能指标：</p>
+            <p>联系人：</p>
+            <p>联系方式：</p>
+          </div>
+          <div style="width: 500px">
+            <p>{{ obj.name }}</p>
+            <p>{{ obj.manufactor }}</p>
+            <p>{{ obj.model }}</p>
+            <p>{{ obj.specifications }}</p>
+            <p>{{ obj.performance }}</p>
+            <p>
+              <span v-for="(item, index) in obj.selPeoList" :key="index">{{ item.contactsName }}、</span>
+            </p>
+            <p>
+              <span v-for="(item, index) in obj.selPeoList" :key="index">{{ item.contactsPhone }}、</span>
+            </p>
+          </div>
+        </div>
+        <p class="equ-btn">
+          <a-button style="margin-right: 20px">转化意向</a-button>
+          <a-button type="primary">加入购物车</a-button>
+        </p>
+      </div>
+    </div>
+    <div class="content-box">
+      <div v-dompurify-html="obj.purpose"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { selInstrumentMes } from 'config/api';
+export default {
+  name: 'InsDet',
+  data() {
+    return {
+      obj: {},
+      id: 0,
+    };
+  },
+  created() {
+    this.id = this.$route.params.id;
+    this.getData();
+  },
+  methods: {
+    async getData() {
+      try {
+        const params = { param: { id: this.id } };
+        const res = await selInstrumentMes(params);
+        const { code, data, msg } = res.data;
+        if (code === 200) {
+          console.log(data);
+          this.obj = data;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.equ-box {
+  background: #fff;
+  padding: 20px;
+  margin: 60px auto;
+}
+
+.equ-info {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.14901960784313725);
+  position: relative;
+  padding-bottom: 24px;
+
+  img {
+    width: 300px;
+    height: 300px;
+  }
+}
+
+.equ-name {
+  font-size: 24px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  line-height: 31px;
+  color: rgba(0, 0, 0, 0.85);
+  opacity: 1;
+}
+
+.equ-info-box {
+  position: relative;
+  font-size: 16px;
+  margin-left: 20px;
+  height: 300px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(0, 0, 0, 0.65);
+  opacity: 1;
+
+  p {
+    margin-bottom: 6px;
+  }
+}
+
+.equ-info-left {
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(0, 0, 0, 0.45);
+  opacity: 1;
+
+  p {
+    margin-bottom: 6px;
+  }
+}
+
+.equ-btn {
+  position: absolute;
+  bottom: 0;
+}
+
+.content-box {
+  min-height: 400px;
+  padding: 20px;
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.65);
+}
+</style>
diff --git a/src/views/NewPlatform/Children/ShareChild/Institute.vue b/src/views/NewPlatform/Children/ShareChild/Institute.vue
new file mode 100644
index 0000000..8bafa03
--- /dev/null
+++ b/src/views/NewPlatform/Children/ShareChild/Institute.vue
@@ -0,0 +1,209 @@
+<template>
+  <div>
+    <rotation />
+    <h-nav />
+    <div class="inner ins-box">
+      <p class="font-bold-24 item-title">设备列表</p>
+      <div class="d-flex flex-wrap">
+        <div v-for="(item, index) in list" :key="index" class="item-box" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
+          <img :src="item.imgUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
+          <p class="font-24 my-4">{{ item.name }}</p>
+          <p class="font-16 baseColor item-more" @click="jump(item.id)">了解更多→</p>
+        </div>
+      </div>
+      <p class="font-bold-24 item-title">人才团队带头人情况</p>
+      <div class="d-flex">
+        <div class="header-box" style="flex: 1">
+          <p style="background: #11b7ce; color: #fff">姓名</p>
+          <p>性别</p>
+          <p>民族</p>
+          <p>出生年月</p>
+          <p>学历</p>
+          <p>职称</p>
+          <p>所学专业</p>
+          <p>从事专业</p>
+          <p>团队名称</p>
+          <p>工作单位</p>
+          <p>研究方向</p>
+        </div>
+        <div class="header-box" style="flex: 5; background: #fff">
+          <p style="border-bottom: 1px solid #eee">{{ obj.name }}</p>
+          <p><span v-if="obj.gender - 0 === 1">男</span> <span v-else-if="obj.gender - 0 === 2">女</span></p>
+          <p>{{ obj.famousFamily }}</p>
+          <p>{{ obj.birthday }}</p>
+          <p>{{ obj.education }}</p>
+          <p>{{ obj.position }}</p>
+          <p>{{ obj.major }}</p>
+          <p>{{ obj.professional }}</p>
+          <p>{{ obj.teamName }}</p>
+          <p>{{ obj.workUnit }}</p>
+          <p>{{ obj.direction }}</p>
+        </div>
+      </div>
+      <p class="font-bold-24 item-title">团队成员信息</p>
+      <div style="background: #fff">
+        <div class="d-flex">
+          <div class="h-box" style="flex: 1">姓名</div>
+          <div class="h-box" style="flex: 1">性别</div>
+          <div class="h-box" style="flex: 1">所在单位</div>
+          <div class="h-box" style="flex: 1">出生年月</div>
+          <div class="h-box" style="flex: 1">学历学位</div>
+          <div class="h-box" style="flex: 1">职称职务</div>
+          <div class="h-box" style="flex: 1">研究方向</div>
+        </div>
+        <div class="d-flex" v-for="(item, index) in obj.teamMemberList" :key="index">
+          <div class="con-box" style="flex: 1">{{ item.name }}</div>
+          <div class="con-box" style="flex: 1">
+            <span v-if="item.gender - 0 === 1">男</span>
+            <span v-else-if="item.gender - 0 === 2">女</span>
+          </div>
+          <div class="con-box" style="flex: 1">???????????????</div>
+          <div class="con-box" style="flex: 1">{{ item.birthday }}</div>
+          <div class="con-box" style="flex: 1">{{ item.education }}</div>
+          <div class="con-box" style="flex: 1">{{ item.position }}</div>
+          <div class="con-box" style="flex: 1">{{ item.direction }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapMutations, mapState } from 'vuex';
+import { selInstrumentByRes, teamSearch } from 'config/api';
+import Rotation from 'components/Rotation/Rotation.vue';
+import HNav from './../../components/HNav.vue';
+export default {
+  name: 'Institute',
+  components: { Rotation, HNav },
+  data() {
+    return {
+      id: 0,
+      obj: {},
+      list: [],
+    };
+  },
+  computed: mapState('home', ['LabId']),
+  created() {
+    if (this.$route.params.id) {
+      this.setLabId(this.$route.params.id);
+      this.id = this.$route.params.id;
+    } else {
+      this.id = this.LabId;
+    }
+    this.getData();
+    this.getTeam();
+  },
+  methods: {
+    ...mapMutations('home', ['setLabId']),
+
+    // 获取当前研究院（实验室）下的仪器列表
+    async getData() {
+      try {
+        const params = {
+          param: {
+            id: this.id,
+            pageNum: 1,
+            pageSize: 6,
+          },
+        };
+        const res = await selInstrumentByRes(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.list = data.list;
+          this.total = parseInt(data.total);
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    // 获取当前研究院（实验室）下的团队详情
+    async getTeam() {
+      try {
+        const params = { param: { instituteId: this.id } };
+        const res = await teamSearch(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.obj = data[0];
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    // 查看 研究院/仪器 详情
+    jump(id) {
+      this.$router.push({
+        path: '/NewPlatform/Share/InsDet',
+        name: 'InsDet',
+        params: { id },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.ins-box {
+  min-height: 500px;
+  height: auto;
+  margin: 40px auto;
+}
+
+.pagination {
+  margin: 40px 0;
+  text-align: right;
+}
+
+.item-more {
+  right: 10px;
+  bottom: 0px;
+  cursor: pointer;
+  position: absolute;
+}
+
+.item-box {
+  position: relative;
+  width: 20.5%;
+  margin-right: 6%;
+  border-radius: 4px;
+  padding-bottom: 40px;
+  box-shadow: 6px 6px 6px #eee;
+}
+
+.margin-0 {
+  margin-right: 0 !important;
+}
+
+.item-title {
+  color: rgba(0, 0, 0, 0.85);
+  margin-top: 60px;
+}
+
+.header-box {
+  text-align: center;
+
+  p {
+    font-size: 24px;
+    color: rgba(0, 0, 0, 0.66);
+    height: 56px;
+    line-height: 56px;
+    margin-bottom: 0 !important;
+  }
+}
+
+.h-box {
+  text-align: center;
+  font-size: 22px;
+  color: #096DD9;
+  height: 56px;
+  line-height: 56px;
+}
+
+.con-box {
+  text-align: center;
+  font-size: 18px;
+  height: 46px;
+  line-height: 46px;
+  color: rgba(112, 112, 112, 0.66);
+}
+</style>
diff --git a/src/views/NewPlatform/components/HNav.vue b/src/views/NewPlatform/components/HNav.vue
index d488b38..264f528 100644
--- a/src/views/NewPlatform/components/HNav.vue
+++ b/src/views/NewPlatform/components/HNav.vue
@@ -33,6 +33,8 @@ export default {
     console.log();
     if (this.$route.fullPath === '/NewPlatform/News') {
       this.activeNum = 1;
+    } else if (this.$route.fullPath === '/NewPlatform/Share/Institute') {
+      this.activeNum = 1;
     } else if (this.$route.fullPath === '/NewPlatform/NewService') {
       this.activeNum = 2;
     } else {