diff --git a/.env.production b/.env.production index e69de29..2658b19 100644 --- a/.env.production +++ b/.env.production @@ -0,0 +1,2 @@ +# VUE_APP_PATH_PRE='http://192.168.0.188:8118' +VUE_APP_PATH_PRE='http://121.41.91.94:12002' \ No newline at end of file diff --git a/public/blue/0.png b/public/blue/0.png new file mode 100644 index 0000000..d557d01 Binary files /dev/null and b/public/blue/0.png differ diff --git a/public/blue/1.png b/public/blue/1.png new file mode 100644 index 0000000..0c7425e Binary files /dev/null and b/public/blue/1.png differ diff --git a/public/blue/10.png b/public/blue/10.png new file mode 100644 index 0000000..c97b0ca Binary files /dev/null and b/public/blue/10.png differ diff --git a/public/blue/11.png b/public/blue/11.png new file mode 100644 index 0000000..7cdc0a8 Binary files /dev/null and b/public/blue/11.png differ diff --git a/public/blue/12.png b/public/blue/12.png new file mode 100644 index 0000000..3d3e6be Binary files /dev/null and b/public/blue/12.png differ diff --git a/public/blue/13.png b/public/blue/13.png new file mode 100644 index 0000000..7ea075b Binary files /dev/null and b/public/blue/13.png differ diff --git a/public/blue/14.png b/public/blue/14.png new file mode 100644 index 0000000..dfaebfc Binary files /dev/null and b/public/blue/14.png differ diff --git a/public/blue/15.png b/public/blue/15.png new file mode 100644 index 0000000..cf11883 Binary files /dev/null and b/public/blue/15.png differ diff --git a/public/blue/16.png b/public/blue/16.png new file mode 100644 index 0000000..2cffcd5 Binary files /dev/null and b/public/blue/16.png differ diff --git a/public/blue/17.png b/public/blue/17.png new file mode 100644 index 0000000..6f60bd5 Binary files /dev/null and b/public/blue/17.png differ diff --git a/public/blue/18.png b/public/blue/18.png new file mode 100644 index 0000000..c333264 Binary files /dev/null and b/public/blue/18.png differ diff --git a/public/blue/19.png b/public/blue/19.png new file mode 100644 index 0000000..bc97ea3 Binary files /dev/null and b/public/blue/19.png differ diff --git a/public/blue/2.png b/public/blue/2.png new file mode 100644 index 0000000..da7a5ba Binary files /dev/null and b/public/blue/2.png differ diff --git a/public/blue/20.png b/public/blue/20.png new file mode 100644 index 0000000..4d49488 Binary files /dev/null and b/public/blue/20.png differ diff --git a/public/blue/21.png b/public/blue/21.png new file mode 100644 index 0000000..528c5e6 Binary files /dev/null and b/public/blue/21.png differ diff --git a/public/blue/22.png b/public/blue/22.png new file mode 100644 index 0000000..bd34ea6 Binary files /dev/null and b/public/blue/22.png differ diff --git a/public/blue/23.png b/public/blue/23.png new file mode 100644 index 0000000..fa98b6c Binary files /dev/null and b/public/blue/23.png differ diff --git a/public/blue/24.png b/public/blue/24.png new file mode 100644 index 0000000..f68c1c0 Binary files /dev/null and b/public/blue/24.png differ diff --git a/public/blue/25.png b/public/blue/25.png new file mode 100644 index 0000000..49daf31 Binary files /dev/null and b/public/blue/25.png differ diff --git a/public/blue/26.png b/public/blue/26.png new file mode 100644 index 0000000..40a757d Binary files /dev/null and b/public/blue/26.png differ diff --git a/public/blue/27.png b/public/blue/27.png new file mode 100644 index 0000000..6bad2a8 Binary files /dev/null and b/public/blue/27.png differ diff --git a/public/blue/28.png b/public/blue/28.png new file mode 100644 index 0000000..7a20e13 Binary files /dev/null and b/public/blue/28.png differ diff --git a/public/blue/29.png b/public/blue/29.png new file mode 100644 index 0000000..8a09fbe Binary files /dev/null and b/public/blue/29.png differ diff --git a/public/blue/3.png b/public/blue/3.png new file mode 100644 index 0000000..6616521 Binary files /dev/null and b/public/blue/3.png differ diff --git a/public/blue/30.png b/public/blue/30.png new file mode 100644 index 0000000..5b8bbe6 Binary files /dev/null and b/public/blue/30.png differ diff --git a/public/blue/31.png b/public/blue/31.png new file mode 100644 index 0000000..edc892b Binary files /dev/null and b/public/blue/31.png differ diff --git a/public/blue/32.png b/public/blue/32.png new file mode 100644 index 0000000..43bdd68 Binary files /dev/null and b/public/blue/32.png differ diff --git a/public/blue/33.png b/public/blue/33.png new file mode 100644 index 0000000..049a6d9 Binary files /dev/null and b/public/blue/33.png differ diff --git a/public/blue/34.png b/public/blue/34.png new file mode 100644 index 0000000..d2d4a0f Binary files /dev/null and b/public/blue/34.png differ diff --git a/public/blue/35.png b/public/blue/35.png new file mode 100644 index 0000000..af18b5f Binary files /dev/null and b/public/blue/35.png differ diff --git a/public/blue/36.png b/public/blue/36.png new file mode 100644 index 0000000..511c3e0 Binary files /dev/null and b/public/blue/36.png differ diff --git a/public/blue/37.png b/public/blue/37.png new file mode 100644 index 0000000..b56cc78 Binary files /dev/null and b/public/blue/37.png differ diff --git a/public/blue/38.png b/public/blue/38.png new file mode 100644 index 0000000..b6eab99 Binary files /dev/null and b/public/blue/38.png differ diff --git a/public/blue/39.png b/public/blue/39.png new file mode 100644 index 0000000..a40f16b Binary files /dev/null and b/public/blue/39.png differ diff --git a/public/blue/4.png b/public/blue/4.png new file mode 100644 index 0000000..bab95fc Binary files /dev/null and b/public/blue/4.png differ diff --git a/public/blue/40.png b/public/blue/40.png new file mode 100644 index 0000000..8354b9d Binary files /dev/null and b/public/blue/40.png differ diff --git a/public/blue/41.png b/public/blue/41.png new file mode 100644 index 0000000..3211077 Binary files /dev/null and b/public/blue/41.png differ diff --git a/public/blue/42.png b/public/blue/42.png new file mode 100644 index 0000000..b825473 Binary files /dev/null and b/public/blue/42.png differ diff --git a/public/blue/43.png b/public/blue/43.png new file mode 100644 index 0000000..1c2d91a Binary files /dev/null and b/public/blue/43.png differ diff --git a/public/blue/44.png b/public/blue/44.png new file mode 100644 index 0000000..a0f481c Binary files /dev/null and b/public/blue/44.png differ diff --git a/public/blue/45.png b/public/blue/45.png new file mode 100644 index 0000000..8f79653 Binary files /dev/null and b/public/blue/45.png differ diff --git a/public/blue/46.png b/public/blue/46.png new file mode 100644 index 0000000..5f0e2b1 Binary files /dev/null and b/public/blue/46.png differ diff --git a/public/blue/47.png b/public/blue/47.png new file mode 100644 index 0000000..a80ee93 Binary files /dev/null and b/public/blue/47.png differ diff --git a/public/blue/48.png b/public/blue/48.png new file mode 100644 index 0000000..24532bb Binary files /dev/null and b/public/blue/48.png differ diff --git a/public/blue/49.png b/public/blue/49.png new file mode 100644 index 0000000..ddbdaec Binary files /dev/null and b/public/blue/49.png differ diff --git a/public/blue/5.png b/public/blue/5.png new file mode 100644 index 0000000..ea59dfd Binary files /dev/null and b/public/blue/5.png differ diff --git a/public/blue/50.png b/public/blue/50.png new file mode 100644 index 0000000..480b8bf Binary files /dev/null and b/public/blue/50.png differ diff --git a/public/blue/51.png b/public/blue/51.png new file mode 100644 index 0000000..508ec44 Binary files /dev/null and b/public/blue/51.png differ diff --git a/public/blue/52.png b/public/blue/52.png new file mode 100644 index 0000000..dc1a99d Binary files /dev/null and b/public/blue/52.png differ diff --git a/public/blue/53.png b/public/blue/53.png new file mode 100644 index 0000000..24c6177 Binary files /dev/null and b/public/blue/53.png differ diff --git a/public/blue/54.png b/public/blue/54.png new file mode 100644 index 0000000..96fa6ba Binary files /dev/null and b/public/blue/54.png differ diff --git a/public/blue/55.png b/public/blue/55.png new file mode 100644 index 0000000..1068cc1 Binary files /dev/null and b/public/blue/55.png differ diff --git a/public/blue/56.png b/public/blue/56.png new file mode 100644 index 0000000..9e0c0a9 Binary files /dev/null and b/public/blue/56.png differ diff --git a/public/blue/57.png b/public/blue/57.png new file mode 100644 index 0000000..dba381a Binary files /dev/null and b/public/blue/57.png differ diff --git a/public/blue/58.png b/public/blue/58.png new file mode 100644 index 0000000..4b7911c Binary files /dev/null and b/public/blue/58.png differ diff --git a/public/blue/59.png b/public/blue/59.png new file mode 100644 index 0000000..cbffebd Binary files /dev/null and b/public/blue/59.png differ diff --git a/public/blue/6.png b/public/blue/6.png new file mode 100644 index 0000000..e365984 Binary files /dev/null and b/public/blue/6.png differ diff --git a/public/blue/7.png b/public/blue/7.png new file mode 100644 index 0000000..e510a14 Binary files /dev/null and b/public/blue/7.png differ diff --git a/public/blue/8.png b/public/blue/8.png new file mode 100644 index 0000000..7310d70 Binary files /dev/null and b/public/blue/8.png differ diff --git a/public/blue/9.png b/public/blue/9.png new file mode 100644 index 0000000..48a40c8 Binary files /dev/null and b/public/blue/9.png differ diff --git a/public/images/0.png b/public/images/0.png new file mode 100644 index 0000000..ce9e0d8 Binary files /dev/null and b/public/images/0.png differ diff --git a/public/images/bzbg.png b/public/images/bzbg.png new file mode 100644 index 0000000..d3bfaf2 Binary files /dev/null and b/public/images/bzbg.png differ diff --git a/public/images/bztx-card.png b/public/images/bztx-card.png new file mode 100644 index 0000000..6219557 Binary files /dev/null and b/public/images/bztx-card.png differ diff --git a/public/images/bztx.jpg b/public/images/bztx.jpg deleted file mode 100644 index 8721dfb..0000000 Binary files a/public/images/bztx.jpg and /dev/null differ diff --git a/public/images/bztxcard.png b/public/images/bztxcard.png new file mode 100644 index 0000000..7b24f6a Binary files /dev/null and b/public/images/bztxcard.png differ diff --git a/public/images/checkbg.png b/public/images/checkbg.png new file mode 100644 index 0000000..ab991ab Binary files /dev/null and b/public/images/checkbg.png differ diff --git a/public/images/cyky.png b/public/images/cyky.png new file mode 100644 index 0000000..0156b75 Binary files /dev/null and b/public/images/cyky.png differ diff --git a/public/images/dx1.png b/public/images/dx1.png new file mode 100644 index 0000000..5db4ee7 Binary files /dev/null and b/public/images/dx1.png differ diff --git a/public/images/sf1.png b/public/images/sf1.png new file mode 100644 index 0000000..8c4f27a Binary files /dev/null and b/public/images/sf1.png differ diff --git a/public/images/sf2.png b/public/images/sf2.png new file mode 100644 index 0000000..025f345 Binary files /dev/null and b/public/images/sf2.png differ diff --git a/public/images/sf3.png b/public/images/sf3.png new file mode 100644 index 0000000..c5e0856 Binary files /dev/null and b/public/images/sf3.png differ diff --git a/public/images/sxt.png b/public/images/sxt.png new file mode 100644 index 0000000..7654797 Binary files /dev/null and b/public/images/sxt.png differ diff --git a/public/images/time.png b/public/images/time.png new file mode 100644 index 0000000..131761f Binary files /dev/null and b/public/images/time.png differ diff --git a/public/images/tp.png b/public/images/tp.png new file mode 100644 index 0000000..bd22cb6 Binary files /dev/null and b/public/images/tp.png differ diff --git a/public/images/vediobg.png b/public/images/vediobg.png new file mode 100644 index 0000000..4cac6b0 Binary files /dev/null and b/public/images/vediobg.png differ diff --git a/public/images/xcybg.png b/public/images/xcybg.png new file mode 100644 index 0000000..158a19a Binary files /dev/null and b/public/images/xcybg.png differ diff --git a/public/index.html b/public/index.html index 6c73c6c..35602f9 100644 --- a/public/index.html +++ b/public/index.html @@ -6,7 +6,7 @@ - FAST功能农业国家大数据中心 + 功能农业国家大数据中心 \ No newline at end of file diff --git a/src/views/cptj/components/company.vue b/src/views/cptj/components/company.vue index c4cfda0..c8f42ca 100644 --- a/src/views/cptj/components/company.vue +++ b/src/views/cptj/components/company.vue @@ -7,7 +7,7 @@
-
{{ item.brandName }}
+
@@ -69,15 +69,15 @@ export default { .company-wrap { .company-content { - height: 158px; + height: 14vh; overflow: hidden; - .company-item { display: inline-block; margin: 3px 5px; width: 195px; - height: 130px; + height: 13.13vh; border: 4px solid #2A70C6; + border-radius: 1px; } .item-content{ font-family: PingFangSC, PingFang SC; diff --git a/src/views/cptj/components/dsxh.vue b/src/views/cptj/components/dsxh.vue index f201802..83bc395 100644 --- a/src/views/cptj/components/dsxh.vue +++ b/src/views/cptj/components/dsxh.vue @@ -41,7 +41,7 @@ export default { textStyle: { color: '#E0E0E0' }, - fontSize: 12 + fontSize: 10 }, grid: { top: '20%', @@ -59,7 +59,7 @@ export default { name: '日期', nameTextStyle: { //坐标轴名称的文字样式 color: '#ECF4F9', //坐标轴名称的颜色 - fontSize: 12, //坐标轴名称的大小 (用数字表示) + fontSize: 10, //坐标轴名称的大小 (用数字表示) // fontWeight: 'bold', //坐标轴文字加粗程度 (可选bold bolder lighter normal) // fontstyle: 'normal', //坐标轴文字样式 (可选normal italic oblique) // fontFamily: '华文行楷', //坐标轴文字风格 (可选楷体 宋体 华文行楷等等) @@ -87,16 +87,18 @@ export default { axisLabel: { interval: 0, //0 表示所有标签都显示 color: '#ECF4F9', - rotate: 45, //旋转角度为01 + // rotate: 45, //旋转角度为01 // align: 'center', - fontSize: 12, - lineHeight: 14, + fontSize: 10, + // lineHeight: 14, textStyle: { with: '30px', wordBreak: 'break-all' }, + - } + }, + axisLine: { show: false, }, } ], yAxis: { @@ -117,12 +119,12 @@ export default { show: true, //是否显示 lineStyle: { //网格线样式 color: '#ECF4F9', //网格线颜色 - width: 1, //网格线的加粗程度 - type: 'dashed', //网格线类型 + width: 0.5, //网格线的加粗程度 + type: 'solid', //网格线类型 opacity: 0.2 } }, - axisLine: { show: true, }, + axisLine: { show: false, }, axisLabel: { // interval: 0, //0 表示所有标签都显示 color: '#ECF4F9', @@ -221,16 +223,14 @@ export default { var data = [] var allData = 0 for (const key in res.data) { - // let monthItem = key && key.split("-")[1] + let monthItem = key && key.split("-")[1] // 去除字符串前面的0 - // let monthItemNew = monthItem.replace(/^0+/, '') - // xAxisData.push(monthItemNew) - xAxisData.push(key) + let monthItemNew = monthItem.replace(/^0+/, '') + xAxisData.push(monthItemNew) + // xAxisData.push(key) data.push(res.data[key]) allData += res.data[key] * 1 } - // var formatAllData = this.formatNumber(allData) - // this.sealAll = formatAllData.split("") this.sealAll = String(allData).split("") console.log(111, allData, this.sealAll) this.option.xAxis[0].data = xAxisData @@ -279,13 +279,13 @@ export default { .item { width: 64px; - height: 72px; + height: 7.826vh; font-size: 48px; text-align: center; font-family: D-DIN, D-DIN; font-weight: bold; color: #FFFFFF; - line-height: 68px; + line-height: 7.826vh; text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5), 0px 4px 0px rgba(28, 67, 111, 0.56); background: linear-gradient(180deg, #FFFFFF 0%, #63B3FF 100%); background-image: url('../../../../public/images/seal-bg.png'); @@ -294,7 +294,7 @@ export default { } .dsxh-chart { - height: 200px; + height: 16.304vh; } } diff --git a/src/views/cptj/components/exportor.vue b/src/views/cptj/components/exportor.vue index 06e2605..89a162f 100644 --- a/src/views/cptj/components/exportor.vue +++ b/src/views/cptj/components/exportor.vue @@ -62,18 +62,18 @@ export default { font-family: PingFangSC, PingFang SC; .export-wrap { - height: 380px; - overflow: hidden; + height: 35.608vh; + overflow: scroll; width: 100%; - .item { width: 100%; - height: 40px; + height: 4.548vh; background-image: url('../../../../public/images/sf-bg.png'); padding: 0 2px; - margin-bottom: 10px; + margin-bottom: 0.109vh; display: flex; align-items: center; + margin-bottom: 1.1vh; .name, .xl { @@ -85,8 +85,8 @@ export default { text-align: left; text-align: center; width: 50%; - height: 40px; - line-height: 40px; + height: 4.348vh; + line-height: 4.348vh; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/src/views/cptj/components/hypt.vue b/src/views/cptj/components/hypt.vue index afd6efe..efe28e6 100644 --- a/src/views/cptj/components/hypt.vue +++ b/src/views/cptj/components/hypt.vue @@ -76,21 +76,20 @@ export default { font-size: 14px; .hypt-wrap { - height: 150px; + height: 16.304vh; overflow: hidden; - .item { - height: 40px; + height: 4.348vh; background-image: url('../../../../public/images/sf-bg.png'); display: flex; align-items: center; justify-content: space-between; padding: 0 20px; - margin-bottom: 10px; + margin-bottom: 1.086vh; img { width: 14px; - vertical-align: -2px; + vertical-align: -0.217vh; margin-right: 5px; } } diff --git a/src/views/cptj/components/news.vue b/src/views/cptj/components/news.vue index 191ed88..a708263 100644 --- a/src/views/cptj/components/news.vue +++ b/src/views/cptj/components/news.vue @@ -81,17 +81,17 @@ export default { font-size: 14px; .news-wrap { - height: 232px; + height: 20.87vh; overflow: hidden; .item { - height: 48px; + height: 4.13vh; background-image: url('../../../../public/images/sf-bg.png'); display: flex; align-items: center; justify-content: space-between; padding: 0 20px; - margin-bottom: 10px; + margin-bottom: 1.087vh; .item-left { width: 70%; @@ -114,10 +114,10 @@ export default { } .newContent { - height: 550px; + height: 60vh; background-color: #fff; box-sizing: border-box; - padding: 20px 40px; + padding: 2.174vh 40px; overflow: auto; h2 { diff --git a/src/views/cptj/components/sealData.vue b/src/views/cptj/components/sealData.vue index 7f94d8e..efcac28 100644 --- a/src/views/cptj/components/sealData.vue +++ b/src/views/cptj/components/sealData.vue @@ -80,12 +80,11 @@ export default { .sealData-wrap { .seal-content { display: flex; - height: 172px; + height: 17.391vh; align-items: center; - .left-content { width: 122px; - height: 172px; + height: 17.391vh; background-image: url('../../../../public/images/allseal-bg.png'); display: flex; align-items: center; @@ -95,16 +94,16 @@ export default { .imgs { width: 60px; - height: 60px; + height: 6.521vh; } .jb-title { width: 80px; - height: 32px; - line-height: 32px; + height: 3.521vh; + line-height: 3.521vh; text-align: center; margin-bottom: 20px; - font-size: 18px; + font-size: 16px; font-family: D, D; font-weight: normal; color: #FFFFFF; @@ -115,18 +114,17 @@ export default { .right-content { width: calc(100% - 122px); - height: 172px; + height: 17.391vh; overflow: auto; .items { height: 25% !important; width: 100%; - background-color: red; overflow: hidden; .label { - margin: 3px 0 3px 20px; - font-size: 14px; + margin: 0.326vh 0 0.326vh 20px; + font-size: 12px; } .percentage { @@ -136,7 +134,7 @@ export default { } .items /deep/ .el-progress-bar__outer { - height: 10px !important; + height: 5px !important; } .items .zColor /deep/ .el-progress-bar__inner { diff --git a/src/views/cptj/components/tongji.vue b/src/views/cptj/components/tongji.vue index 71eb3fb..5855e3f 100644 --- a/src/views/cptj/components/tongji.vue +++ b/src/views/cptj/components/tongji.vue @@ -40,14 +40,13 @@ export default { \ No newline at end of file diff --git a/src/views/cygh/components/base.vue b/src/views/cygh/components/base.vue index c055975..ad74ed4 100644 --- a/src/views/cygh/components/base.vue +++ b/src/views/cygh/components/base.vue @@ -73,7 +73,6 @@ export default { \ No newline at end of file diff --git a/src/views/cygh/components/heighCharts3d.vue b/src/views/cygh/components/heighCharts3d.vue new file mode 100644 index 0000000..84d04d9 --- /dev/null +++ b/src/views/cygh/components/heighCharts3d.vue @@ -0,0 +1,232 @@ + + + \ No newline at end of file diff --git a/src/views/cygh/components/sfxm.vue b/src/views/cygh/components/sfxm.vue index 96a570d..e520236 100644 --- a/src/views/cygh/components/sfxm.vue +++ b/src/views/cygh/components/sfxm.vue @@ -46,7 +46,7 @@ export default { computed: { classOption() { return { - step: 0, // 数值越大速度滚动越快 + step: 0.2, // 数值越大速度滚动越快 limitMoveNum: 1, // 开始无缝滚动的数据量 this.dataList.length hoverStop: true, // 是否开启鼠标悬停stop direction: 1, // 0向下 1向上 2向左 3向右 @@ -84,20 +84,19 @@ export default { +} + diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 19914be..05c86f0 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -1,5 +1,8 @@