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 }} + + +

编号:{{ item.identifier }}

-

+ v-if="item.identifier" + >编号:{{ item.identifier }}

+ - -

+ +
@@ -118,13 +122,17 @@ export default { .item-box { position: relative; - width: 20.5%; + width: 100%; background: #fff; - margin-right: 6%; border-radius: 4px; - margin-bottom: 40px; + margin-bottom: 10px; padding: 10px; - padding-bottom: 60px; +} + +.item-box .title{ + display: flex; + flex-wrap: nowrap; + justify-content: space-between; } .margin-0 { diff --git a/src/components/SettledEnterprise/SettledEnterprise.vue b/src/components/SettledEnterprise/SettledEnterprise.vue index f4c1fea..4a4735d 100644 --- a/src/components/SettledEnterprise/SettledEnterprise.vue +++ b/src/components/SettledEnterprise/SettledEnterprise.vue @@ -1,10 +1,10 @@ @@ -127,7 +142,8 @@ export default { diff --git a/src/views/NewPlatform/Children/Core.vue b/src/views/NewPlatform/Children/Core.vue index ecf8aea..b6c36b4 100644 --- a/src/views/NewPlatform/Children/Core.vue +++ b/src/views/NewPlatform/Children/Core.vue @@ -36,7 +36,7 @@
科技资源共享服务平台
知识产权与技术转移转化服务平台
-
知识培训与科技人才服务平台
+
科技人才服务平台
diff --git a/src/views/NewPlatform/Children/Develop.vue b/src/views/NewPlatform/Children/Develop.vue index 19e844f..9611ca1 100644 --- a/src/views/NewPlatform/Children/Develop.vue +++ b/src/views/NewPlatform/Children/Develop.vue @@ -14,7 +14,7 @@ diff --git a/src/views/NewPlatform/Children/Transfer.vue b/src/views/NewPlatform/Children/Transfer.vue index 61cb88d..837ded1 100644 --- a/src/views/NewPlatform/Children/Transfer.vue +++ b/src/views/NewPlatform/Children/Transfer.vue @@ -70,6 +70,7 @@ export default { list: [], achList: [], fruitIpt: '', + time: 10000, }; }, watch: { @@ -93,8 +94,9 @@ export default { const params = { param: { model: 0 } }; const res = await selModel(params); const { code, mst, data } = res.data; + console.log('data: ', data); if (code === 200) { - this.list = data; + this.list = data.list; for (var i = 0; i < this.list.length; i++) { this.list[i].isActive = false; } @@ -141,7 +143,7 @@ export default { height: auto; padding: 0 20px; width: 82%; - margin: 40px auto; + margin: 40px auto 15px; line-height: 44px; } diff --git a/src/views/NewPlatform/Children/components/SenNav.vue b/src/views/NewPlatform/Children/components/SenNav.vue index ac4048a..8448bb7 100644 --- a/src/views/NewPlatform/Children/components/SenNav.vue +++ b/src/views/NewPlatform/Children/components/SenNav.vue @@ -26,7 +26,7 @@ export default { url: '/NewPlatform/Transfer', }, { - title: '知识培训与科技人才服务平台', + title: '科技人才服务平台', url: '/NewPlatform/Develop', }, ], diff --git a/src/views/Policy/components/PolicyList.vue b/src/views/Policy/components/PolicyList.vue index 7a2486d..6c1f654 100644 --- a/src/views/Policy/components/PolicyList.vue +++ b/src/views/Policy/components/PolicyList.vue @@ -8,30 +8,30 @@
- +
国家 山西省 山西省综改区 太原市 - - - - 标题 - 地区 - 发布部门 - - - + + + 主题词 + 地区 + 发布部门 + + + +