From 2b1b434a5f6c10539f4a54cd7c195f212e0092f7 Mon Sep 17 00:00:00 2001 From: guzhenfu <867124018@mslife.com> Date: Fri, 25 Mar 2022 16:52:03 +0800 Subject: [PATCH] update code --- src/App.vue | 2 +- src/api/data.js | 29 ++ src/index.less | 4 +- src/main.js | 6 +- src/router/routers.js | 74 ++++ src/view/about.vue | 104 +++++- src/view/company.vue | 97 +++++ src/view/connect.vue | 32 +- src/view/data.vue | 89 +++++ src/view/exchange.vue | 34 +- src/view/km.vue | 112 +++--- src/view/main/main.vue | 82 ++-- src/view/member.vue | 89 +++++ src/view/news.vue | 97 +++++ src/view/people.vue | 89 +++++ src/view/policy.vue | 97 +++++ src/view/trode.vue | 97 +++++ src/view/vip-service--.vue | 739 +++++++++++++++++++++++++++++++++++++ src/view/vip-service.vue | 678 ++++++++++++++++++++++++++++++++-- 19 files changed, 2406 insertions(+), 145 deletions(-) create mode 100755 src/view/company.vue create mode 100755 src/view/data.vue create mode 100755 src/view/member.vue create mode 100755 src/view/news.vue create mode 100755 src/view/people.vue create mode 100755 src/view/policy.vue create mode 100755 src/view/trode.vue create mode 100755 src/view/vip-service--.vue mode change 100755 => 100644 src/view/vip-service.vue diff --git a/src/App.vue b/src/App.vue index bb49e0c..53d4250 100755 --- a/src/App.vue +++ b/src/App.vue @@ -8,7 +8,7 @@ export default { name: 'App', mounted() { - } + }, } diff --git a/src/api/data.js b/src/api/data.js index 13a8243..928925a 100755 --- a/src/api/data.js +++ b/src/api/data.js @@ -855,3 +855,32 @@ export const getPositionRequest = () => { method: 'get' }) } + + export const getChannelSecond = (id) => { + return axios.request({ + url: 'api/cms/open/api/infor/channel/'+id, + method: 'get' + }) + } + + export const getCall = (id) => { + return axios.request({ + url: 'api/devops/open/api/call/'+id, + method: 'get' + }) + } + + export const getLiInfo = (p) => { + return axios.request({ + url: 'api/devops/open/api/call/1507216239127048194', + method: 'get', + params:p + }) + } + + export const downloadAction = (fileName) => { + return axios.request({ + url: 'api/cms/open/api/infor/download?fileName='+fileName, + method: 'get' + }) + } diff --git a/src/index.less b/src/index.less index af40022..60794e2 100755 --- a/src/index.less +++ b/src/index.less @@ -186,8 +186,8 @@ body { font-weight: 900; position: absolute; margin-right: 100px; - left: 0; - top: 0; + left: -40px; + top: 6px; text-align: center; line-height: 50px; width: 100px; diff --git a/src/main.js b/src/main.js index cd47a63..e46336e 100755 --- a/src/main.js +++ b/src/main.js @@ -20,9 +20,9 @@ import Toast from 'vue2-toast' import Moment from 'moment' // 定义全局时间戳过滤器 -Vue.filter('formatDate', function(value) { - return Moment(value).format('MM-DD') - }) +// Vue.filter('formatDate', function(value) { +// return Moment(value).format('MM-DD') +// }) Vue.prototype.$moment = Moment;//赋值使用 // import ElementUI from 'element-ui' diff --git a/src/router/routers.js b/src/router/routers.js index a6230ee..6616c83 100755 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -57,6 +57,80 @@ export default [ }, component: () => import('@/view/vip') }, + { + path: '/company', + name: 'company', + meta: { + hideInMenu: true, + title: '企业认定', + notCache: true, + showInBreadCrumb: true + }, + component: () => import('@/view/company') + }, + { + path: '/news', + name: 'news', + meta: { + hideInMenu: true, + title: '新闻资讯', + notCache: true, + showInBreadCrumb: true + }, + component: () => import('@/view/news') + }, + { + path: '/policy', + name: 'policy', + meta: { + hideInMenu: true, + title: '产业政策', + notCache: true, + showInBreadCrumb: true + }, + component: () => import('@/view/policy') + }, + { + path: '/trode', + name: 'trode', + meta: { + hideInMenu: true, + title: '行业动态', + notCache: true, + showInBreadCrumb: true + }, + component: () => import('@/view/trode') + },{ + path: '/member', + name: 'member', + meta: { + hideInMenu: true, + title: '会员产品', + notCache: true, + showInBreadCrumb: true + }, + component: () => import('@/view/member') + },{ + path: '/people', + name: 'people', + meta: { + hideInMenu: true, + title: '人力资源', + notCache: true, + showInBreadCrumb: true + }, + component: () => import('@/view/people') + },{ + path: '/data', + name: 'data', + meta: { + hideInMenu: true, + title: '数据上报', + notCache: true, + showInBreadCrumb: true + }, + component: () => import('@/view/data') + }, { path: '/vip-service', name: 'vip-service', diff --git a/src/view/about.vue b/src/view/about.vue index 42ef5f6..d2a5c50 100755 --- a/src/view/about.vue +++ b/src/view/about.vue @@ -14,11 +14,11 @@ + {{item.channelName}} - - + + @@ -29,58 +29,107 @@ + + +

上海市集成电路行业协会章程

+
作者:{{InfoObj.author}}       发布日期:{{InfoObj.publishTime}}
+
+ +
+ +
+ + + diff --git a/src/view/company.vue b/src/view/company.vue new file mode 100755 index 0000000..00d47e9 --- /dev/null +++ b/src/view/company.vue @@ -0,0 +1,97 @@ + + + + diff --git a/src/view/connect.vue b/src/view/connect.vue index 80c74b9..cd85f9e 100755 --- a/src/view/connect.vue +++ b/src/view/connect.vue @@ -13,14 +13,14 @@ - -
办公室联系人
+ +
{{item.orgName}}
-
联系人:毛彩虹
-
电话:50805271
-
电子邮件:contact@sica.org.cn
+
联系人:{{item.name}}
+
电话:{{item.phone}}
+
电子邮件:{{item.mail}}
- +
@@ -50,9 +50,25 @@ diff --git a/src/view/data.vue b/src/view/data.vue new file mode 100755 index 0000000..6adc423 --- /dev/null +++ b/src/view/data.vue @@ -0,0 +1,89 @@ + + + diff --git a/src/view/exchange.vue b/src/view/exchange.vue index 0e07a5c..6e3465c 100755 --- a/src/view/exchange.vue +++ b/src/view/exchange.vue @@ -25,18 +25,20 @@

活动预告

    -
  • - +
  • +
    -

    上海市经济信息化委关于开展申报2020年度上海市软件和集成电路企业核心团队...

    -

    根据《关于本市进一步鼓励软件产业和集成电路产业发展的若干政策》(沪府发〔2017〕23号)和《上海 市软件和集成电路企业设计人

    +

    {{item.title}}

    +

+ :total="total" prev-text="上一页" next-text="下一页" style="float: right;margin: 10px">
@@ -53,43 +55,45 @@ export default { return { titleList: [], activeIndex: 0, - dataList: [] + dataList: [], + total: 0 } }, methods: { async getChannelsRequest(){ - let res = await getChannelsRequest({current:1,size:20}) + let res = await getChannelsRequest({current:1,size:100}) if(res.code == 200){ res.data.records.map((item) => { if(item.channelName == '合作交流'){ - this.getChannelInformationsRequest(item.id) + this.getChannelSecond(item.id) } }) } }, - async getChannelInformationsRequest(id){ - let res = await getChannelInformationsRequest({current:1,size:15,channelId: id}) + async getChannelSecond(id){ + let res = await getChannelSecond(id) if(res.code == 200){ - this.titleList = res.data.records + this.titleList = res.data if(this.titleList){ - this.getDetailRequest(this.titleList[0].id) + this.getChannelInformationsRequest(this.titleList[0].id) } } }, - async getDetailRequest(id){ - let res = await getDetailRequest(id) + async getChannelInformationsRequest(id){ + let res = await getChannelInformationsRequest({channelId: id}) if(res.code == 200){ this.dataList = res.data.records + this.total = res.data.total } }, changeType(index){ this.activeIndex = index; console.log(this.titleList[index].id) - this.getDetailRequest(this.titleList[index].id) + this.getChannelInformationsRequest(this.titleList[index].id) } }, mounted() { diff --git a/src/view/km.vue b/src/view/km.vue index 2d7efb7..6b4806f 100755 --- a/src/view/km.vue +++ b/src/view/km.vue @@ -6,9 +6,14 @@
知识产权与标准化
- + + + + @@ -17,62 +22,14 @@ 协会团标 - - - -

国家鼓励的集成电路企业认定 实施细则企业认定

-
-
- - - -

上海市集成电路行业协会简介

- -
-
- + - -

上海市集成电路行业协会简介

- -
-
- - - -

上海市集成电路行业协会简介

- + +

{{item.title}}

- - - - -

国家鼓励的集成电路企业认定 实施细则企业认定

-
-
- - - -

上海市集成电路行业协会简介

- -
-
- - - -

上海市集成电路行业协会简介

-
-
- - - -

上海市集成电路行业协会简介

-
-
-
@@ -80,11 +37,58 @@ diff --git a/src/view/main/main.vue b/src/view/main/main.vue index c221643..1390594 100755 --- a/src/view/main/main.vue +++ b/src/view/main/main.vue @@ -2,19 +2,21 @@ - + 首页 关于我们 协会会员 - 企业认定 - 新闻资讯 - 产业政策 - 行业动态 + 企业认定 + 新闻资讯 + 产业政策 + 行业动态 合作交流 知识产权 - 会员产品 - 人力资源 - 数据上报 + 会员产品 + 人力资源 + 数据上报 联系我们 @@ -22,19 +24,8 @@ @@ -77,7 +68,22 @@ export default { minLogo, maxLogo, isFullscreen: false, - height: 'height:'+((document.documentElement.clientHeight || document.body.clientHeight) - 50)+'px' + height: 'height:'+((document.documentElement.clientHeight || document.body.clientHeight) - 50)+'px', + menuLists: [ + {text: '首页', path: '/overview'}, + {text: '关于我们', path: '/about'}, + {text: '协会会员', path: '/vip-service'}, + {text: '企业认定', path: '/company'}, + {text: '新闻资讯', path: '/news'}, + {text: '产业政策', path: '/policy'}, + {text: '行业动态', path: '/trode'}, + {text: '合作交流', path: '/exchange'}, + {text: '知识产权', path: '/km'}, + {text: '会员产品', path: '/member'}, + {text: '人力资源', path: '/people'}, + {text: '数据上报', path: '/data'}, + {text: '联系我们', path: '/connect'}, + ] } }, computed: { @@ -113,6 +119,11 @@ export default { ...mapActions([ 'handleLogin' ]), + clickItem(index){ + this.activeIndex = index + 1 + this.$router.push(this.menuList[index].path) + this.$forceUpdate() + }, turnToPage (route) { let {name, params, query} = {} if (typeof route === 'string') name = route @@ -182,19 +193,42 @@ export default { if(path.indexOf('vip-service')>=0){ this.activeIndex = '3'; } - if(path.indexOf('connect')>=0){ + if(path.indexOf('company')>=0){ this.activeIndex = '4'; } + if(path.indexOf('news')>=0){ + this.activeIndex = '5'; + } + if(path.indexOf('policy')>=0){ + this.activeIndex = '6'; + } + if(path.indexOf('trode')>=0){ + this.activeIndex = '7'; + } if(path.indexOf('exchange')>=0){ this.activeIndex = '8'; } if(path.indexOf('km')>=0){ this.activeIndex = '9'; } + if(path.indexOf('member')>=0){ + this.activeIndex = '10'; + } + if(path.indexOf('people')>=0){ + this.activeIndex = '11'; + } + if(path.indexOf('data')>=0){ + this.activeIndex = '12'; + } } } diff --git a/src/view/member.vue b/src/view/member.vue new file mode 100755 index 0000000..032691e --- /dev/null +++ b/src/view/member.vue @@ -0,0 +1,89 @@ + + + diff --git a/src/view/news.vue b/src/view/news.vue new file mode 100755 index 0000000..8ad517d --- /dev/null +++ b/src/view/news.vue @@ -0,0 +1,97 @@ + + + + diff --git a/src/view/people.vue b/src/view/people.vue new file mode 100755 index 0000000..34d353b --- /dev/null +++ b/src/view/people.vue @@ -0,0 +1,89 @@ + + + diff --git a/src/view/policy.vue b/src/view/policy.vue new file mode 100755 index 0000000..a706819 --- /dev/null +++ b/src/view/policy.vue @@ -0,0 +1,97 @@ + + + + diff --git a/src/view/trode.vue b/src/view/trode.vue new file mode 100755 index 0000000..fd966f1 --- /dev/null +++ b/src/view/trode.vue @@ -0,0 +1,97 @@ + + + + diff --git a/src/view/vip-service--.vue b/src/view/vip-service--.vue new file mode 100755 index 0000000..c2972f7 --- /dev/null +++ b/src/view/vip-service--.vue @@ -0,0 +1,739 @@ + + + + diff --git a/src/view/vip-service.vue b/src/view/vip-service.vue old mode 100755 new mode 100644 index 4e660dd..59e21d2 --- a/src/view/vip-service.vue +++ b/src/view/vip-service.vue @@ -6,11 +6,11 @@
会员服务
- - - - - + + + + + @@ -21,11 +21,18 @@

上海市集成电路行业协会第五届理事会理事名单

作者:SICA发布日期:2011年12月28日 星期三
+