From adb30490e80319b85f1de150114e5afcd1dda7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=81?= <18339727226@163.com> Date: Thu, 13 Jun 2024 14:31:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=94=B9--=E9=80=89=E6=8B=A9=E5=B9=B4?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E6=89=8D=E6=9C=89=E6=9C=88=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=9C=88=E4=B9=8B=E5=90=8E=E6=89=8D=E6=9C=89=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 4 ++- public/config.js | 5 +++ public/screen.ico | Bin 0 -> 3782 bytes src/App.vue | 6 ++++ src/api/api.ts | 15 ++------- src/api/modules/test.ts | 6 ++-- src/assets/img/big-data/tip_bg.png | Bin 0 -> 7383 bytes src/components/datePicker/datePicker.vue | 38 +++++++++++++---------- src/components/datePicker/dayPane.vue | 8 ----- src/views/index/center-map.vue | 18 +++++------ src/views/index/left-bottom.vue | 8 ----- 11 files changed, 49 insertions(+), 59 deletions(-) create mode 100644 public/config.js create mode 100644 public/screen.ico create mode 100644 src/assets/img/big-data/tip_bg.png diff --git a/index.html b/index.html index 2b16763..f223854 100644 --- a/index.html +++ b/index.html @@ -1,10 +1,12 @@ +
- +NYz4fEk(9ErK7c-vw}HC>g?D9g1*UwcA50TPuE>O1eJ?^(+m ze&nK}v_Z)~$op}^fu8Mx$hWa^Q2@}k-SLIATaZIn8NBlZp#y$lx^?1m#&C$Qg((cx zlEt&oCvhG<4S*84`%e403t~Gn(>;U2yyhjEvI6@@FG-$^3Xcnk582*o{c(Cj`+%Zg zgJAMhhxeBUA08?wNFRmG4CTMdxE=d3b)V+TrKYC%espt0c916!a5AB zoxA70_vrJu{_F1|jlupg%d47WMeZ7$bGdbFhxtOyjVE69KRrs{lj3&>q-5?ryX%nP zC(gHt_B~l`!a5s!cc+9ZxH$%XsA_q$0BOtInDQ}xmR(N6_UeO -zswSM=kwbjaQ|NcI4Kz$d+IAK$Mo87>tJ#*3EK{5h7B$`jH6-#nW zH#Ie-fiq6SvVD_rg1ER+$;FFzPsGH;1On1}y{V)BtEv1S4DwdJ!6&rUq}3^eD;e*R z%b+oP*S9(VcM3EVuX8-`fh(fk+fh-en{1N}9?f9f__yqCm|J^y`y@~k611^U@%qNb zYi4F<)6U&Ra;*msAFfQRt(CJiP`zAhtfVL{^5DUPtH3UQ9oZh6kj#jIt1l{cMcqGi zXu~N-bDQ*2si~=5WSN8IVB*(ra0)gwB^Bn@I)4&bYccWkOW=L-tx6T+mOGi5?0o@8 zZ$KYXRLkfzmp*D>W#XN1rDdy=l5OX%WMAwn=rufN&HTjYeUu*yvQnwpI2$7W%kkaY zK8^=RZk*EJTvlSEk$m&fqeq`VefspUA~^DP=}nJjt0}A4XJ?C*s?BKpGkQLqp0kVm z7oWU(flZz|29ruYvqxt~ge&ju+s*>;&@Y?Xu8|09()37jY*6|nuQ3+XywvI3_2E4a zgXTti5BUuReZKa&SW&UzPAOUTRso3vQCC;LH#}iF73@$|c@ lJC}_;kDW-8TP-)Xt(TM$@yr8jTWG5wD=XX6^(Eq_ zPC2D3vD`D&(WpIK*%TH8n`w(r^>%D0-wNpp9PpbDeigjEz!u-n8w@*;e*Ts0K}9y( zqdhu$IqPg~M3;RzwJ1=V)9GmQ`dm!_5SAr4bEJnWu97~N5u#hZiE3Nc&k-!a@t;>` zB}dU!w6wGiCexn1Nga77za~eHpm;wh#HV3%or-8_6|G2hAYTD6a>aqZ17?CWnZaYY zr9C#qzG(qt x-Oc@iB`%ty(fxg`d2s W#ID-#s~-eUG`F{rbIPRVlf)-ZbvDWmn0&2LFjki)BER_AcbRS20gA%VP2a z(5({6N&^|qXZ5(oHDwzEHMBm90MbJnp&8Mn^pq !WM)Y04C@zN3l}cqXQA*VI{Y={tL) z`hTh6n{P*FoDuXFTeog>c-33q8<|{)-yBQZHosgwCHH)MV5sz1jLorT`(y72wf1pQ zL}p>HJKXR{dX|6F?vDcV#@(bicu!zW$edi0X@$TXuI6U@dcctq+p&N4OO2hffRLM# zWmmEaIxUbeHA%2tF@t&}n>8X*dW%*>lkv6}sFfN@%}v~BRK*osd;6BZ1lU!E@;V~P zmk-}$AgLq+IdU?4`&Mf!OxP*c?WJAKqm;*n#5+;)CX~>6!7^QIN a^nhuGMB1v0pdwubjpH9W|QvS2c VBcLbQ{lfp785@|9c)Oe;{sA*NQlkI> literal 0 HcmV?d00001 diff --git a/src/components/datePicker/datePicker.vue b/src/components/datePicker/datePicker.vue index c65a1f7..0ca8632 100644 --- a/src/components/datePicker/datePicker.vue +++ b/src/components/datePicker/datePicker.vue @@ -1,11 +1,4 @@ - + @@ -64,21 +57,29 @@ const myDay = ref(props.myDate.day); // tabs 切换 const activeTab = ref(0); const tabs = computed(() => { - return [ - { title: '年', content: myYear.value }, - { title: '月', content: myMonth.value }, - { title: '日', content: myDay.value }, + let items = [ + { title: '年', content: myYear.value } ]; -}) + + // 只有年份被选定时,才显示月份选项 + if (myYear.value) { + items.push({ title: '月', content: myMonth.value }); + + // 当年份和月份都被选定时,才显示日期选项 + if (myMonth.value) { + items.push({ title: '日', content: myDay.value }); + } + } + + return items; +}); const changeTab = (index: number) => { activeTab.value = index; }; - - // Select an option from the datePicker const confirmDate = () => { // 当日期有值, 但是月份或者年份没值的时候 提示 - if (myDay.value !== 0) { + /* if (myDay.value !== 0) { if (myYear.value === 0) { ElMessage.error('请选择年份') return @@ -94,12 +95,15 @@ const confirmDate = () => { ElMessage.error('请选择年份') return } - } + } */ // 年份必须有值 if (myYear.value === 0) { ElMessage.error('请选择年份') return } + if (myMonth.value === 0) { + myDay.value = 0 + } isOpen.value = false; // Close the datePicker // 将选择的值传递给父组件 let dates = { diff --git a/src/components/datePicker/dayPane.vue b/src/components/datePicker/dayPane.vue index 568ab83..e7e40ed 100644 --- a/src/components/datePicker/dayPane.vue +++ b/src/components/datePicker/dayPane.vue @@ -1,11 +1,3 @@ - diff --git a/src/views/index/center-map.vue b/src/views/index/center-map.vue index f9c7b84..97c7bb9 100644 --- a/src/views/index/center-map.vue +++ b/src/views/index/center-map.vue @@ -25,14 +25,14 @@ const getMapChart = (data) => { borderColor: '#2BEDF6', //tooltip边框颜色 borderWidth: 0, //去掉白色边框 formatter: function (params) { // 格式化函数,用于自定义 tooltip 的内容 - var html = ''; - html += '' + (params.name) + ''; // 显示名称 - html += '' + '统招本科:' + (params.num3 || 0) + ''; // 显示人数 - html += '' + '统招专科:' + (params.num1 || 0) + ''; // 显示人数 + var html = ''; + html += '' + (params.name) + ''; // 显示名称 + html += '' + '统招本科:' + (params.num3 || 0) + ''; // 显示人数 + html += '' + '统招专科:' + (params.num1 || 0) + ''; // 显示人数 // html += ''+'统招专升本:' + (params.data.num2 || 0) + ''; // 显示人数 - if (params.num2) { - html += '' + '统招专升本:' + (params.num2 || 0) + ''; - } + // if (params.num2) { + html += '' + '统招专升本:' + (params.num2 || 0) + ''; + // } html += ''; return html; } @@ -119,11 +119,11 @@ const getMapChart = (data) => { colorStops: [ { offset: 0.5, - color: '#0D59C1', // 0% 处的颜色 + color: '#b3d0ff', // 0% 处的颜色 }, { offset: 1, - color: '#b4d9c7', // 100% 处的颜色 + color: '#b3d0ff', // 100% 处的颜色 }, ], global: true, // 缺省为 false diff --git a/src/views/index/left-bottom.vue b/src/views/index/left-bottom.vue index 99147de..0829133 100644 --- a/src/views/index/left-bottom.vue +++ b/src/views/index/left-bottom.vue @@ -1,11 +1,3 @@ -