diff --git a/src/components/FooterPage/FooterPage.vue b/src/components/FooterPage/FooterPage.vue index e45a69d..5a46ec0 100644 --- a/src/components/FooterPage/FooterPage.vue +++ b/src/components/FooterPage/FooterPage.vue @@ -40,9 +40,9 @@
-
- Copyright © 2020 The Project by - CCSENS. All Rights Reserved +
+ 晋ICP备 2021004314号-1 +
@@ -52,6 +52,12 @@ export default { data() { return { str: '头部导航栏' }; }, + + methods: { + jump() { + window.open('http://beian.miit.gov.cn/'); + }, + }, }; @@ -89,4 +95,8 @@ export default { text-align: center; line-height: 90px; } + +.openLink { + cursor: pointer; +} diff --git a/src/components/FooterPage/FriendShip.vue b/src/components/FooterPage/FriendShip.vue index 4cbfc4e..bdbcd3c 100644 --- a/src/components/FooterPage/FriendShip.vue +++ b/src/components/FooterPage/FriendShip.vue @@ -9,7 +9,12 @@
{{ str }} - {{ item.name }} + {{ item.name }}
@@ -49,7 +54,7 @@ export default { url: 'http://fgw.shanxi.gov.cn/', }, { - name: '太原市科技厅', + name: '太原市科技局', url: 'http://kjj.taiyuan.gov.cn/', }, { diff --git a/src/components/Introduce/InformationModel.vue b/src/components/Introduce/InformationModel.vue new file mode 100644 index 0000000..3ca8fc1 --- /dev/null +++ b/src/components/Introduce/InformationModel.vue @@ -0,0 +1,586 @@ + + + + + diff --git a/src/components/Introduce/PartnerShip.styl b/src/components/Introduce/PartnerShip.styl index 37de51d..8644d6e 100644 --- a/src/components/Introduce/PartnerShip.styl +++ b/src/components/Introduce/PartnerShip.styl @@ -1,7 +1,7 @@ // 合作伙伴 .logo-box{ - width: 18%; - margin-right: 2.5%; + width: 15%; + margin-right: 2%; border-radius: 2px; margin-bottom: 50px; @@ -20,7 +20,6 @@ line-height: 20px; } } - } .logo-box1{ diff --git a/src/components/Introduce/PartnerShip.vue b/src/components/Introduce/PartnerShip.vue index 172bc23..fc87e7a 100644 --- a/src/components/Introduce/PartnerShip.vue +++ b/src/components/Introduce/PartnerShip.vue @@ -17,7 +17,7 @@ v-if="item.backendSearchList && item.backendSearchList.length > 0" >
import { mapMutations, mapState } from 'vuex'; import { selInstrument, searchFront, selProduct } from 'config/api'; + export default { name: 'PlatformList', data() { @@ -99,12 +100,16 @@ export default { }, created() { this.current = this.shareCurrent; - // console.log('this.listState: ', this.listState); if (this.listState === 0) { + console.log('0实验室'); this.getSear(); - } else if (this.listState === 1) { + } + if (this.listState === 1) { + console.log('1仪器'); this.getSelI(); - } else { + } + if (this.listState === 3) { + console.log('3产品'); this.getProductLists(); } }, @@ -131,6 +136,7 @@ export default { // console.log(error); } }, + // 查询实验室（研究院）列表 async getSear() { try { diff --git a/src/components/PlatformList/Tutors.vue b/src/components/PlatformList/Tutors.vue index b9b97b8..46ae734 100644 --- a/src/components/PlatformList/Tutors.vue +++ b/src/components/PlatformList/Tutors.vue @@ -1,6 +1,5 @@ diff --git a/src/views/Challenge/components/Unveiling.vue b/src/views/Challenge/components/Unveiling.vue new file mode 100644 index 0000000..bf41f27 --- /dev/null +++ b/src/views/Challenge/components/Unveiling.vue @@ -0,0 +1,206 @@ + + + + + + diff --git a/src/views/IncubationPlatform/Children/MakerSpace.vue b/src/views/IncubationPlatform/Children/MakerSpace.vue index 0e373fb..f693678 100644 --- a/src/views/IncubationPlatform/Children/MakerSpace.vue +++ b/src/views/IncubationPlatform/Children/MakerSpace.vue @@ -27,7 +27,10 @@ class="pointer baseColor" >第三方专业机构 建立战略合作，聘请 - 创业导师 + 创业导师 30余名，服务领域涵盖专业技术、企业管理、科创咨询、财务税务、法务咨询等，可随时为入孵企业提供针 对性、一对一创业辅导服务。
diff --git a/src/views/IncubationPlatform/Children/Products.vue b/src/views/IncubationPlatform/Children/Products.vue index 97aad8c..c0cd991 100644 --- a/src/views/IncubationPlatform/Children/Products.vue +++ b/src/views/IncubationPlatform/Children/Products.vue @@ -10,13 +10,15 @@
产品类目： - {{ item.name }} + + {{ item.name }} +
+

产品展示

- + @@ -42,10 +45,11 @@ import { selModel } from 'config/api'; import PlatformList from 'components/PlatformList/PlatformList.vue'; import HNav from './../components/HNav.vue'; import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue'; +import AddProject from '../components/AddProject.vue'; export default { name: 'Products', - components: { BreadCrumb, HNav, PlatformList }, + components: { BreadCrumb, HNav, PlatformList, AddProject }, data() { return { arr: [ @@ -55,6 +59,7 @@ export default { productIpt: '', // 产品搜索框内容 productLists: [], // 产品类目 productList: [], // 产品类型选择列表 + showAddProject: false, }; }, watch: { @@ -78,19 +83,22 @@ export default { }, methods: { ...mapMutations('home', ['setProductIpt', 'setProductList', 'setListState']), + async getType(num) { try { const params = { param: { model: num } }; const res = await selModel(params); - const { code, mst, data } = res.data; + const { code, msg, data } = res.data; if (code === 200) { - this.productLists = data; + this.productLists = data.list; for (let i = 0; i < this.productLists.length; i++) { this.productLists[i].isActive = false; } + } else { + this.$message.error(msg || '分类获取失败'); } } catch (error) { - // console.log(error); + console.log(error); } }, @@ -127,6 +135,11 @@ export default { }; this.setProductList(obj); }, + + // 更新 + update() { + this.$refs.child.getProductLists(); + }, }, }; diff --git a/src/views/IncubationPlatform/Children/Tutor.vue b/src/views/IncubationPlatform/Children/Tutor.vue index 029cace..0a704d1 100644 --- a/src/views/IncubationPlatform/Children/Tutor.vue +++ b/src/views/IncubationPlatform/Children/Tutor.vue @@ -1,79 +1,130 @@ + + diff --git a/src/views/Industry/Children/Serve.vue b/src/views/Industry/Children/Serve.vue index 20cec46..1693b6c 100644 --- a/src/views/Industry/Children/Serve.vue +++ b/src/views/Industry/Children/Serve.vue @@ -26,21 +26,20 @@

{{ item.name }}

-
+
{{ item.intro.slice(0,45) }} more -
- -
+ +

{{ item.intro }}

- -

{{ modelIntro }}

+ +

{{ modelIntro }}
产业创新联盟
- - 产业技术创新联盟在建中 + +
- @@ -38,11 +108,8 @@ export default { margin: 20px auto; } -.dev-box { - width: 100%; - - img { - width: 100%; - } +.pagination { + margin: 40px 0; + text-align: right; } diff --git a/src/views/Knowledge/components/classify.vue b/src/views/Knowledge/components/classify.vue new file mode 100644 index 0000000..37b56d1 --- /dev/null +++ b/src/views/Knowledge/components/classify.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/views/Knowledge/components/knowContent.vue b/src/views/Knowledge/components/knowContent.vue new file mode 100644 index 0000000..812b8bb --- /dev/null +++ b/src/views/Knowledge/components/knowContent.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/views/NewPlatform/Children/Core.vue b/src/views/NewPlatform/Children/Core.vue index 89e4ecd..3a13229 100644 --- a/src/views/NewPlatform/Children/Core.vue +++ b/src/views/NewPlatform/Children/Core.vue @@ -5,7 +5,7 @@
-
+
协同创新中心
@@ -238,6 +238,11 @@ export default { } } +.top-title { + top: auto !important; + height: 100%; +} + @media only screen and (max-width: 1400px) { .absolute-box { right: -40px; diff --git a/src/views/NewPlatform/Children/Develop.vue b/src/views/NewPlatform/Children/Develop.vue index a63acc1..95ff1fd 100644 --- a/src/views/NewPlatform/Children/Develop.vue +++ b/src/views/NewPlatform/Children/Develop.vue @@ -9,13 +9,15 @@
导师分类： - {{ item.categoryName }} + + {{ item.categoryName }} +
- +
@@ -55,6 +57,7 @@ export default { list: [], achList: [], fruitIpt: '', + platform: 1, }; }, diff --git a/src/views/NewPlatform/Children/Platform.vue b/src/views/NewPlatform/Children/Platform.vue index 5c05d21..14710cc 100644 --- a/src/views/NewPlatform/Children/Platform.vue +++ b/src/views/NewPlatform/Children/Platform.vue @@ -11,7 +11,10 @@
- +
+ + +
@@ -42,9 +45,11 @@ import Banner from 'components/Banner/Banner.vue'; import HNav from './../components/HNav.vue'; import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue'; +import NewModel from './../components/NewModel.vue'; + export default { name: 'News', - components: { HNav, Banner, BreadCrumb }, + components: { HNav, Banner, BreadCrumb, NewModel }, data() { return { str: '这是政策界面', @@ -54,6 +59,7 @@ export default { { name: '创新平台', url: '/NewPlatform/NewCore' }, { name: '创新资源平台', url: '' }, ], + btnType: 'default', showPage: 32, list: [ { @@ -128,4 +134,22 @@ export default { align-items: center; font-size: 16px; } + +.newBox { + position: relative; +} + +.btn { + position: absolute; + top: 26%; + left: 330px; +} + +@media only screen and (max-width: 1650px) { + .btn { + position: absolute; + top: 23%; + left: 233px; + } +} diff --git a/src/views/NewPlatform/Children/Share.vue b/src/views/NewPlatform/Children/Share.vue index 46877c9..7adec07 100644 --- a/src/views/NewPlatform/Children/Share.vue +++ b/src/views/NewPlatform/Children/Share.vue @@ -9,13 +9,15 @@
研究开发实验室： - {{ item.name }} + + {{ item.name }} +
大型科研设施与仪器： - {{ item.name }} + + {{ item.name }} +
技术领域： - {{ item.name }} + + {{ item.name }} +
- {{ str }} + {{ str }}