页面展示bug修改

src/components/HeadNav/HeadNav.vue

@@ -67,10 +67,10 @@ export default {
               title: '公司介绍',
               url: '/About/Introduce',
             },
-            {
+            // {
-              title: '组织机构',
+            //   title: '组织机构',
-              url: '/About/Organ',
+            //   url: '/About/Organ',
-            },
+            // },
             {
               title: '合作伙伴',
               url: '/About/Partner',
@@ -120,10 +120,10 @@ export default {
               title: '创业服务',
               url: '/IncubationPlatform/Services',
             },
-            {
+            // {
-              title: '产品展示',
+            //   title: '产品展示',
-              url: '/IncubationPlatform/Products',
+            //   url: '/IncubationPlatform/Products',
-            },
+            // },
             {
               title: '交流社区',
               url: '/IncubationPlatform/Community',

src/components/Introduce/Organ.vue

@@ -0,0 +1,108 @@
+<template>
+  <div>
+    <div class="white">
+      <div :style="{ height: '500px' }" id="treeCharts"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Organ',
+  data() {
+    return {
+      title: '关于我们-组织机构',
+      showPage: 12,
+      arr: [
+        { name: '关于我们', url: '/About/Introduce' },
+        { name: '组织机构', url: '' },
+      ],
+      treedata: [
+        {
+          //一定一定要注意这里有[]
+          name: '绿谷公司',
+          children: [
+            { name: '行政事业部' },
+            {
+              name: '创新事业部',
+              children: [
+                {
+                  name: '协同创新中心',
+                  collapsed: false,
+                  children: [
+                    { name: '科技资源开放共享服务平台' },
+                    { name: '知识产权与技术转移转化服务平台' },
+                    { name: '知识培训服务平台' },
+                    { name: '科技创新人才服务平台' },
+                  ],
+                },
+              ],
+            },
+            {
+              name: '孵化事业部',
+              collapsed: false,
+              children: [
+                { name: '虚拟空间' },
+                {
+                  name: '实体空间',
+                  collapsed: false,
+                  children: [{ name: '办公场所' }, { name: '公共实验室' }, { name: '中试基地' }],
+                },
+              ],
+            },
+            {
+              name: '产业事业部',
+              children: [{ name: '产业技术创新联盟' }],
+            },
+          ],
+        },
+      ],
+    };
+  },
+
+  mounted() {
+    this.showChart();
+  },
+  methods: {
+    showChart() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = this.$echarts.init(document.getElementById('treeCharts'));
+      // 指定图表的配置项和数据
+      var option = {
+        tooltip: {
+          trigger: 'item',
+          triggerOn: 'mousemove',
+        },
+        series: [
+          {
+            type: 'tree',
+            data: this.treedata,
+            top: '-5%',
+            left: '25%',
+            bottom: '0%',
+            right: '25%',
+            symbolSize: 7,
+            lineStyle: { width: 1 },
+            itemStyle: { borderWidth: 3, borderColor: '#AACD06' },
+            label: { position: 'top', verticalAlign: 'middle', align: 'center', fontSize: 16 },
+            leaves: {
+              label: {
+                position: 'right',
+                verticalAlign: 'middle',
+                align: 'left',
+              },
+            },
+            expandAndCollapse: true,
+            animationDuration: 550,
+            animationDurationUpdate: 750,
+          },
+        ],
+      };
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped></style>

src/views/About/Children/Introduce.vue

@@ -13,15 +13,21 @@
     </div>
     <banner :show-page="showPage" />
     <div class="inner">
-      <div class="white my-5 d-flex flex-nowrap">
+      <div class="white mt-5 d-flex flex-row">
-        <img src="~assets/gywm01.jpg" style="height: 400px" />
+        <img src="~assets/gywm01.jpg" style="height: 400px;" />
+        <div class="d-flex flex-column">
           <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" />
           </div>
+          <div class="d-flex flex-column pa-5 white">
+            <img class="mb-3" src="~assets/gywm03.png" style="width: 96px; height: 41px" />
           </div>
         </div>
       </div>
+      <organ style="width: 100%" />
+    </div>
+  </div>
 </template>
 
 <script>
@@ -29,10 +35,11 @@ import Banner from 'components/Banner/Banner.vue';
 import HNav from './../components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
 import RichText from 'components/Introduce/RichText.vue';
+import Organ from 'components/Introduce/Organ.vue';
 
 export default {
   name: 'Introduce',
-  components: { Banner, HNav, BreadCrumb, RichText },
+  components: { Banner, HNav, BreadCrumb, RichText, Organ },
 
   // mounted() {
   //   window.addEventListener('scroll', this.handleScroll);

src/views/About/Children/Organ.vue

@@ -8,7 +8,7 @@
     <div class="inner">
       <div class="white">
         <!-- <rich-text :title="title" /> -->
-        <div :style="{ height: '500px' }" id="treeChart"></div>
+        <div :style="{ height: '500px' }" id="treeCharts"></div>
       </div>
     </div>
   </div>
@@ -80,7 +80,7 @@ export default {
   methods: {
     showChart() {
       // 基于准备好的dom，初始化echarts实例
-      var myChart = this.$echarts.init(document.getElementById('treeChart'));
+      var myChart = this.$echarts.init(document.getElementById('treeCharts'));
       // 指定图表的配置项和数据
       var option = {
         tooltip: {

src/views/About/components/HNav.vue

@@ -21,10 +21,10 @@ export default {
           title: '公司介绍',
           url: '/About/Introduce',
         },
-        {
+        // {
-          title: '组织机构',
+        //   title: '组织机构',
-          url: '/About/Organ',
+        //   url: '/About/Organ',
-        },
+        // },
         {
           title: '合作伙伴',
           url: '/About/Partner',

src/views/FirstPage/FirstPage.vue

@@ -113,7 +113,7 @@ export default {
         },
         {
           id: '06',
-          path: '/NewPlatform/Transfer',
+          path: '/Industry/Products',
           url: 'https://www.sxgreenvalley.com/gateway/greenvalley/uploads/2021-07-06/06.png',
         },
         // {

src/views/IncubationPlatform/components/HNav.vue

@@ -36,10 +36,10 @@ export default {
           title: '创业服务',
           url: '/IncubationPlatform/Services',
         },
-        {
+        // {
-          title: '产品展示',
+        //   title: '产品展示',
-          url: '/IncubationPlatform/Products',
+        //   url: '/IncubationPlatform/Products',
-        },
+        // },
         {
           title: '交流社区',
           url: '/IncubationPlatform/Community',

src/views/NewPlatform/Children/Platform.vue

@@ -149,7 +149,7 @@ export default {
   .btn {
     position: absolute;
     top: 23%;
-    left: 233px;
+    left: 253px;
   }
 }
 </style>

src/views/NewPlatform/Children/Share.vue

@@ -122,12 +122,12 @@ export default {
         const { code, mst, data } = res.data;
         if (code === 200) {
           if (num === 1) {
-            this.instrument = data;
+            this.instrument = data.list;
             for (let i = 0; i < this.instrument.length; i++) {
               this.instrument[i].isActive = false;
             }
           } else if (num === 2) {
-            this.laboratory = data;
+            this.laboratory = data.list;
             for (let i = 0; i < this.laboratory.length; i++) {
               this.laboratory[i].isActive = false;
             }