diff --git a/src/assets/about/title6.png b/src/assets/about/title6.png new file mode 100644 index 0000000..c49d6e6 Binary files /dev/null and b/src/assets/about/title6.png differ diff --git a/src/assets/about/title7.png b/src/assets/about/title7.png new file mode 100644 index 0000000..44bdbc9 Binary files /dev/null and b/src/assets/about/title7.png differ diff --git a/src/assets/about/title8.png b/src/assets/about/title8.png new file mode 100644 index 0000000..317af39 Binary files /dev/null and b/src/assets/about/title8.png differ diff --git a/src/assets/newPlatform/newPlatform1.jpg b/src/assets/newPlatform/newPlatform1+.jpg similarity index 100% rename from src/assets/newPlatform/newPlatform1.jpg rename to src/assets/newPlatform/newPlatform1+.jpg diff --git a/src/assets/newPlatform/newPlatform1.png b/src/assets/newPlatform/newPlatform1.png new file mode 100644 index 0000000..4bfee82 Binary files /dev/null and b/src/assets/newPlatform/newPlatform1.png differ diff --git a/src/common/portrait.styl b/src/common/portrait.styl index a124bcb..e61c80d 100644 --- a/src/common/portrait.styl +++ b/src/common/portrait.styl @@ -112,6 +112,11 @@ padding-bottom: 40px; } +.py-12{ + padding-top: 60px; + padding-bottom: 60px; +} + // margin .ma-2 { margin: 8px; @@ -395,6 +400,10 @@ img{ font-weight: bold; } +.text-indent-2{ + text-indent: 2em +} + @media only screen and (max-width: 1400px) { .font-big{ font-size: 45px; diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue index ec790e1..51e3868 100644 --- a/src/components/HeadNav/HeadNav.vue +++ b/src/components/HeadNav/HeadNav.vue @@ -79,6 +79,10 @@ export default { title: '研究院', url: '/NewPlatform/Index#mao1', }, + { + title: '组织架构', + url: '/NewPlatform/Index#mao5', + }, { title: '创新资源平台', url: '/NewPlatform/Index#mao2', @@ -120,21 +124,21 @@ export default { url: '/Industry/Index', children: [ { - title: '产业创新联盟', + title: '产业服务', url: '/Industry/Index#mao1', }, { - title: '产业服务', + title: '合作伙伴', + url: '/Industry/Index#mao2', + }, + { + title: '产业创新联盟', url: '/Industry/Index#mao3', }, // { // title: '产品展示', // url: '/Industry/Products', // }, - { - title: '合作伙伴', - url: '/Industry/Index#mao4', - }, // { // title: '衍生企业', // url: '/Industry/Enterprise', diff --git a/src/components/PlatformList/Fruit.vue b/src/components/PlatformList/Fruit.vue index 22865f5..ef0516c 100644 --- a/src/components/PlatformList/Fruit.vue +++ b/src/components/PlatformList/Fruit.vue @@ -7,16 +7,20 @@ class="item-box" v-for="(item, index) in list" > -
{{ item.name }}
-
+ {{ item.name }}
+
+ v-if="item.identifier" + >编号:{{ item.identifier }}
{{ v.name }}
{{ modelIntro }}
@@ -327,16 +339,16 @@ export default { document.getElementById('mao1').scrollIntoView(true) }) } - if(hash === '#mao3'){ + if(hash === '#mao2'){ this.$nextTick(() => { - this.changeIndex(2) - document.getElementById('mao3').scrollIntoView(true) + this.changeIndex(1) + document.getElementById('mao2').scrollIntoView(true) }) } - if(hash === '#mao4'){ + if(hash === '#mao3'){ this.$nextTick(() => { this.changeIndex(3) - document.getElementById('mao4').scrollIntoView(true) + document.getElementById('mao3').scrollIntoView(true) }) } }, @@ -502,6 +514,10 @@ export default { margin: 0 auto; } +.w-1500.title{ + margin-bottom: 30px +} + .item-intro{ text-align: left; // text-indent: 2em; @@ -739,4 +755,14 @@ export default { position: relative; top: -100px; } + +.organize-bor { + // padding-top: 30px; + // padding-bottom: 30px; + + .contact{ + font-size: 18px; + text-align: right; + } +} diff --git a/src/views/Knowledge/Knowledge.vue b/src/views/Knowledge/Knowledge.vue index eedea3c..4f76d3c 100644 --- a/src/views/Knowledge/Knowledge.vue +++ b/src/views/Knowledge/Knowledge.vue @@ -32,19 +32,34 @@