From 4c3f9c111da6341ad09d018d883b87a48d3c2301 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 16 Nov 2023 18:12:59 +0800 Subject: [PATCH] 2023-11-16 --- .../src/assets/loginImg/char.png | Bin 0 -> 1292 bytes .../src/assets/loginImg/data.png | Bin 0 -> 2153 bytes .../src/assets/loginImg/file.png | Bin 0 -> 1536 bytes .../src/assets/loginImg/projet.png | Bin 0 -> 1195 bytes supervise-report-ui/src/main.js | 6 +- supervise-report-ui/src/router/index.js | 26 +- supervise-report-ui/src/utils/index.js | 60 +- .../src/views/index - 副本.vue | 506 +++++++++++++ supervise-report-ui/src/views/index.vue | 705 ++++++++---------- 9 files changed, 907 insertions(+), 396 deletions(-) create mode 100644 supervise-report-ui/src/assets/loginImg/char.png create mode 100644 supervise-report-ui/src/assets/loginImg/data.png create mode 100644 supervise-report-ui/src/assets/loginImg/file.png create mode 100644 supervise-report-ui/src/assets/loginImg/projet.png create mode 100644 supervise-report-ui/src/views/index - 副本.vue diff --git a/supervise-report-ui/src/assets/loginImg/char.png b/supervise-report-ui/src/assets/loginImg/char.png new file mode 100644 index 0000000000000000000000000000000000000000..9e39d35922dcb1e1dc42a4ea5b35e034364164e4 GIT binary patch literal 1292 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 HDWM4fiFNzS literal 0 HcmV?d00001 diff --git a/supervise-report-ui/src/main.js b/supervise-report-ui/src/main.js index 862155d5..dd79d76d 100644 --- a/supervise-report-ui/src/main.js +++ b/supervise-report-ui/src/main.js @@ -49,9 +49,9 @@ VueAMap.initAMapApiLoader({ Vue.config.productionTip = false -let token = null -// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDAyMDA0MzJ9.S-GQgEwnJIW7miKc6KF5w_le5YpsWyCdqkHAzBqwpmE' -token = GetQueryString('token') +// let token = null +let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDAyMTA3MjF9.wq9OgbpBnuvHdJsVzaVA1FM4pdhY-dJM9GUGSkp5mPk' +// token = GetQueryString('token') if (token) { setStorage(token) const href = window.location.href diff --git a/supervise-report-ui/src/router/index.js b/supervise-report-ui/src/router/index.js index f12ddc76..b3b57295 100644 --- a/supervise-report-ui/src/router/index.js +++ b/supervise-report-ui/src/router/index.js @@ -32,19 +32,19 @@ export const constantRoutes = [ }, { path: '/index', - redirect: '/projectDaily/index', - // component: Layout, - // children: [{ - // path: '/index', - // component: () => - // import('@/views/index.vue'), - // name: 'index', - // meta: { - // title: '主页', - // noCache: true, - // affix: true - // } - // }] + // redirect: '/projectDaily/index', + component: Layout, + children: [{ + path: '/index', + component: () => + import('@/views/index.vue'), + name: 'index', + meta: { + title: '主页', + noCache: true, + affix: true + } + }] }, ...codemenu, { diff --git a/supervise-report-ui/src/utils/index.js b/supervise-report-ui/src/utils/index.js index 4830c048..238f9ecd 100644 --- a/supervise-report-ui/src/utils/index.js +++ b/supervise-report-ui/src/utils/index.js @@ -45,7 +45,9 @@ export function parseTime(time, cFormat) { const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { const value = formatObj[key] // Note: getDay() returns 0 on Sunday - if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } + if (key === 'a') { + return ['日', '一', '二', '三', '四', '五', '六'][value] + } return value.toString().padStart(2, '0') }) return time_str @@ -115,3 +117,59 @@ export function param2Obj(url) { }) return obj } +export function getDateRang(val) { + const now = new Date(); // 当前日期 + const nowDayOfWeek = now.getDay(); // 今天本周的第几天 + const nowDay = now.getDate(); // 当前日 + const nowMonth = now.getMonth(); // 当前月 + const nowYear = now.getFullYear(); // 当前年 + const jd = Math.ceil((nowMonth + 1) / 3); + let startTime; + let endTime; + let customTime = []; + switch (val) { + case 'yesterday': // 昨日 + startTime = new Date(nowYear, nowMonth, nowDay - 1); + endTime = new Date(nowYear, nowMonth, nowDay - 1); + break; + case 'week': // 本周 + startTime = new Date(nowYear, nowMonth, nowDay - nowDayOfWeek); + endTime = new Date(nowYear, nowMonth, nowDay + 6 - nowDayOfWeek); + break; + case 'pastWeek': // 近 7 日 + startTime = new Date(nowYear, nowMonth, nowDay - 6); + endTime = new Date(nowYear, nowMonth, nowDay); + break; + case 'month': // 本月 + startTime = new Date(nowYear, nowMonth, 1); + endTime = new Date(nowYear, nowMonth + 1, 0); + break; + case 'pastMonth': // 近 31 日 + startTime = new Date(nowYear, nowMonth, nowDay - 30); + endTime = new Date(nowYear, nowMonth, nowDay); + break; + case 'quarter': // 本季度 + startTime = new Date(nowYear, (jd - 1) * 3, 1); + endTime = new Date(nowYear, jd * 3, 0); + break; + case 'year': // 今年 + startTime = new Date(nowYear, 0, 1); + endTime = new Date(nowYear, 11, 31); + break; + default: // 自定义时间 + customTime = val.split(' - '); + break; + } + // return customTime.length ? customTime : [formatDate(startTime), formatDate(endTime)]; + return formatDate(startTime) +} + + +export function formatDate(date) { + const y = date.getFullYear(); + let m = date.getMonth() + 1; + m = m < 10 ? `0${m}` : m; + let d = date.getDate(); + d = d < 10 ? `0${d}` : d; + return `${y}-${m}-${d}`; +} \ No newline at end of file diff --git a/supervise-report-ui/src/views/index - 副本.vue b/supervise-report-ui/src/views/index - 副本.vue new file mode 100644 index 00000000..2ed3d19c --- /dev/null +++ b/supervise-report-ui/src/views/index - 副本.vue @@ -0,0 +1,506 @@ + + + + + + diff --git a/supervise-report-ui/src/views/index.vue b/supervise-report-ui/src/views/index.vue index 2ed3d19c..7b4df479 100644 --- a/supervise-report-ui/src/views/index.vue +++ b/supervise-report-ui/src/views/index.vue @@ -1,506 +1,453 @@