banner图调整

rest/project.http

@@ -40,12 +40,15 @@ POST {{tall}}/users/signin
 
 ### 根据团队id查看研发团队相关信息
 
-POST {{greenvalley}}/user/userSer
+POST {{greenvalley}}/Business/FrontSearchCompany
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}
 
 {
   "param": {
-
+    "pageNum": 1,
+    "pageSize": 5,
+    "type": 2,
+    "typeOfPlatform": 2,
   }
 }

src/common/platform.styl

@@ -37,7 +37,7 @@
 
 .top-content {
   float: right;
-  margin: 70px 0;
+  margin: 30px 0;
   margin-right: 12%;
   width: 62%;
   padding: 0;
@@ -94,7 +94,7 @@
 .bottom-content {
   position: relative;
   float: right;
-  margin: 100px 0;
+  margin: 40px 0;
   width: 79%;
 }
 

src/components/Banner/Banner.vue

@@ -56,10 +56,9 @@ export default {
 <style lang="stylus" scoped>
 .head {
   background: white;
-  // max-height: 440px;
   overflow: hidden;
   position: relative;
-  height: 170px;
+  // height: 170px;
 }
 
 #banner-box {

src/components/Rotation/Rotation.vue

@@ -47,7 +47,6 @@ export default {
 <style lang="stylus">
 .head {
   background: white;
-  // max-height: 440px;
   overflow: hidden;
   position: relative;
 }

src/components/SettledEnterprise/SettledEnterprise.vue

@@ -1,27 +1,47 @@
 <template>
   <div class="fast-box">
     <div class="con-box" id="bobaodiv">
-      <div :key="0 + `${i}`" class="ent-box-div" v-for="(item, i) in lists">
-        <div class="ent-box">
+      <div
+        :key="0 + `${i}`"
+        @click="openProfile(item.company,item.introduce)"
+        class="ent-box-div"
+        v-for="(item, i) in lists"
+      >
+        <div class="ent-box pointer">
           <p class="ent-index">{{ i + 1 }}</p>
           <span class="ent-name" style="margin-left: 50px">{{ item.company }}</span>
           <span class="ent-mainBusiness" style="margin-left: 50px">{{ item.mainBusiness }}</span>
         </div>
       </div>
-      <div :key="j" class="ent-box-div" v-for="(item, j) in lists">
-        <div class="ent-box">
+      <div
+        :key="j"
+        @click="openProfile(item.company,item.introduce)"
+        class="ent-box-div"
+        v-for="(item, j) in lists"
+      >
+        <div class="ent-box pointer">
           <p class="ent-index">{{ j + 1 }}</p>
           <span class="ent-name" style="margin-left: 50px">{{ item.company }}</span>
           <span class="ent-mainBusiness" style="margin-left: 50px">{{ item.mainBusiness }}</span>
         </div>
+        <!-- <company-profile
+          :show-profile="showProfile"
+          @closeProfile="closeProfile"
+          v-if="showProfile"
+        />-->
       </div>
+      <company-profile :show-profile="showProfile" @closeProfile="closeProfile" v-if="showProfile" />
     </div>
   </div>
 </template>
 
 <script>
+import { mapMutations } from 'vuex';
+import CompanyProfile from '../Introduce/CompanyProfile.vue';
+
 export default {
   name: 'SettledEnterprise',
+  components: { CompanyProfile },
   props: {
     lists: {
       type: Array,
@@ -40,6 +60,7 @@ export default {
       rollRestTime: 500,
       rollTime: 10,
       length: 0,
+      showProfile: false,
     };
   },
 
@@ -50,6 +71,8 @@ export default {
     this.scrollBox();
   },
   methods: {
+    ...mapMutations('home', ['setProfile']),
+
     scrollBox() {
       /*
        * 启动播报滚动事件
@@ -95,6 +118,22 @@ export default {
         }, that.rollTime);
       }
     },
+
+    // 介绍
+    openProfile(title, description) {
+      if (!description) return;
+      this.setProfile(null);
+      const profile = {
+        title,
+        description,
+      };
+      this.setProfile(profile);
+      this.showProfile = true;
+    },
+
+    closeProfile() {
+      this.showProfile = false;
+    },
   },
 };
 </script>

src/plugins/ant-design-vue.js

@@ -40,6 +40,7 @@ import {
   Tooltip,
   Steps,
   Divider,
+  Card,
 } from 'ant-design-vue';
 import { ConfigProvider } from 'ant-design-vue';
 Vue.component(ConfigProvider.name, ConfigProvider);
@@ -74,6 +75,7 @@ Vue.use(Breadcrumb);
 Vue.use(Tooltip);
 Vue.use(Steps);
 Vue.use(Divider);
+Vue.use(Card);
 
 Vue.prototype.$message = message;
 Vue.prototype.$notification = notification;

src/router/index.js

@@ -248,6 +248,13 @@ const routes = [
         component: () =>
           import(/* webpackChunkName: "cooperative-enterprise" */ 'views/IncubationPlatform/Children/place/VirtualSpace.vue'),
       },
+      // 统计信息填报
+      {
+        path: '/IncubationPlatform/MakerSpace/InformationFilling',
+        name: 'InformationFilling',
+        component: () =>
+          import(/* webpackChunkName: "cooperative-enterprise" */ 'views/IncubationPlatform/Children/place/InformationFilling.vue'),
+      },
     ],
   },
   // 购物车

src/views/About/Children/Introduce.vue

@@ -7,7 +7,7 @@
     <banner :show-page="showPage" />
     <div class="inner">
       <div class="white my-5 d-flex flex-nowrap">
-        <img src="~assets/gywm01.png" />
+        <img src="~assets/gywm01.jpg" />
         <div class="d-flex flex-column pa-5">
           <img class="mb-3" src="~assets/gywm02.png" style="width:96px;height:41px" />
           <rich-text :title="title" />

src/views/IncubationPlatform/Children/place/EntitySpace.vue

@@ -8,7 +8,11 @@
       <banner :show-page="49" />
       <!-- <add-model :value="2" class="add-mol" style="height: 32px" /> -->
       <settled-model :type-num="1" class="add-mol" ref="childModel" style="height: 32px" />
-      <a-button class="set-mol" type="primary">统计信息填报</a-button>
+      <a-button
+        @click="$router.push('/IncubationPlatform/MakerSpace/InformationFilling')"
+        class="set-mol"
+        type="primary"
+      >统计信息填报</a-button>
 
       <!-- <div class="top-title">实体众创空间</div>
       <div class="top-content">
@@ -308,25 +312,25 @@ export default {
 
 .add-mol {
   position: absolute;
-  bottom: 15%;
-  left: 20%;
+  bottom: 7%;
+  left: 25%;
 }
 
 .set-mol {
   position: absolute;
-  bottom: 15%;
-  left: 28%;
+  bottom: 7%;
+  left: 33%;
 }
 
 @media only screen and (max-width: 1500px) {
   .set-mol {
-    left: 30%;
+    left: 35%;
   }
 }
 
 @media only screen and (max-width: 950px) {
   .set-mol {
-    left: 35%;
+    left: 40%;
   }
 }
 

src/views/IncubationPlatform/Children/place/InformationFilling.vue

@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <h-nav />
+    <div class="inner my-1">
+      <bread-crumb :arr="arr" />
+    </div>
+    <div class="inner">
+      <div style="border: 1px solid #e8e8e8;">
+        <div class="white" id="custom-mount" style="min-height: 600px"></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import HNav from '../../components/HNav.vue';
+import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
+import WebOfficeSDK from '@/assets/js/web-office-sdk-v1.1.2.es.js';
+
+export default {
+  name: 'InformationFilling',
+  components: { HNav, BreadCrumb },
+  data() {
+    return {
+      arr: [
+        { name: '孵化平台', url: '/IncubationPlatform/MakerSpace' },
+        { name: '众创空间', url: '/IncubationPlatform/MakerSpace' },
+        { name: '统计信息填报', url: '' },
+      ],
+    };
+  },
+
+  mounted() {
+    this.mountWps();
+  },
+
+  methods: {
+    /**
+     * 加载wps页面
+     * @param {string} url 服务端返回的wps在线文档路径
+     */
+    mountWps() {
+      console.log('加载wps页面');
+      const url =
+        'https://wwo.wps.cn/office/s/1355345986792329216?_w_appid=09d77d2eb919438e8ae4f2a9ec6ec8dd&_w_signature=T4EflYvQpv%2B812a1KupxB0soBPg%3D&_w_token=eyJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2MTE5NzI4NjcsInN1YiI6IjEyMTc2MjIzODk3ODYwMjE4ODgiLCJhdXRoSWQiOiIxMjE3NjIyMzg5Nzg2MDIxODg5IiwiZXhwIjoxNjIwNjEyODY3fQ.6IaYzzreq4PjaSuw2HYA7cXkWLrPWijS5qg7fG5g5T4';
+      var demo = WebOfficeSDK.config({
+        mount: document.getElementById('custom-mount'),
+        url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.inner {
+  margin: 10px auto 15px;
+}
+</style>

src/views/IncubationPlatform/Children/place/VirtualSpace.vue

@@ -261,25 +261,25 @@ export default {
 
 .add-mol {
   position: absolute;
-  bottom: 15%;
-  left: 20%;
+  bottom: 7%;
+  left: 25%;
 }
 
 .set-mol {
   position: absolute;
-  bottom: 15%;
-  left: 28%;
+  bottom: 7%;
+  left: 33%;
 }
 
 @media only screen and (max-width: 1500px) {
   .set-mol {
-    left: 30%;
+    left: 35%;
   }
 }
 
 @media only screen and (max-width: 950px) {
   .set-mol {
-    left: 35%;
+    left: 40%;
   }
 }
 </style>

src/views/NewPlatform/Children/Core.vue

@@ -32,13 +32,12 @@
       <div class="bottom-content">
         <div :style="{ height: '500px' }" id="treeChart"></div>
         <div class="absolute-box" style="top: 2.5%" v-if="showDiv">
-          <div class="case"></div>科技资源共享服务平台
-        </div>
-        <div class="absolute-box" style="top: 39%; height: 33%" v-if="showDiv">
-          <div class="case"></div>知识产权与技术转移转化服务平台
-        </div>
-        <div class="absolute-box" style="top: 72%; height: 25%" v-if="showDiv">
-          <div class="case"></div>知识培训与科技人才服务平台
+          <div class="case"></div>
+          <div class="d-flex flex-column">
+            <div class="mb-8">科技资源共享服务平台</div>
+            <div class="mb-8">知识产权与技术转移转化服务平台</div>
+            <div>知识培训与科技人才服务平台</div>
+          </div>
         </div>
       </div>
     </div>
@@ -219,7 +218,7 @@ export default {
 .absolute-box {
   position: absolute;
   right: 0;
-  height: 36%;
+  height: 100%;
   // border: 1px solid #ccc;
   // box-shadow: 0 0 6px rgba(19, 172, 196, 0.6);
   width: 70px;

src/views/NewPlatform/Children/ShareChild/Institute.vue

@@ -8,8 +8,8 @@
     <div class="inner ins-box">
       <p class="font-bold-24 item-title" v-if="description">{{ shareName }}</p>
       <div class="font-20" v-if="description">{{ description }}</div>
-      <p class="font-bold-24 item-title" v-if="direction">研究方向：</p>
-      <div class="font-20" v-if="direction" v-dompurify-html="direction"></div>
+      <p class="font-bold-24 item-title" v-if="direction">科研条件：</p>
+      <div class="font-20" v-dompurify-html="direction" v-if="direction"></div>
       <p class="font-bold-24 item-title">科研能力：</p>
       <div class="font-20">
         <p>可做实验：{{ experiments }}</p>
@@ -18,13 +18,21 @@
       </div>
       <p class="font-bold-24 item-title" v-if="list[0]">设备列表</p>
       <div class="d-flex flex-wrap" v-if="list[0]">
-        <div :class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :key="index" class="item-box mb-8" v-for="(item, index) in list">
+        <div
+          :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
+          :key="index"
+          class="item-box mb-8"
+          v-for="(item, index) in list"
+        >
           <img :src="item.visitLocation" style="height: 220px; width: 100%" />
           <p class="font-24 my-4">{{ item.name }}</p>
           <p @click="jump(item.id)" class="font-16 baseColor item-more">了解更多→</p>
         </div>
       </div>
-      <p class="font-bold-24 item-title" v-if="teamHead.name !== '' || teamHead.name !== null">人才团队带头人情况</p>
+      <p
+        class="font-bold-24 item-title"
+        v-if="teamHead.name !== '' || teamHead.name !== null"
+      >人才团队带头人情况</p>
       <div class="d-flex" v-if="teamHead.name !== '' || teamHead.name !== null">
         <div class="header-box" style="flex: 1">
           <p style="background: #11b7ce; color: #fff">姓名</p>
@@ -39,7 +47,11 @@
           <p>工作单位</p>
           <p>研究方向</p>
         </div>
-        <div class="header-box" style="flex: 5; background: #fff" v-if="teamHead.name !== '' || teamHead.name !== null">
+        <div
+          class="header-box"
+          style="flex: 5; background: #fff"
+          v-if="teamHead.name !== '' || teamHead.name !== null"
+        >
           <p style="border-bottom: 1px solid #eee">{{ teamHead.name }}</p>
           <p>
             <span v-if="teamHead.gender - 0 === 1">男</span>