From cd794526ccfe7910295b2f65d2f9c49cdf6e67f3 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Wed, 20 Jan 2021 12:19:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HeadNav/HeadNav.vue            |   2 +-
 .../SettledEnterprise/SettledEnterprise.vue   | 213 ++++++++++++++++++
 .../IncubationPlatform/Children/Partner.vue   |   2 +-
 .../Children/place/EntitySpace.vue            |  22 +-
 .../Children/place/VirtualSpace.vue           |  12 +-
 src/views/NewPlatform/Children/Service.vue    |   2 +-
 src/views/NewPlatform/components/HNav.vue     |   2 +-
 7 files changed, 230 insertions(+), 25 deletions(-)
 create mode 100644 src/components/SettledEnterprise/SettledEnterprise.vue

diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue
index ce87d73..5df909d 100644
--- a/src/components/HeadNav/HeadNav.vue
+++ b/src/components/HeadNav/HeadNav.vue
@@ -89,7 +89,7 @@ export default {
               url: '/NewPlatform/News',
             },
             {
-              title: '创新服务',
+              title: '知识培训与科技人才服务平台',
               url: '/NewPlatform/NewService',
             },
           ],
diff --git a/src/components/SettledEnterprise/SettledEnterprise.vue b/src/components/SettledEnterprise/SettledEnterprise.vue
new file mode 100644
index 0000000..bd4cc7f
--- /dev/null
+++ b/src/components/SettledEnterprise/SettledEnterprise.vue
@@ -0,0 +1,213 @@
+<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">
+          <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">
+          <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>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SettledEnterprise',
+  props: {
+    lists: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      height: '',
+      width: '',
+      liHeight: '',
+      dataList: [
+        {
+          a: '1.面部对侧',
+          b: '正常',
+          c: '0分',
+        },
+        {
+          a: '2.上肢',
+          b: '中度无力',
+          c: '1分',
+        },
+        {
+          a: '3.语言运动',
+          b: '正常',
+          c: '0分',
+        },
+        {
+          a: '4.语言感觉',
+          b: '异常',
+          c: '1分',
+        },
+        {
+          a: '5.眼球凝视',
+          b: '一测活动困难',
+          c: '1分',
+        },
+      ],
+      oMarquee: null, //播报的容器
+      BBLineH: null,
+      BBScrollAmount: 1,
+      BBLineCount: 5,
+      rollRestTime: 500,
+      rollTime: 10,
+    };
+  },
+  mounted() {
+    this.BBLineH = document.getElementsByClassName('fast-box')[0].offsetHeight * 0.166;
+    this.scrollBox();
+  },
+  methods: {
+    scrollBox() {
+      /*
+       * 启动播报滚动事件
+       */
+      const that = this;
+
+      window.onload = function() {
+        // BBAllTime = 0;
+        that.oMarquee = document.getElementById('bobaodiv'); //滚动对象
+        window.setTimeout(function() {
+          that.run();
+        }, that.rollRestTime);
+      };
+    },
+    /*
+     * 播报滚动事件主逻辑
+     */
+    run() {
+      const that = this;
+      if (that.BBScrollAmount == 0) {
+        //若单次滚动的距离为0，则开始下一次监听，不计数
+        window.setTimeout(function() {
+          that.run();
+        }, that.rollTime);
+        return;
+      }
+      if (that.oMarquee.scrollTop >= that.BBLineCount * that.BBLineH) {
+        //滚动完一次数据后，复位
+        that.oMarquee.scrollTop = 0;
+      }
+      that.oMarquee.scrollTop += that.BBScrollAmount;
+      if (that.oMarquee.scrollTop % that.BBLineH < 1 && that.oMarquee.scrollTop > 0) {
+        window.setTimeout(function() {
+          that.run();
+        }, that.rollRestTime);
+      } else {
+        window.setTimeout(function() {
+          that.run();
+        }, that.rollTime);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.ent-box-div {
+  width: 100%;
+  margin-right: 11%;
+  position: relative;
+  height: 76px;
+}
+
+.ent-box {
+  width: 100%;
+  // margin-right: 11%;
+  position: relative;
+  height: 56px;
+  line-height: 56px;
+  padding: 0 14px;
+  background: #FFFFFF;
+  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+  opacity: 1;
+  // margin-bottom: 20px;
+}
+
+.ent-index {
+  width: 28px;
+  position: absolute;
+  top: 14px;
+  line-height: 28px;
+  text-align: center;
+  font-size: 20px;
+  font-family: Segoe UI;
+  color: #FFFFFF;
+  height: 28px;
+  border-radius: 50%;
+  background: #13ACC4;
+  margin-bottom: 0;
+}
+
+.ent-name {
+  position: absolute;
+  left: 0;
+  width: 30%;
+  height: 24px;
+  top: 50%;
+  margin-top: -12px;
+  font-size: 22px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  line-height: 24px;
+  color: rgba(0, 0, 0, 0.65);
+  opacity: 1;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+}
+
+.ent-mainBusiness {
+  position: absolute;
+  left: 35%;
+  width: 20%;
+  height: 24px;
+  top: 50%;
+  margin-top: -12px;
+  font-size: 22px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  line-height: 24px;
+  color: rgba(0, 0, 0, 0.65);
+  opacity: 1;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+}
+
+.fast-box {
+  position: relative;
+  height: 456px;
+}
+
+.con-box {
+  top: 0;
+  left: 0;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+
+  div {
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/views/IncubationPlatform/Children/Partner.vue b/src/views/IncubationPlatform/Children/Partner.vue
index 98e6335..df59960 100644
--- a/src/views/IncubationPlatform/Children/Partner.vue
+++ b/src/views/IncubationPlatform/Children/Partner.vue
@@ -27,7 +27,7 @@ export default {
       typeOfPlatform: '孵化平台',
       arr: [
         { name: '孵化平台', url: '/IncubationPlatform/MakerSpace' },
-        { name: '合作伙伴', url: '' },
+        { name: '第三方专业机构', url: '' },
       ],
     };
   },
diff --git a/src/views/IncubationPlatform/Children/place/EntitySpace.vue b/src/views/IncubationPlatform/Children/place/EntitySpace.vue
index 08f0891..01eba3c 100644
--- a/src/views/IncubationPlatform/Children/place/EntitySpace.vue
+++ b/src/views/IncubationPlatform/Children/place/EntitySpace.vue
@@ -95,25 +95,13 @@
         <div style="margin-left: 40px">入驻企业名录</div>
       </div>
       <div class="center-content">
-        <div :key="index" class="ent-box" v-for="(item, index) in lists">
+        <settled-enterprise :lists="lists" />
+        <!-- <div :key="index" class="ent-box" v-for="(item, index) in lists">
           <p class="ent-index">{{ index + 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>
-      <!-- <div class="reg-box">
-        <settled-model style="float: left" :type-num="1" />
-        <a-pagination
-          :current="current"
-          :page-size="pageSize"
-          :total="lists.length"
-          @change="onShowSizeChange"
-          class="pagination"
-          show-less-items
-          show-quick-jumper
-          v-show="lists.length > 18"
-        />
-      </div>-->
     </div>
   </div>
 </template>
@@ -124,10 +112,12 @@ import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
 import AddModel from './../../components/AddModel.vue';
 import SettledModel from 'components/Introduce/SettledModel.vue';
 import Banner from 'components/Banner/Banner.vue';
+import SettledEnterprise from 'components/SettledEnterprise/SettledEnterprise.vue';
+
 import { searchEnt } from 'config/api';
 export default {
   name: 'EntitySpace',
-  components: { HNav, BreadCrumb, AddModel, SettledModel, Banner },
+  components: { HNav, BreadCrumb, AddModel, SettledModel, Banner, SettledEnterprise },
   data() {
     return {
       title: '实体众创空间',
diff --git a/src/views/IncubationPlatform/Children/place/VirtualSpace.vue b/src/views/IncubationPlatform/Children/place/VirtualSpace.vue
index ceb002c..7de924e 100644
--- a/src/views/IncubationPlatform/Children/place/VirtualSpace.vue
+++ b/src/views/IncubationPlatform/Children/place/VirtualSpace.vue
@@ -7,7 +7,7 @@
     <div class="top-box">
       <banner :show-page="48" />
       <add-model :value="3" class="add-mol" style="height: 32px" />
-      <settled-model class="set-mol" :type-num="0" />
+      <settled-model :type-num="0" class="set-mol" />
     </div>
     <!-- <div class="center-box">
       <div class="center-title">
@@ -34,18 +34,19 @@
         </div>
       </div>
       <add-model :value="3" class="center-btn" style="height: 32px" />
-    </div> -->
+    </div>-->
     <div class="center-box c-box" style="margin-bottom: 160px">
       <div class="center-title">
         <div class="circular"></div>
         <div style="margin-left: 40px">入驻企业名录</div>
       </div>
       <div class="center-content">
-        <div :key="index" class="ent-box" v-for="(item, index) in lists">
+        <settled-enterprise :lists="lists" />
+        <!-- <div :key="index" class="ent-box" v-for="(item, index) in lists">
           <p class="ent-index">{{ index + 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>
     </div>
   </div>
@@ -58,10 +59,11 @@ import AddModel from './../../components/AddModel.vue';
 import SettledModel from 'components/Introduce/SettledModel.vue';
 import Banner from 'components/Banner/Banner.vue';
 import { searchEnt } from 'config/api';
+import SettledEnterprise from 'components/SettledEnterprise/SettledEnterprise.vue';
 
 export default {
   name: 'VirtualSpace',
-  components: { HNav, BreadCrumb, AddModel, SettledModel, Banner },
+  components: { HNav, BreadCrumb, AddModel, SettledModel, Banner, SettledEnterprise },
   data() {
     return {
       title: '虚拟众创空间',
diff --git a/src/views/NewPlatform/Children/Service.vue b/src/views/NewPlatform/Children/Service.vue
index 73602c3..06926f0 100644
--- a/src/views/NewPlatform/Children/Service.vue
+++ b/src/views/NewPlatform/Children/Service.vue
@@ -47,7 +47,7 @@ export default {
       typeOfPlatform: '创新平台',
       arr: [
         { name: '创新平台', url: '/NewPlatform/NewCore' },
-        { name: '创新服务', url: '/NewPlatform/NewService' },
+        { name: '知识培训与科技人才服务平台', url: '/NewPlatform/NewService' },
       ],
       showPage: 33,
       list: [],
diff --git a/src/views/NewPlatform/components/HNav.vue b/src/views/NewPlatform/components/HNav.vue
index f7511de..e1f3258 100644
--- a/src/views/NewPlatform/components/HNav.vue
+++ b/src/views/NewPlatform/components/HNav.vue
@@ -26,7 +26,7 @@ export default {
           url: '/NewPlatform/News',
         },
         {
-          title: '创新服务',
+          title: '知识培训与科技人才服务平台',
           url: '/NewPlatform/NewService',
         },
       ],