-
+
@@ -103,15 +95,15 @@- +特色农业产业化 - +
粮食产业化 - +
畜牧业产业化 @@ -129,19 +121,19 @@
- +吉林省农业资源规划 - +
西部特色经济作物区域布局 - +
中部粮食加工业区域布局 - +
历史区划数据 @@ -159,19 +151,19 @@
- +保护性耕作 - +
农业资源循环利用 - +
农产品安全 - +
棚膜经济 @@ -189,11 +181,11 @@
- +资源区划 - +
农业产业化 @@ -203,12 +195,12 @@
- + 助力乡村振兴 - + 其他 @@ -234,6 +226,10 @@ export default { window, searchText: '', columnList: [], + xbzlzdList:[], + dbjjzyList:[], + zblszyList:[], + syjlsList:[], } }, mounted(){ @@ -243,32 +239,60 @@ export default { }, methods:{ loadData(){ - if(this.$route.query.findStr){ - this.searchText = this.$route.query.findStr; - } + if(this.$route.query.findStr){ + this.searchText = this.$route.query.findStr; + } + //查询区域农业资源--西部杂粮杂豆 内容列表 + getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',columnId:10101}).then((res)=>{ + if(res.success){ + let list = res.result.records||res.result; + this.xbzlzdList = list; + } + }); + //查询区域农业资源--东部经济资源 内容列表 + getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',columnId:10102}).then((res)=>{ + if(res.success){ + let list = res.result.records||res.result; + this.dbjjzyList = list; + } + }); + //查询区域农业资源--中部粮食资源 内容列表 + getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',columnId:10103}).then((res)=>{ + if(res.success){ + let list = res.result.records||res.result; + this.zblszyList = list; + } + }); + //查询区域农业资源--适宜吉林省 内容列表 + getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',columnId:10104}).then((res)=>{ + if(res.success){ + let list = res.result.records||res.result; + this.syjlsList = list; + } + }); //查询栏目 - getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',type:'!!BLANK'}).then((res)=>{ - if(res.success){ - let list = res.result.records||res.result; - let map = {}; - //转成，map - let parentList = list.filter(x => { - if(x.parent){ - return false; - }else{ - map[x.id] = x; - return true; - } - }); - //孩子找父亲 - list.forEach(x => { - let parent = map[x.parent] || {}; - if(!parent.list) parent.list = []; - parent.list.push(x); - }); - this.columnList = parentList; - } - }); + // getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',type:'!!BLANK'}).then((res)=>{ + // if(res.success){ + // let list = res.result.records||res.result; + // let map = {}; + // //转成，map + // let parentList = list.filter(x => { + // if(x.parent){ + // return false; + // }else{ + // map[x.id] = x; + // return true; + // } + // }); + // //孩子找父亲 + // list.forEach(x => { + // let parent = map[x.parent] || {}; + // if(!parent.list) parent.list = []; + // parent.list.push(x); + // }); + // this.columnList = parentList; + // } + // }); }, //鼠标移入菜单上，显示其下菜单 openMenu(e){ diff --git a/src/views/gateway/common/main.vue b/src/views/gateway/common/main.vue index 855329d..5589bce 100644 --- a/src/views/gateway/common/main.vue +++ b/src/views/gateway/common/main.vue @@ -4,104 +4,103 @@-+-+ +
+ + +{{tt.title}}
+{{$tfnm(tt,'content',60)}}
+-+
-+ + -+ ++
+ {{lbt.title}} +++
- -
+
--> +----
+ @@ -110,42 +109,42 @@- - -
-{{gzdtList[0].title}}
-{{gzdtList[0].content}}
- -- - - -
-{{gzdt.title}}
- {{gzdt.createTime}} - - -
- - +
特色农业产业化
- - +
数据中心
- - +
棚膜经济
- - +
农产品安全
- - +
中部粮食资源
- - +
畜牧业产业化
@@ -161,12 +160,12 @@
- - + {{hzjl.title}} @@ -177,15 +176,15 @@
@@ -198,51 +197,55 @@@@ -251,21 +254,21 @@-- {{tsnyzyList[0].title}} --{{tsnyzyList[0].content}}
-- [阅读] - {{tsnyzyList[0].createTime}} + +-+ {{tsnyzyList[0].title}} +-+{{$tfnm(tsnyzyList[0],'content',84)}}
++ [阅读] + {{getMonthAndDay(tsnyzyList[0].updateTime || tsnyzyList[0].createTime)}} +- -+ +@@ -304,7 +307,8 @@ export default { limitMoveNum: 2, direction: 2, }, - carouselHeight: '' + carouselHeight: '', + currentTab:301, } }, computed:{ @@ -427,6 +431,12 @@ export default { } }); }, + + //工作动态、行业要闻切换 + changeTab(index){ + this.currentTab = index; + }, + getDay(dateTime){ if(!dateTime) return ''; let d = new Date(dateTime); @@ -471,6 +481,22 @@ export default { this.refreshImageHeight(image); }, + getDay(dateTime){ + if(!dateTime) return ''; + let d = new Date(dateTime); + return d.getDate() + }, + getMonthAndDay(dateTime){ + if(!dateTime) return ''; + let d = new Date(dateTime); + return (d.getMonth()+1) + '-' + d.getDate(); + }, + getYearAndMonth(dateTime){ + if(!dateTime) return ''; + let d = new Date(dateTime); + return d.getFullYear() + '-' + (d.getMonth()+1) + }, + } } diff --git a/src/views/gateway/detailedPage.vue b/src/views/gateway/detailedPage.vue index 4a8e2e1..23bfe64 100644 --- a/src/views/gateway/detailedPage.vue +++ b/src/views/gateway/detailedPage.vue @@ -1,13 +1,28 @@
- -
+
- -
+
- -
+
- -
+
@@ -87,10 +102,22 @@ export default { console.log('res =>',res.result); let data = res.result; this.articleData = data; - //查出根节点 - this.parentData =data.parentGatewayColumn this.thisColumn = data.currentGatewayColumn - this.columnList = data.gatewayColumnList + //查出根节点 + if(data.parentGatewayColumn){ + this.parentData = data.parentGatewayColumn + }else{ + this.parentData = data.currentGatewayColumn + } + + if(data.gatewayColumnList && data.gatewayColumnList.length > 0){ + this.columnList = data.gatewayColumnList + }else{ + this.columnList = []; + this.columnList.push(data.currentGatewayColumn); + + } + console.log('columnList', this.columnList ); // if(!this.columnId){ diff --git a/src/views/gateway/detailedPage2.vue b/src/views/gateway/detailedPage2.vue new file mode 100644 index 0000000..78f8046 --- /dev/null +++ b/src/views/gateway/detailedPage2.vue @@ -0,0 +1,153 @@ + +- + + + + + + + + + + + + + + + + @@ -20,8 +35,8 @@++ + + + + \ No newline at end of file diff --git a/src/views/gateway/listPage.vue b/src/views/gateway/listPage.vue index 632cdd2..30e9f24 100644 --- a/src/views/gateway/listPage.vue +++ b/src/views/gateway/listPage.vue @@ -9,6 +9,13 @@ + + + + + + ++ + + + + + + + + + + + + + + + + + ++++++++{{parentData.name}}
+ ++ +
+- {{col.name}}
+- {{col.name}}
+ +++++{{articleData.title}}
++ 发布日期：{{articleData.updateTime || articleData.createTime}} + 作者：{{articleData.author}} ++ + ++ @@ -38,10 +45,10 @@
{{art.title}}
-{{art.content}}
+{{$tfnm(art,'content',104)}}
-@@ -114,10 +121,20 @@ export default { getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',fpid:this.pid}).then((res)=>{ if(res.success){ let list = res.result.records||res.result; + // console.log('list===>',list); //查出根节点 this.parentData = list.find(x => !x.parent); - this.thisColumn = list.find(x => x.id == this.id); - this.columnList = list.filter(x => x.parent); + if(this.id){ + this.thisColumn = list.find(x => x.id == this.id); + this.columnList = list.filter(x => x.parent); + }else{ + this.thisColumn = list[0]; + this.columnList = []; + this.columnList.push(list[0]); + } + + // console.log('this.columnList===>',this.columnList); + // console.log('this.thisColumn===>',this.thisColumn); // if(!this.id){ // let firstColumn = this.columnList[0] // if(firstColumn){ @@ -149,6 +166,21 @@ export default { }); // } }, + getDay(dateTime){ + if(!dateTime) return ''; + let d = new Date(dateTime); + return d.getDate() + }, + getMonthAndDay(dateTime){ + if(!dateTime) return ''; + let d = new Date(dateTime); + return (d.getMonth()+1) + '-' + d.getDate(); + }, + getYearAndMonth(dateTime){ + if(!dateTime) return ''; + let d = new Date(dateTime); + return d.getFullYear() + '-' + (d.getMonth()+1) + }, }, } diff --git a/src/views/gateway/listPage2.vue b/src/views/gateway/listPage2.vue new file mode 100644 index 0000000..106416d --- /dev/null +++ b/src/views/gateway/listPage2.vue @@ -0,0 +1,211 @@ + +{{art.createTime}}+{{getMonthAndDay(art.updateTime || art.createTime)}}→++ + + + + \ No newline at end of file+ + + + + + + + + + + + + + + + + ++++ + +++ + + + + + + + +++{{parentData.name}}
+ ++ +
+- {{col.name}}
+- {{col.name}}
+ ++
