diff --git a/src/assets/gywm03.png b/src/assets/gywm03.png new file mode 100644 index 0000000..29da7cb Binary files /dev/null and b/src/assets/gywm03.png differ diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue index c117929..ee639dd 100644 --- a/src/components/HeadNav/HeadNav.vue +++ b/src/components/HeadNav/HeadNav.vue @@ -67,10 +67,10 @@ export default { title: '公司介绍', url: '/About/Introduce', }, - { - title: '组织机构', - url: '/About/Organ', - }, + // { + // title: '组织机构', + // url: '/About/Organ', + // }, { title: '合作伙伴', url: '/About/Partner', @@ -120,10 +120,10 @@ export default { title: '创业服务', url: '/IncubationPlatform/Services', }, - { - title: '产品展示', - url: '/IncubationPlatform/Products', - }, + // { + // title: '产品展示', + // url: '/IncubationPlatform/Products', + // }, { title: '交流社区', url: '/IncubationPlatform/Community', diff --git a/src/components/Introduce/Organ.vue b/src/components/Introduce/Organ.vue new file mode 100644 index 0000000..d5b4255 --- /dev/null +++ b/src/components/Introduce/Organ.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/views/About/Children/Introduce.vue b/src/views/About/Children/Introduce.vue index 428aad0..7637d84 100644 --- a/src/views/About/Children/Introduce.vue +++ b/src/views/About/Children/Introduce.vue @@ -13,13 +13,19 @@
-
- -
- - +
+ +
+
+ + +
+
+ +
+
@@ -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); diff --git a/src/views/About/Children/Organ.vue b/src/views/About/Children/Organ.vue index 7208f67..3f4e435 100644 --- a/src/views/About/Children/Organ.vue +++ b/src/views/About/Children/Organ.vue @@ -8,7 +8,7 @@
-
+
@@ -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: { diff --git a/src/views/About/components/HNav.vue b/src/views/About/components/HNav.vue index 520bc80..8f6add7 100644 --- a/src/views/About/components/HNav.vue +++ b/src/views/About/components/HNav.vue @@ -21,10 +21,10 @@ export default { title: '公司介绍', url: '/About/Introduce', }, - { - title: '组织机构', - url: '/About/Organ', - }, + // { + // title: '组织机构', + // url: '/About/Organ', + // }, { title: '合作伙伴', url: '/About/Partner', diff --git a/src/views/FirstPage/FirstPage.vue b/src/views/FirstPage/FirstPage.vue index 19e5187..ef5e63b 100644 --- a/src/views/FirstPage/FirstPage.vue +++ b/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', }, // { diff --git a/src/views/IncubationPlatform/components/HNav.vue b/src/views/IncubationPlatform/components/HNav.vue index d9b1dda..c095a77 100644 --- a/src/views/IncubationPlatform/components/HNav.vue +++ b/src/views/IncubationPlatform/components/HNav.vue @@ -36,10 +36,10 @@ export default { title: '创业服务', url: '/IncubationPlatform/Services', }, - { - title: '产品展示', - url: '/IncubationPlatform/Products', - }, + // { + // title: '产品展示', + // url: '/IncubationPlatform/Products', + // }, { title: '交流社区', url: '/IncubationPlatform/Community', diff --git a/src/views/NewPlatform/Children/Platform.vue b/src/views/NewPlatform/Children/Platform.vue index 9090e15..c15732d 100644 --- a/src/views/NewPlatform/Children/Platform.vue +++ b/src/views/NewPlatform/Children/Platform.vue @@ -149,7 +149,7 @@ export default { .btn { position: absolute; top: 23%; - left: 233px; + left: 253px; } } diff --git a/src/views/NewPlatform/Children/Share.vue b/src/views/NewPlatform/Children/Share.vue index 1c1b979..022f6e2 100644 --- a/src/views/NewPlatform/Children/Share.vue +++ b/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; }