From 4cddc74b252f394b716774aefc13850ff571c341 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Thu, 30 May 2024 17:42:25 +0800 Subject: [PATCH] 1 --- src/assets/point.png | Bin 0 -> 2881 bytes src/assets/point1.png | Bin 0 -> 2994 bytes src/components/Charts/index.vue | 18 ++-- src/views/dataShow/index.vue | 38 ++++++-- src/views/dataShow/map.vue | 131 ++++++++++++++++++++++++++-- src/views/dataShow/right1.vue | 92 +++++++++----------- src/views/dataShow/right2.vue | 148 ++++++++++++-------------------- src/views/dataShow/right3.vue | 125 +++++++++++++++++++++++++++ src/views/dataShow/tooltip.vue | 36 ++++++++ src/views/statics/lease.vue | 4 +- 10 files changed, 424 insertions(+), 168 deletions(-) create mode 100644 src/assets/point.png create mode 100644 src/assets/point1.png create mode 100644 src/views/dataShow/right3.vue create mode 100644 src/views/dataShow/tooltip.vue diff --git a/src/assets/point.png b/src/assets/point.png new file mode 100644 index 0000000000000000000000000000000000000000..123b442f6b8defdde58abfe0c7f843c5f2d80138 GIT binary patch literal 2881 zcmbuB`#;nF`^R4!vo)u+oMSDaVL9fML!-$YDnz7^p)$!B6_UkrhamS`|QlM=D-H#5yi}B*l6A7>@$6Eroeql8z`FECWDX>u*5m;==y|AY#WSJ?%wfp zJz=E;pr0T)-V<5usS%g%JdY~@C5InX_>&aqe|x@X`v|kCAF&eD zwKcU_Dffv9g=7YZPSK;XlErcUha-bCuG4e%(k#TfKj|zhT$Q0E zkU$%eht>DN$XF`Nn*DKB#TA5e{9vwYoN#w(>y;(1bt5!Q9>HdOJ3Mga+T zXFmTfj-*IPp?MIcX2?ZiLl34$t!Mj|9Hxtc1BGg# ztiCg=%t7ywC_5-@`#+|LbGh#W*98ErJRg_y?f>w>wcvO#UEmE5T|k!q3X5iOyuFL~`>i5Z-#k>J(4(>y9+yK7Oo$LBq#dFgLBP{rt~+8YjYzlERVWSJ9mlC=yU(3g^McguDdviYvm9fFees(rj|K5Ipr9CS)%(B_0tA z5J-^x9sH#BesX+|V#yT)&*iK(V{$yC3ET0uzCG<+Q)Zj7Zf7dIykkYQBFX~#t+rj? z$pjrIP%t~@P6<+ysZ&i5w)5o0=Y_nyg|H~POT8W_yiO%AJ_RAaEN7t*m+=yaSuzvg z6_1a=ProTnITIX~bz=a6R-ZsANM~CL-W=#Qc^>3G=3ud;zH;@1HA$YgE;@wikI-I> z0n~Y;^l)t|i18}Yft-g;ZiS2s&SVb5aWs7JwHeu`)zIn$Eaw6m%{QsW4?DOqOLtT* zYE5!vIJHcYPmg{sj3Dcj0Laf|CX{CDEhSQrlemS9CoN>mp4P-N!skk^MG*JX1kYs0#?*Cy(VLTfyk zDDENtoH6}1dDy=O@PDGBTzn_b)Jq@i(+y-T8BUA~LByztnNGbW z{zr@pDbMTGeYLZ8@rqU2(OpX3jcoJw!<(ho+BbF#UY*?f5u0)QRj7>SeA%b5(7mni z(tHf9Fh} z9O1Zz9aPuduHHLvrCyYm zp0168uORa7OC*f*Oc|&AI>Ot~(Q~bOq%vglXWD#8N4)`BFYD{k9;A4TVv%fugd^5f zq!@Dgq}x23aC&o~zU#idgZeyLp4#a-B`toj$*}&4I`p9;&gJ7BKc;)wo9x2DIoSv7 zhB<#LVTt=n+x+TH2@bA!wVUf=h;Gj~xq0o6`1|qlCt=HXcPk0smOG1@O!9J2^sbhI ztOG?(z}99eZa31|5Us^|cQ1OYv-dRsAYO;oPpH;W-;zPUQJe)6wazbp}~NoM-f1&{vR z!!CQY@YpIzS7o2j)6?s?SNLHo>a$f$S@{o&jv|r~{b{-BgA?SlM~oK3a1_e22w=<% z8d0j3r$30v@IVI>efOSOaERJ! z->lb9k=T=m_2Rns>JJ!&RiP)6mW`8|N(uuHrIoU3BwhDPZ$$p=b6(vR+x0zGBie%)vXKz+0~#?wo-#&=x*_(a$uISB?8`>A-#Mj%xbKyW%eeLCR);Vn%d^CAf7 kly>eDD+2ys+tnur9QZ}fcuij7{)qu|)3f+ulPlr>0~=s0bpQYW literal 0 HcmV?d00001 diff --git a/src/assets/point1.png b/src/assets/point1.png new file mode 100644 index 0000000000000000000000000000000000000000..8666268a5ca6042cf4ca127a95795eac7c6ab0e6 GIT binary patch literal 2994 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 JWtM-({TJ<&N)7-3 literal 0 HcmV?d00001 diff --git a/src/components/Charts/index.vue b/src/components/Charts/index.vue index 32bcd39..569f465 100644 --- a/src/components/Charts/index.vue +++ b/src/components/Charts/index.vue @@ -3,7 +3,7 @@ @@ -113,12 +113,12 @@ export default { color: '#fff', fontSize: 16 }, - top: 50, - left: 80 + top: 14, + left: 30 }, legend: { - top: 120, - left: 80, + top: 128, + left: 30, orient: 'vertical', itemGap: 15, itemWidth: 12, @@ -133,7 +133,7 @@ export default { trigger: 'item' }, radar: { - center: ['68%', '27%'], + center: ['58%', '24%'], radius: '40%', name: { color: '#fff' @@ -181,10 +181,10 @@ export default { ] }, grid: { - left: 90, - right: 80, + left: 70, + right: 60, bottom: 40, - top: '60%' + top: '62%' }, xAxis: { type: 'category', diff --git a/src/views/dataShow/index.vue b/src/views/dataShow/index.vue index d6d0e39..a65fdbe 100644 --- a/src/views/dataShow/index.vue +++ b/src/views/dataShow/index.vue @@ -2,8 +2,8 @@
Loading... -
- +
+ @@ -18,6 +18,7 @@
+
@@ -31,6 +32,7 @@ import MapComponent from "./map.vue"; import HeaderComponent from "./header.vue"; import right1 from "./right1.vue"; import right2 from "./right2.vue"; +import right3 from "./right3.vue"; import btns from "./btns.vue"; import leftBottom from "./leftBottom.vue" import { index } from '@/api/system/baseForm'; @@ -40,22 +42,45 @@ export default { HeaderComponent, right1, right2, + right3, btns, leftBottom }, mixins: [drawMixin], provide() { return { - assets: () => this.assetsData + assets: () => this.assetsData, + leases: () => this.leases, } }, data() { return { loading: true, assetsData: [[],[]], + leases: [] } }, methods: { + async getLeases () { + const res = await index({ + table_name: "leases", + page: 1, + page_size: 999, + filter: [ + { + key: 'zulinjieshuqixian', + op: 'range', + value: `${this.$moment().format("YYYY-MM-DD")},2999-12-31` + }, + { + key: 'zulinkaishiqixian', + op: 'range', + value: `${this.$moment(0).format("YYYY-MM-DD")},${this.$moment().format("YYYY-MM-DD")}` + } + ] + }) + console.log(res) + }, async getData () { await Promise.all([ index({ @@ -82,6 +107,7 @@ export default { }, created() { this.getData(); + this.getLeases() } } @@ -107,10 +133,10 @@ export default { left: 50%; .body { - padding-top: 60px; - padding-left: 14%; + padding-top: 20px; + padding-left: 13%; .left { - flex-basis: 60%; + flex-basis: 74%; } .right { flex: 1; diff --git a/src/views/dataShow/map.vue b/src/views/dataShow/map.vue index 56beb9e..45a02b7 100644 --- a/src/views/dataShow/map.vue +++ b/src/views/dataShow/map.vue @@ -4,19 +4,85 @@ diff --git a/src/views/dataShow/right1.vue b/src/views/dataShow/right1.vue index 83b1c45..96e90a2 100644 --- a/src/views/dataShow/right1.vue +++ b/src/views/dataShow/right1.vue @@ -1,11 +1,11 @@ diff --git a/src/views/dataShow/right2.vue b/src/views/dataShow/right2.vue index e70c444..cdf1fa9 100644 --- a/src/views/dataShow/right2.vue +++ b/src/views/dataShow/right2.vue @@ -1,112 +1,78 @@ - let dateBase = new Date(); - this.cdata.year = dateBase.getFullYear(); - // 周数据 - for (let i = 0; i < 7; i++) { - // 日期 - let date = new Date(); - this.cdata.weekCategory.unshift([date.getMonth() + 1, date.getDate()-i].join("/")); + diff --git a/src/views/dataShow/right3.vue b/src/views/dataShow/right3.vue new file mode 100644 index 0000000..48d4dd2 --- /dev/null +++ b/src/views/dataShow/right3.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/views/dataShow/tooltip.vue b/src/views/dataShow/tooltip.vue new file mode 100644 index 0000000..8ef002a --- /dev/null +++ b/src/views/dataShow/tooltip.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/statics/lease.vue b/src/views/statics/lease.vue index 31395a2..d06404c 100644 --- a/src/views/statics/lease.vue +++ b/src/views/statics/lease.vue @@ -252,8 +252,8 @@ export default { }, daterangePick (e) { if (e && e[0] && e[1]) { - this.select.filter[0].value = `${this.$moment(e[0]).format('YYYY-MM-DD HH:mm:ss')},2999-01-01 00:00:00`; - this.select.filter[1].value = `${this.$moment(0).format('YYYY-MM-DD HH:mm:ss')},${this.$moment(e[1]).format('YYYY-MM-DD HH:mm:ss')}`; + this.select.filter[0].value = `${this.$moment(e[0]).format('YYYY-MM-DD')},2999-01-01`; + this.select.filter[1].value = `${this.$moment(0).format('YYYY-MM-DD')},${this.$moment(e[1]).format('YYYY-MM-DD')}`; } else { this.select.filter[0].value = ""; this.select.filter[1].value = "";