diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index dfc52eb..8e4a33b 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -2,7 +2,7 @@ color: #d3d6dd; background-color: #000000; width: 100%; - height: 100vh; + height: 100%; .bg { padding: 0.2rem 0.2rem 0 0.2rem; diff --git a/src/utils/index.js b/src/utils/index.js index 1fb622d..3d5a51a 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -32,3 +32,31 @@ export function debounce(func, wait, immediate) { return result; }; } + +/** + * @param {date} time 需要转换的时间 + * @param {String} fmt 需要转换的格式 如 yyyy-MM-dd、yyyy-MM-dd HH:mm:ss + */ +export function formatTime(time, fmt) { + if (!time) return '' + else { + const date = new Date(time) + const o = { + 'M+': date.getMonth() + 1, + 'd+': date.getDate(), + 'H+': date.getHours(), + 'm+': date.getMinutes(), + 's+': date.getSeconds(), + 'q+': Math.floor((date.getMonth() + 3) / 3), + 'S': date.getMilliseconds() + } + if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length)) + for (const k in o) { + if (new RegExp('(' + k + ')').test(fmt)) { + fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (( + '00' + o[k]).substr(('' + o[k]).length))) + } + } + return fmt + } +} diff --git a/src/views/center.vue b/src/views/center.vue index 6d2d841..9283c7c 100644 --- a/src/views/center.vue +++ b/src/views/center.vue @@ -37,7 +37,7 @@ import centerChart from "@/components/echart/center/centerChartRate"; export default { - data() { + data () { return { titleItem: [ { @@ -112,20 +112,27 @@ export default { value: 80 }, { - name: "新乡", + name: "新乡2", value: 80 }, { - name: "新乡", + name: "新乡3", value: 80 }, { - name: "新乡", + name: "新乡4", value: 80 - } + }, + { + name: "新乡5", + value: 80 + }, + { + name: "新乡6", + value: 80 + }, ], - waitTime: 4000, - carousel: "page", + carousel: "single", unit: "份" }, water: { diff --git a/src/views/index.vue b/src/views/index.vue index ea4113c..092f8e1 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -48,7 +48,7 @@ style="width: 6.25rem; background-color: #0f1325; text-align: right;" > - 2020年03月16日 周一 12:00 + {{dateYear}} {{dateWeek}} {{dateDay}} @@ -97,6 +97,7 @@ \ No newline at end of file