From 6cc899421a6474001eba1e755cd053ca0d5963a4 Mon Sep 17 00:00:00 2001 From: lucky Date: Wed, 14 Jul 2021 11:08:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/gywm03.png | Bin 0 -> 1892 bytes src/components/HeadNav/HeadNav.vue | 16 +-- src/components/Introduce/Organ.vue | 108 ++++++++++++++++++ src/views/About/Children/Introduce.vue | 19 ++- src/views/About/Children/Organ.vue | 4 +- src/views/About/components/HNav.vue | 8 +- src/views/FirstPage/FirstPage.vue | 2 +- .../IncubationPlatform/components/HNav.vue | 8 +- src/views/NewPlatform/Children/Platform.vue | 2 +- src/views/NewPlatform/Children/Share.vue | 4 +- 10 files changed, 143 insertions(+), 28 deletions(-) create mode 100644 src/assets/gywm03.png create mode 100644 src/components/Introduce/Organ.vue diff --git a/src/assets/gywm03.png b/src/assets/gywm03.png new file mode 100644 index 0000000000000000000000000000000000000000..29da7cb291755846e31c482c0cf92160fe359365 GIT binary patch literal 1892 zcmV-q2b=hbP)tWNJc%=K^0 zcV@w$2jSk5QR>&#>51ox_Ll-+eE#$up!#q0kumDX>deG({68!XGRt2f1MHe#cr;S_ z^PZIGP6VMfzj$0L^J01FVFTv@z@O!270Mh$o9Zy`|P=EaQ)YQMD zhydaJ-HUO&n`CbX0EF`v*&Ux-2lo+x+^n?TZ^Os&n+vIPKqqf->Im_l1W8g*%KJrl z3II}($9KY`kmQ#E4{1fN4>|5fl&y`r7oz?(T4xXnlFnPk`Y8ZX-f7hNizdEjhmM}n zTD|Rrb>ZJ@d~OINpgaIz^UuQbIZkchF~?xz4F`LY@)Y#i$}+ zqyT`!lI;?mlfojTe<;#5E1kl~!2&BY6E_ccIPlK z!P9OXauVd}^Kh>V#^1x40sqz}zB|_Hge-%D00?@>fIy|_pa2xf$7HX~*vzm1$SP!1 z0FXg4CAy;Xw%X zIafvc0f>sDSm|Lt$c+HO)tT@aHUd(k0Hc0~#13PRg^Q)c5G znhh)U$4weKFBqc+)IYYGcr09&7nd`m^>Gw2qN`w=iN9Bzy{0H4347%&Wn+O7gDUB z9!RUwzAXiXGCVHk8l*E=&JB|T?ASr+=WQu!%sP6P^%l#MV}DZT7#jDw2>L7JVYDgK z%~8%RWS|rU_U82XNf-8WEq$8{Kr#V11MkkE!H_bu0Q4;YvYyQDqyVs0gffr7%`df% zz74g~!vK)0iF@c~L%lkioka*Q3)I)0*-LT!GSJLdApk@Kre;k=02sZ|#<2-bZ@GLj zpm&gDB!Q(c($HCq9NISn&d=0R0OT166~q#1PymnzW3_QRP8~7v;#y823e!W5qrI0y zXr!tn$E8?f6VKWPPU;;xkdaARcBerAlE!oo83`TKm9n{Yem^_n8nk~()*b-N0dW4< z!h{9M<~B?$kSH*eJ%`C0P^A$oDluJ&c$7RBHxW8blX61uNC03cvzk66QJLtG0Puo? zp9rE}MJHlKkskUUhH=%81B(`7&oLpriyYeb8)HuLDuc!o@_m^LWRyq)g@6qm6Xuke z8Alif07Q18s<8zdioi(Vw9GCy(|EIStS7M6#+nL3v9y|8vtqswE>_3pk@oy zynGV@4FEM;pyuV92xtJP*#b2$zvU57_2(^HZJ)f~hHi!~4FJNb4FH?rW));M08}v6 eX1u!90Q?Vh?QDe1$}OD$0000 +
+
+
+
+
+ + + + + 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; }