diff --git a/public/color.less b/public/color.less index 95366c9..c1ac9fa 100644 --- a/public/color.less +++ b/public/color.less @@ -1,4 +1,4 @@ -@primary-color: #1890ff; +@primary-color: #07a54d; /* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */ /* stylelint-disable no-duplicate-selectors */ /* stylelint-disable */ @@ -1375,7 +1375,7 @@ this.tinycolor = tinycolor; @blue-3: color(~`colorPalette("@{blue-6}", 3)`); @blue-4: color(~`colorPalette("@{blue-6}", 4)`); @blue-5: color(~`colorPalette("@{blue-6}", 5)`); -@blue-6: #1890ff; +@blue-6: #07a54d; @blue-7: color(~`colorPalette("@{blue-6}", 7)`); @blue-8: color(~`colorPalette("@{blue-6}", 8)`); @blue-9: color(~`colorPalette("@{blue-6}", 9)`); diff --git a/public/css/style.css b/public/css/style.css index f43e0ed..b145833 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -114,7 +114,7 @@ ul{ #MutiNav .multiUl{ width: 1200px; margin: auto; - height: 55px; + height: 50px; clear: both; display: block; } @@ -133,7 +133,6 @@ ul{ color: #FFFFFF; } #MutiNav .multiUl .multiUlli a.mulgo{ - padding: 14px 4px; display: inline-block; z-index: 300; width: 100%; @@ -1065,7 +1064,7 @@ blockquote{ border-left: 2px #FFFFFF solid; } .er_contl ul li:last-child{ - border: 0; + border-bottom: 0; } .er_contl ul li:hover{ border-left: 2px #07a54d solid; @@ -1094,7 +1093,7 @@ blockquote{ float: left; margin-right: 20px; background-color: #f6f9fe; - margin-bottom: 20px; + margin-bottom: 30px; } .er_contr ul li:nth-child(4n){ margin: 0; @@ -1168,7 +1167,7 @@ blockquote{ background-color: #FFFFFF; } .cyh_contr ul li{ - padding: 40px; + padding: 14px 24px; border-bottom: 1px #DDDDDD dashed; transition: All 0.4s ease-in-out; -webkit-transition: All 0.4s ease-in-out; @@ -1195,18 +1194,18 @@ blockquote{ width: 85%; } .cyhl h3{ - font-size: 18px; + font-size: 16px; font-weight: 600; color: #333333; } .cyhl p{ - font-size: 16px; + font-size: 14px; color: #666666; - line-height: 30px; - margin-top: 10px; + line-height: 24px; + margin: 0; } .cyhr .cyhr_date{ - font-size: 20px; + font-size: 16px; color: #999999; } .jianttewr{ @@ -1216,16 +1215,16 @@ blockquote{ .xqer_cont{ - padding: 40px; + padding: 20px 40px; } .xqer_cont h3{ font-size: 24px; text-align: center; color: #333333; font-weight: 600; - padding-bottom: 30px; + padding-bottom: 14px; border-bottom: 1px #ebebeb solid; - margin-bottom: 20px; + margin-bottom: 14px; } .xqer_date{ text-align: center; diff --git a/public/img/icon_yc.png b/public/img/icon_yc.png new file mode 100644 index 0000000..f85647a Binary files /dev/null and b/public/img/icon_yc.png differ diff --git a/public/img/nyzy_hs.jpeg b/public/img/nyzy_hs.jpeg new file mode 100644 index 0000000..f81d3c9 Binary files /dev/null and b/public/img/nyzy_hs.jpeg differ diff --git a/public/img/nyzy_xrk.jpg b/public/img/nyzy_xrk.jpg index be841de..ed500ab 100644 Binary files a/public/img/nyzy_xrk.jpg and b/public/img/nyzy_xrk.jpg differ diff --git a/public/img/nyzy_ym.png b/public/img/nyzy_ym.png new file mode 100644 index 0000000..485cb9c Binary files /dev/null and b/public/img/nyzy_ym.png differ diff --git a/public/tinymce/skins/lightgray/skin.min.css b/public/tinymce/skins/lightgray/skin.min.css index 3ea9b44..2288f20 100644 --- a/public/tinymce/skins/lightgray/skin.min.css +++ b/public/tinymce/skins/lightgray/skin.min.css @@ -319,7 +319,7 @@ button::-moz-focus-inner { .tox .tox-collection--grid .tox-collection__group { display: flex; flex-wrap: wrap; - max-height: 208px; + max-height: 230px; overflow-x: hidden; overflow-y: auto; padding: 0; diff --git a/src/components/chart/DashChartDemo.vue b/src/components/chart/DashChartDemo.vue index c2ebf08..d462a25 100644 --- a/src/components/chart/DashChartDemo.vue +++ b/src/components/chart/DashChartDemo.vue @@ -17,7 +17,7 @@ gemo="point" position="value*1" shape="pointer" - color="#1890FF" + color="#07a54d" :active="false" > diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue index b43cc06..6cd8300 100644 --- a/src/components/page/GlobalHeader.vue +++ b/src/components/page/GlobalHeader.vue @@ -6,16 +6,6 @@ :style="{ padding: '0' }">
- Jeecg-Boot diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index 202b77e..308d5ea 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -333,7 +333,7 @@ .avatar { margin: 20px 10px 20px 0; - color: #1890ff; + color: #07a54d; background: hsla(0, 0%, 100%, .85); vertical-align: middle; } diff --git a/src/components/setting/SettingDrawer.vue b/src/components/setting/SettingDrawer.vue index af2569b..2f416f5 100644 --- a/src/components/setting/SettingDrawer.vue +++ b/src/components/setting/SettingDrawer.vue @@ -280,7 +280,7 @@ padding-top: 15px; padding-left: 24px; height: 100%; - color: #1890ff; + color: #07a54d; font-size: 14px; font-weight: 700; } @@ -308,7 +308,7 @@ .setting-drawer-index-handle { position: absolute; top: 240px; - background: #1890ff; + background: #07a54d; width: 48px; height: 48px; right: 300px; diff --git a/src/components/tools/setting.js b/src/components/tools/setting.js index fdfc396..481e47c 100644 --- a/src/components/tools/setting.js +++ b/src/components/tools/setting.js @@ -20,7 +20,7 @@ const colorList = [ key: '极光绿', color: '#52C41A', }, { - key: '拂晓蓝（默认）', color: '#1890FF', + key: '拂晓蓝（默认）', color: '#07a54d', }, { key: '极客蓝', color: '#2F54EB', diff --git a/src/defaultSettings.js b/src/defaultSettings.js index 832264f..7bebdc7 100644 --- a/src/defaultSettings.js +++ b/src/defaultSettings.js @@ -14,7 +14,7 @@ */ export default { - primaryColor: '#1890FF', // primary color of ant design + primaryColor: '#07a54d', // primary color of ant design navTheme: 'light', // theme for nav menu layout: 'sidemenu', // nav menu position: sidemenu or topmenu contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu diff --git a/src/views/account/center/Index.vue b/src/views/account/center/Index.vue index 4084a6d..0a71ef7 100644 --- a/src/views/account/center/Index.vue +++ b/src/views/account/center/Index.vue @@ -268,7 +268,7 @@ } &:hover { span { - color: #1890ff; + color: #07a54d; } } } diff --git a/src/views/dashboard/Workplace.vue b/src/views/dashboard/Workplace.vue index 57d0a06..2cd54e5 100644 --- a/src/views/dashboard/Workplace.vue +++ b/src/views/dashboard/Workplace.vue @@ -261,7 +261,7 @@ font-size: 14px; &:hover { - color: #1890ff; + color: #07a54d; } } } @@ -284,7 +284,7 @@ flex: 1 1 0; &:hover { - color: #1890ff; + color: #07a54d; } } .datetime { @@ -331,7 +331,7 @@ } &:hover { span { - color: #1890ff; + color: #07a54d; } } } diff --git a/src/views/examples/list/CardList.vue b/src/views/examples/list/CardList.vue index 4208017..aa4e0b9 100644 --- a/src/views/examples/list/CardList.vue +++ b/src/views/examples/list/CardList.vue @@ -84,7 +84,7 @@ display: inline-block; width: 100%; &:hover { - color: #1890ff; + color: #07a54d; } } } diff --git a/src/views/gateway/common/footer.vue b/src/views/gateway/common/footer.vue index 67bc0bd..6aaa3e9 100644 --- a/src/views/gateway/common/footer.vue +++ b/src/views/gateway/common/footer.vue @@ -36,8 +36,8 @@ 技术支持：长春市千鸟科技发展有限公司
- 地址：长春市人民大街1486号 - 联系方式：0431－88906486 + 地址：{{lxdzData.address}} + 联系方式：{{lxdzData.zuoji}}
',fullPath,pid); + // if(!pid){ + // r = 'ban'; + // } + switch (pid) { + case 101: r = 'baner8'; break; + case 102: r = 'baner4'; break; + case 103: r = 'baner'; break; + case 104: r = 'baner5'; break; + case 105: r = 'baner3'; break; + case 106: r = 'baner7'; break; + case 107: r = 'baner6'; break; case 'gybs': r = 'baner2'; break; case 'home': r = 'ban'; break; - case '501': r = 'detailHtml'; break; - case '306': r = 'detailHtml'; break; - case '305': r = 'detailHtml'; break; - case '304': r = 'detailHtml'; break; - case '303': r = 'detailHtml'; break; - case '302': r = 'detailHtml'; break; - case '301': r = 'baner8'; break; + case 501: r = 'detailHtml'; break; + case 306: r = 'detailHtml'; break; + case 305: r = 'detailHtml'; break; + case 304: r = 'detailHtml'; break; + case 303: r = 'detailHtml'; break; + case 302: r = 'detailHtml'; break; + case 301: r = 'baner9'; break; + case 1: r = 'baner9'; break; default: break; } + + if(fullPath.indexOf('detailedPage')>-1){ + r = "detailHtml"; + }else if(fullPath.indexOf('home')>-1){ + r = "ban"; + } return r; } }, @@ -416,5 +429,8 @@ export default { } - \ No newline at end of file diff --git a/src/views/gateway/common/main.vue b/src/views/gateway/common/main.vue index 8d8d702..b28ea0d 100644 --- a/src/views/gateway/common/main.vue +++ b/src/views/gateway/common/main.vue @@ -2,313 +2,283 @@
-
-
- -
- - -

{{tt.title}}

-

{{$tfnm(tt,'content',60)}}

- - -
-
-
-
- -
-
-
- -
-
- - - - -
- {{lbt.title}} -
- - -
- {{lbtIndex+1}} -
-
-
- -
-
-
- 更多> -
    -
  • 工作动态
    • -
  • 行业要闻
    • -
-
-
-
-
    -
  • - -

    {{gzdtList[0].title}}

    -

    {{$tfnm(gzdtList[0],'content',84)}}

    -     -
    • - -
-
-
-
    -
  • - -

    {{hyywList[0].title}}

    -

    {{$tfnm(hyywList[0],'content',84)}}

    -     -
    • -
  • - -
    • -
-
-
-
-
-
- -
- -
-
-
+
+
+ +
+ + +

{{tt.title}}

+

{{$tfnm(tt,'content',60)}}

+ + +
+
+
+
+ +
+
+
+ +
+
+ + + +
+ {{lbt.title}} +
+ + +
+ {{lbtIndex+1}} + + +
+
+
+ +
+
+
+ 更多> +
    +
  • 工作动态
    • +
  • 行业要闻
    • +
+
+
+
+
    +
  • + +

    {{gzdtList[0].title}}

    +

    {{$tfnm(gzdtList[0],'content',84)}}

    +     +
    • + +
+
+
+
    +
  • + +

    {{hyywList[0].title}}

    +

    {{$tfnm(hyywList[0],'content',84)}}

    +     +
    • +
  • + +
    • +
+
+
+
+
+
+ +
+ +
+
+
- - -
-
-
- -
- 数据中心 - 更多> -
-
-
    -
  • 微观经济调查
    • -
  • 农业资源数据
    • -
  • 遥感数据
    • -
-
-
- -
-
-
- -
- 科研成果 - 更多> -
-
-
    -
  • 成果登记
    • -
  • 获奖情况
    • -
  • 发表论文
    • -
-
- - -
- -
- -
-
- -
- 政策文件 - 更多> -
-
-
    -
  • 省内政策
    • -
  • 国内政策
    • -
-
-
- -
-
-
-
-
-
- -
- 特色农业资源最新动态 - 更多> -
-
-
- {{tsnyzyList[0].title}} -
-
-
    - -
-
-
-
- -
- 合作交流 - 更多> -
-
-
- -
- {{hzjlList[0].title}} -

{{$tfnm(hzjlList[0],'content',84)}}

-
- - {{getYearMonthDay(hzjlList[0].updateTime || hzjlList[0].createTime)}} -
-
-
-
    - -
-
-
-
- -
- 专题专栏 - 更多> -
-
- - - - -
-
+ + +
+
+
+ +
+ 数据中心 + 更多> +
+
+
    +
  • 微观经济调查
    • +
  • 农业资源数据
    • +
  • 遥感数据
    • +
+
+
+ +
+
+
+ +
+ 科研成果 + 更多> +
+
+
    +
  • 成果登记
    • +
  • 获奖情况
    • +
  • 发表论文
    • +
+
+
+ +
+ +
+
+ +
+ 政策文件 + 更多> +
+
+
    +
  • 省内政策
    • +
  • 国内政策
    • +
+
+
+ +
+
+
+
+
+
+ +
+ 特色农业资源最新动态 + 更多> +
+
+
+ {{tsnyzyList[0].title}} +
+
+
    + +
+
+
+
+ +
+ 合作交流 + 更多> +
+
+
+ +
+ {{hzjlList[0].title}} +

{{$tfnm(hzjlList[0],'content',84)}}

+
+ + {{getYearMonthDay(hzjlList[0].updateTime || hzjlList[0].createTime)}} +
+
+
+
    + +
+
+
+
+ +
+ 专题专栏 + 更多> +
+
+ + + + +
+
-
+
@@ -327,14 +297,14 @@ export default { return { window, ttList:[], //头条 - lbtList:[], //轮播图 + lbtList:[], //轮播图 gzdtList:[], //工作动态 hyywList:[], //行业要闻 hzjlList:[], //合作交流 kycgList:[], //科研成果 zcwjList:[], //政策文件 tsnyzyList:[], //特色农业资源最新动态 - sjzxList:[], //数据中心 + sjzxList:[], //数据中心 tzggList:[], linksKsdhList:[], linksYqljList:[], @@ -343,13 +313,21 @@ export default { direction: 2, }, carouselHeight: '', - currentTab:301,//工作动态/行业新闻 - zcwjTab:30501,//政策文件 - kycgTab:30401,//科研成果 - sjzxTab:40101,//数据中心 + currentTab:301,//工作动态/行业新闻 + zcwjTab:30501,//政策文件 + kycgTab:30401,//科研成果 + sjzxTab:40101,//数据中心 } }, computed:{ + lbtActiveIndex(){ + // if(this.$refs.prev2){ + // return this.$refs.prev2.activeIndex + // }else{ + // return this.$refs.prev2 + // } + // return (this.$refs.prev2 || {}).activeIndex || 0 + } }, mounted(){ this.loadData(); @@ -362,10 +340,20 @@ export default { }; //当页面大小变动时，更新高度 window.onresize = load; + }, + watch:{ + }, updated(){ }, methods:{ + hdpChange(record){ + console.log('hdpChange-->',record); + document.getElementById('hdp0').style="background-color: #fff;color: #000;" + document.getElementById('hdp1').style="background-color: #fff;color: #000;" + document.getElementById('hdp2').style="background-color: #fff;color: #000;" + document.getElementById('hdp'+record).style="background-color: #801b1f;color: #fff;" + }, loadData(){ //头条 getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',columnId:'201',column: 'createTime',order: 'desc'}).then((res)=>{ @@ -375,10 +363,13 @@ export default { } }); //轮播图 - getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',type:'首页轮播',column: 'createTime',order: 'desc'}).then((res)=>{ + getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',columnId:'001',column: 'createTime',order: 'desc'}).then((res)=>{ if(res.success){ let list = res.result.records||res.result; this.lbtList = list; + setTimeout(() => { + this.hdpChange(0) + }, 100); } }); //工作动态 @@ -395,7 +386,7 @@ export default { this.hyywList = list; } }); - //数据中心 + //数据中心 getAction('/gateway/gatewayArticle/list',{pageSize:6,isRelease:'Y',columnId:'40101',column: 'createTime',order: 'desc'}).then((res)=>{ if(res.success){ let list = res.result.records||res.result; @@ -434,41 +425,41 @@ export default { }); }, - //工作动态、行业要闻切换 - changeTab(index){ - this.currentTab = index; - }, - //数据中心 - changeTabSjzx(index){ - console.log('changeTabSjzx-->',index); - this.sjzxTab = index; - getAction('/gateway/gatewayArticle/list',{pageSize:6,isRelease:'Y',columnId:index,column: 'createTime',order: 'desc'}).then((res)=>{ - if(res.success){ - let list = res.result.records||res.result; - this.sjzxList = list; - } - }); - }, - //科研成果 - changeTabKycg(index){ - this.kycgTab = index; + //工作动态、行业要闻切换 + changeTab(index){ + this.currentTab = index; + }, + //数据中心 + changeTabSjzx(index){ + console.log('changeTabSjzx-->',index); + this.sjzxTab = index; + getAction('/gateway/gatewayArticle/list',{pageSize:6,isRelease:'Y',columnId:index,column: 'createTime',order: 'desc'}).then((res)=>{ + if(res.success){ + let list = res.result.records||res.result; + this.sjzxList = list; + } + }); + }, + //科研成果 + changeTabKycg(index){ + this.kycgTab = index; getAction('/gateway/gatewayArticle/list',{pageSize:6,isRelease:'Y',columnId:index,column: 'createTime',order: 'desc'}).then((res)=>{ if(res.success){ let list = res.result.records||res.result; this.kycgList = list; } }); - }, - //政策文件 - changeTabZcwj(index){ - this.zcwjTab = index; - getAction('/gateway/gatewayArticle/list',{pageSize:6,isRelease:'Y',columnId:index,column: 'createTime',order: 'desc'}).then((res)=>{ - if(res.success){ - let list = res.result.records||res.result; - this.zcwjList = list; - } - }); - }, + }, + //政策文件 + changeTabZcwj(index){ + this.zcwjTab = index; + getAction('/gateway/gatewayArticle/list',{pageSize:6,isRelease:'Y',columnId:index,column: 'createTime',order: 'desc'}).then((res)=>{ + if(res.success){ + let list = res.result.records||res.result; + this.zcwjList = list; + } + }); + }, getDay(dateTime){ if(!dateTime) return ''; let d = new Date(dateTime); @@ -512,7 +503,7 @@ export default { this.refreshImageHeight(image); }, - getDay(dateTime){ + getDay(dateTime){ if(!dateTime) return ''; let d = new Date(dateTime); return d.getDate() @@ -530,14 +521,14 @@ export default { getYearMonthDay(dateTime){ if(!dateTime) return ''; let d = new Date(dateTime); - var month = (d.getMonth()+1) - if(month<10){ - month = "0"+(d.getMonth()+1) - } - var day = d.getDate() - if(d.getDate()<10){ - day = "0"+d.getDate() - } + var month = (d.getMonth()+1) + if(month<10){ + month = "0"+(d.getMonth()+1) + } + var day = d.getDate() + if(d.getDate()<10){ + day = "0"+d.getDate() + } return d.getFullYear() + '-' + month + '-' +day }, @@ -546,9 +537,9 @@ export default { \ No newline at end of file diff --git a/src/views/gateway/detailedPage.vue b/src/views/gateway/detailedPage.vue index 95707d0..55005d5 100644 --- a/src/views/gateway/detailedPage.vue +++ b/src/views/gateway/detailedPage.vue @@ -7,8 +7,8 @@ 当前位置： 首页> - {{parentData.name}} > - {{thisColumn.name}} + {{parentData.name}} > + {{thisColumn.name}}
@@ -76,7 +76,7 @@ export default { }, linkOpenToNewPage(v){ console.log('linkOpenToNewPage => ',v,typeof v); - if(v.indexOf("-1){ + if(v && v.indexOf("-1){ v = v.replaceAll(" 当前位置： 首页 > - {{parentData.name}} > - {{thisColumn.name}} + {{parentData.name}} > + {{thisColumn.name}}
@@ -19,7 +19,7 @@ 发布日期：{{articleData.updateTime || articleData.createTime}}        作者：{{articleData.author}}
-

+

附件： @@ -214,6 +214,13 @@ export default { fujian(record){ var arr = record.split("/"); return arr[1]; + }, + linkOpenToNewPage(v){ + console.log('linkOpenToNewPage => ',v,typeof v); + if(v && v.indexOf("-1){ + v = v.replaceAll(" 当前位置： 首页> - {{parentData.name}} > - {{thisColumn.name}} + {{parentData.name}} > + {{thisColumn.name}}
@@ -19,7 +19,7 @@ 发布日期：{{articleData.updateTime || articleData.createTime}}        作者：{{articleData.author}}
-

+

附件： @@ -77,6 +77,13 @@ export default { var arr = record.split("/"); return arr[1]; }, + linkOpenToNewPage(v){ + console.log('linkOpenToNewPage => ',v,typeof v); + if(v && v.indexOf("-1){ + v = v.replaceAll("',record); this.loadData2(record.key) diff --git a/src/views/gateway/gybs.vue b/src/views/gateway/gybs.vue index 43a8371..9e4bba0 100644 --- a/src/views/gateway/gybs.vue +++ b/src/views/gateway/gybs.vue @@ -4,18 +4,17 @@
-
+

本所简介

-

公司简介对于一个企业来说，就是一个门面，不管你是网站上的介绍，还是摆在门口的标牌，很多人通过你的简介来了解你，那对于一个企业来说，简介尤为重要，简介内容既要简单。又要把重点说清楚。让大家初步了解，并且让大家有兴趣继续了解该公司。但是目前中小企业对公司简介不知道如何写，控制不好字数多，总是不能好好把握，今天我们在这里好好说说关于公司简介的书写方法。公司简介是什么，就是对公司、对企业的介绍。这种介绍不是一句话带过，也不是长篇大论，是简单扼要的介绍公司的一段文字，让别人初步了解公司的基本情况。

+

{{parentData.jjContent}}

-

联系我们

-
+

联系我们

@@ -24,7 +23,7 @@
联系电话
- 13578914568 + {{parentData.tel}}
@@ -32,15 +31,15 @@
电子邮箱
- gs@qiyeyouxiang.com + {{parentData.dzyx}}
-
+
- +
@@ -72,12 +71,23 @@ export default { computed:{ }, mounted(){ + this.loadData(); }, watch:{ }, updated(){ }, methods:{ + loadData(){ + getAction('/gateway/tqdGatewayConfig/list',{pageSize:-1,column: 'createTime',order: 'desc'}).then((res)=>{ + if(res.success){ + let list = res.result.records + if(list){ + this.parentData = list[0] + } + } + }); + } }, } diff --git a/src/views/gateway/index.vue b/src/views/gateway/index.vue index c45faf0..3dfffd0 100644 --- a/src/views/gateway/index.vue +++ b/src/views/gateway/index.vue @@ -1,5 +1,5 @@