From 06d4f0ec91fa51a991f6de52466284796de6e8dc Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Wed, 28 May 2025 08:41:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/system-boot/csstatisticalset.ts | 43 +- src/api/user-boot/dept.ts | 36 ++ src/api/user-boot/user.ts | 7 + src/assets/imgs/1x1.png | Bin 0 -> 118 bytes src/assets/imgs/2x2.png | Bin 0 -> 137 bytes src/assets/imgs/2x3.png | Bin 0 -> 160 bytes src/assets/imgs/3x3.png | Bin 0 -> 179 bytes src/assets/imgs/amplify.png | Bin 0 -> 4439 bytes src/assets/imgs/reduce.png | Bin 0 -> 4689 bytes src/components/echarts/MyEchart.vue | 2 +- src/styles/vxeTable.scss | 8 +- src/utils/formatTime.ts | 328 +++++++-------- src/views/cockpit/TerminalLog.vue | 105 +++++ src/views/cockpit/qualifiedRate.vue | 263 ++++++++++++ src/views/cockpit/testEchart.vue | 98 +++++ src/views/pqs/cockpit/homePage/index.vue | 242 ++++++++++++ .../pqs/cockpit/setUp/components/popup.vue | 374 ++++++++++++++++++ src/views/pqs/cockpit/setUp/index.vue | 287 ++++++++++++++ .../setting/dictionary/component/add.vue | 113 ++++++ .../setting/dictionary/component/index.vue | 129 ++++++ 21 files changed, 1866 insertions(+), 170 deletions(-) create mode 100644 src/assets/imgs/1x1.png create mode 100644 src/assets/imgs/2x2.png create mode 100644 src/assets/imgs/2x3.png create mode 100644 src/assets/imgs/3x3.png create mode 100644 src/assets/imgs/amplify.png create mode 100644 src/assets/imgs/reduce.png create mode 100644 src/views/cockpit/TerminalLog.vue create mode 100644 src/views/cockpit/qualifiedRate.vue create mode 100644 src/views/cockpit/testEchart.vue create mode 100644 src/views/pqs/cockpit/homePage/index.vue create mode 100644 src/views/pqs/cockpit/setUp/components/popup.vue create mode 100644 src/views/pqs/cockpit/setUp/index.vue create mode 100644 src/views/setting/dictionary/component/add.vue create mode 100644 src/views/setting/dictionary/component/index.vue diff --git a/package.json b/package.json index dba621cd..f20bcbfb 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "element-plus": "^2.8.7", "exceljs": "^4.4.0", "file-saver": "^2.0.5", + "grid-layout-plus": "^1.1.0", "html2canvas": "^1.4.1", "jquery": "^3.7.1", "js-pinyin": "^0.2.5", diff --git a/src/api/system-boot/csstatisticalset.ts b/src/api/system-boot/csstatisticalset.ts index c3d8b367..5385f0a5 100644 --- a/src/api/system-boot/csstatisticalset.ts +++ b/src/api/system-boot/csstatisticalset.ts @@ -1,6 +1,6 @@ import createAxios from '@/utils/request' // 查询指标 -export const queryStatistical = (id:string) => { +export const queryStatistical = (id: string) => { let form = new FormData() form.append('id', id) return createAxios({ @@ -14,10 +14,49 @@ export const queryStatistical = (id:string) => { } // 绑定指标 -export const addStatistical = (params:any) => { +export const addStatistical = (params: any) => { return createAxios({ url: '/system-boot/csstatisticalset/addStatistical', method: 'post', data: params }) } +// 新增驾驶舱页面 +export const addDashboard = (data: any) => { + return createAxios({ + url: '/system-boot/dashboard/addDashboard', + method: 'post', + data: data + }) +} +// 修改驾驶舱页面 +export const updateDashboard = (data: any) => { + return createAxios({ + url: '/system-boot/dashboard/updateDashboard', + method: 'post', + data: data + }) +} +// 删除驾驶舱页面 +export const deleteDashboard = (params: any) => { + return createAxios({ + url: '/system-boot/dashboard/deleteDashboard', + method: 'post', + params + }) +} +// 激活的驾驶舱页面 +export const activatePage = (params: any) => { + return createAxios({ + url: '/system-boot/dashboard/activatePage', + method: 'post', + params + }) +} +// 查询激活的驾驶舱页面 +export const queryActivatePage = () => { + return createAxios({ + url: '/system-boot/dashboard/queryActivatePage', + method: 'post' + }) +} diff --git a/src/api/user-boot/dept.ts b/src/api/user-boot/dept.ts index 3839c30f..2afd75cd 100644 --- a/src/api/user-boot/dept.ts +++ b/src/api/user-boot/dept.ts @@ -80,3 +80,39 @@ export function getDeptListByIds(data:any) { }) } +// 查询组件 +export function getFatherComponent(params:any) { + return request({ + url: '/user-boot/component/getFatherComponent', + method: 'GET', + params + }) +} + +// 删除组件 +export function deleteSubassembly(params:any) { + return request({ + url: '/user-boot/component/delete', + method: 'DELETE', + params + }) +} + +// 新增组件 +export function componentAdd(data:any) { + return request({ + url: '/user-boot/component/add', + method: 'post', + data + }) +} + +// 修改组件 +export function componentEdit(data:any) { + return request({ + url: '/user-boot/component/update', + method: 'put', + data + }) +} + diff --git a/src/api/user-boot/user.ts b/src/api/user-boot/user.ts index 480dc2db..e4d325b5 100644 --- a/src/api/user-boot/user.ts +++ b/src/api/user-boot/user.ts @@ -206,3 +206,10 @@ export const getSysConfig = () => { method: 'get' }) } +// 驾驶舱组件配置 +export const componentTree = () => { + return request({ + url: '/user-boot/component/componentTree', + method: 'GET' + }) +} diff --git a/src/assets/imgs/1x1.png b/src/assets/imgs/1x1.png new file mode 100644 index 0000000000000000000000000000000000000000..b9a83e950951be8c4f5ef8fccb00b3f8be35bbe8 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|3_M*NLoEE0 zQx*sqG<|vf;>92J<8!pb*BSIl8A!1$e%a92c*($`;OQw*_ky%VEDQ|J5tf3E$8Ai3 PdKo-j{an^LB{Ts5F&QIl literal 0 HcmV?d00001 diff --git a/src/assets/imgs/2x2.png b/src/assets/imgs/2x2.png new file mode 100644 index 0000000000000000000000000000000000000000..49aedb71317ab6dbe7dc80d489cd92ba49f2a1eb GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|oIPC}LoEE0 zuUx$N^Lzty%+8|LKzH}!jg5_o_IjoYtc%%r+6-147w+x7kg?^sc&~`GgNAH_PR0Ti i#a^iei=A&9FfhCe40kL&eMTQ>9D}E;pUXO@geCwq8!G|; literal 0 HcmV?d00001 diff --git a/src/assets/imgs/2x3.png b/src/assets/imgs/2x3.png new file mode 100644 index 0000000000000000000000000000000000000000..1d153e895da955f1157aed168893cee84be87802 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|qC8z3LoEE0 zQxXyi5)u+Nq$}`9NlHk(x;Vwuh>7*T@HOtRha6in?04N-n9fioVKCtpYtI9vs||?) z9T9sSQmhWG;|W(t@-9_bdPFgeL8HWAlcw0l=7>$T$_$n4O00iYC@lxt!r8KS)H(luFVdQ&MBb@0BU7JhX4Qo literal 0 HcmV?d00001 diff --git a/src/assets/imgs/amplify.png b/src/assets/imgs/amplify.png new file mode 100644 index 0000000000000000000000000000000000000000..b9fb44979283e9458ed13c8268bbecb95c392f59 GIT binary patch literal 4439 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 literal 0 HcmV?d00001 diff --git a/src/components/echarts/MyEchart.vue b/src/components/echarts/MyEchart.vue index 9e9efda4..4ea16338 100644 --- a/src/components/echarts/MyEchart.vue +++ b/src/components/echarts/MyEchart.vue @@ -112,7 +112,7 @@ const initChart = () => { ...(props.options?.legend || null) }, grid: { - top: '70px', + top: '50px', left: '30px', right: '70px', bottom: props.options?.options?.dataZoom === null ? '10px' : '40px', diff --git a/src/styles/vxeTable.scss b/src/styles/vxeTable.scss index 7d6cc4ff..56ce9d97 100644 --- a/src/styles/vxeTable.scss +++ b/src/styles/vxeTable.scss @@ -20,10 +20,10 @@ // } .vxe-header--row { - // background: var(--vxe-table-header-background-color); - // color: var(--vxe-table-header-font-color); - background: var(--el-color-primary); - color: #fff; + background: var(--vxe-table-header-background-color); + color: var(--vxe-table-header-font-color); + // background: var(--el-color-primary); + // color: #fff; font-size: 14px; } diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 134a986e..cfd958b1 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -5,51 +5,51 @@ import type { TableColumnCtx } from 'element-plus' * 日期快捷选项适用于 el-date-picker */ export const defaultShortcuts = [ - { - text: '今天', - value: () => { - return new Date() + { + text: '今天', + value: () => { + return new Date() + } + }, + { + text: '昨天', + value: () => { + const date = new Date() + date.setTime(date.getTime() - 3600 * 1000 * 24) + return [date, date] + } + }, + { + text: '最近七天', + value: () => { + const date = new Date() + date.setTime(date.getTime() - 3600 * 1000 * 24 * 7) + return [date, new Date()] + } + }, + { + text: '最近 30 天', + value: () => { + const date = new Date() + date.setTime(date.getTime() - 3600 * 1000 * 24 * 30) + return [date, new Date()] + } + }, + { + text: '本月', + value: () => { + const date = new Date() + date.setDate(1) // 设置为当前月的第一天 + return [date, new Date()] + } + }, + { + text: '今年', + value: () => { + const date = new Date() + return [new Date(`${date.getFullYear()}-01-01`), date] + } } - }, - { - text: '昨天', - value: () => { - const date = new Date() - date.setTime(date.getTime() - 3600 * 1000 * 24) - return [date, date] - } - }, - { - text: '最近七天', - value: () => { - const date = new Date() - date.setTime(date.getTime() - 3600 * 1000 * 24 * 7) - return [date, new Date()] - } - }, - { - text: '最近 30 天', - value: () => { - const date = new Date() - date.setTime(date.getTime() - 3600 * 1000 * 24 * 30) - return [date, new Date()] - } - }, - { - text: '本月', - value: () => { - const date = new Date() - date.setDate(1) // 设置为当前月的第一天 - return [date, new Date()] - } - }, - { - text: '今年', - value: () => { - const date = new Date() - return [new Date(`${date.getFullYear()}-01-01`), date] - } - } ] /** @@ -64,19 +64,19 @@ export const defaultShortcuts = [ * @returns 返回拼接后的时间字符串 */ export function formatDate(date: Date, format?: string): string { - // 日期不存在，则返回空 - if (!date) { - return '' - } - // 日期存在，则进行格式化 - return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : '' + // 日期不存在，则返回空 + if (!date) { + return '' + } + // 日期存在，则进行格式化 + return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : '' } /** * 获取当前的日期+时间 */ export function getNowDateTime() { - return dayjs() + return dayjs() } /** @@ -85,18 +85,18 @@ export function getNowDateTime() { * @returns 返回第几周数字值 */ export function getWeek(dateTime: Date): number { - const temptTime = new Date(dateTime.getTime()) - // 周几 - const weekday = temptTime.getDay() || 7 - // 周1+5天=周六 - temptTime.setDate(temptTime.getDate() - weekday + 1 + 5) - let firstDay = new Date(temptTime.getFullYear(), 0, 1) - const dayOfWeek = firstDay.getDay() - let spendDay = 1 - if (dayOfWeek != 0) spendDay = 7 - dayOfWeek + 1 - firstDay = new Date(temptTime.getFullYear(), 0, 1 + spendDay) - const d = Math.ceil((temptTime.valueOf() - firstDay.valueOf()) / 86400000) - return Math.ceil(d / 7) + const temptTime = new Date(dateTime.getTime()) + // 周几 + const weekday = temptTime.getDay() || 7 + // 周1+5天=周六 + temptTime.setDate(temptTime.getDate() - weekday + 1 + 5) + let firstDay = new Date(temptTime.getFullYear(), 0, 1) + const dayOfWeek = firstDay.getDay() + let spendDay = 1 + if (dayOfWeek != 0) spendDay = 7 - dayOfWeek + 1 + firstDay = new Date(temptTime.getFullYear(), 0, 1 + spendDay) + const d = Math.ceil((temptTime.valueOf() - firstDay.valueOf()) / 86400000) + return Math.ceil(d / 7) } /** @@ -111,38 +111,38 @@ export function getWeek(dateTime: Date): number { * @returns 返回拼接后的时间字符串 */ export function formatPast(param: string | Date, format = 'YYYY-mm-dd HH:MM:SS'): string { - // 传入格式处理、存储转换值 - let t: any, s: number - // 获取js 时间戳 - let time: number = new Date().getTime() - // 是否是对象 - typeof param === 'string' || 'object' ? (t = new Date(param).getTime()) : (t = param) - // 当前时间戳 - 传入时间戳 - time = Number.parseInt(`${time - t}`) - if (time < 10000) { - // 10秒内 - return '刚刚' - } else if (time < 60000 && time >= 10000) { - // 超过10秒少于1分钟内 - s = Math.floor(time / 1000) - return `${s}秒前` - } else if (time < 3600000 && time >= 60000) { - // 超过1分钟少于1小时 - s = Math.floor(time / 60000) - return `${s}分钟前` - } else if (time < 86400000 && time >= 3600000) { - // 超过1小时少于24小时 - s = Math.floor(time / 3600000) - return `${s}小时前` - } else if (time < 259200000 && time >= 86400000) { - // 超过1天少于3天内 - s = Math.floor(time / 86400000) - return `${s}天前` - } else { - // 超过3天 - const date = typeof param === 'string' || 'object' ? new Date(param) : param - return formatDate(date, format) - } + // 传入格式处理、存储转换值 + let t: any, s: number + // 获取js 时间戳 + let time: number = new Date().getTime() + // 是否是对象 + typeof param === 'string' || 'object' ? (t = new Date(param).getTime()) : (t = param) + // 当前时间戳 - 传入时间戳 + time = Number.parseInt(`${time - t}`) + if (time < 10000) { + // 10秒内 + return '刚刚' + } else if (time < 60000 && time >= 10000) { + // 超过10秒少于1分钟内 + s = Math.floor(time / 1000) + return `${s}秒前` + } else if (time < 3600000 && time >= 60000) { + // 超过1分钟少于1小时 + s = Math.floor(time / 60000) + return `${s}分钟前` + } else if (time < 86400000 && time >= 3600000) { + // 超过1小时少于24小时 + s = Math.floor(time / 3600000) + return `${s}小时前` + } else if (time < 259200000 && time >= 86400000) { + // 超过1天少于3天内 + s = Math.floor(time / 86400000) + return `${s}天前` + } else { + // 超过3天 + const date = typeof param === 'string' || 'object' ? new Date(param) : param + return formatDate(date, format) + } } /** @@ -152,15 +152,15 @@ export function formatPast(param: string | Date, format = 'YYYY-mm-dd HH:MM:SS') * @returns 返回拼接后的时间字符串 */ export function formatAxis(param: Date): string { - const hour: number = new Date(param).getHours() - if (hour < 6) return '凌晨好' - else if (hour < 9) return '早上好' - else if (hour < 12) return '上午好' - else if (hour < 14) return '中午好' - else if (hour < 17) return '下午好' - else if (hour < 19) return '傍晚好' - else if (hour < 22) return '晚上好' - else return '夜里好' + const hour: number = new Date(param).getHours() + if (hour < 6) return '凌晨好' + else if (hour < 9) return '早上好' + else if (hour < 12) return '上午好' + else if (hour < 14) return '中午好' + else if (hour < 17) return '下午好' + else if (hour < 19) return '傍晚好' + else if (hour < 22) return '晚上好' + else return '夜里好' } /** @@ -170,24 +170,24 @@ export function formatAxis(param: Date): string { * @returns {string} 字符串 */ export function formatPast2(ms: number): string { - const day = Math.floor(ms / (24 * 60 * 60 * 1000)) - const hour = Math.floor(ms / (60 * 60 * 1000) - day * 24) - const minute = Math.floor(ms / (60 * 1000) - day * 24 * 60 - hour * 60) - const second = Math.floor(ms / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60) - if (day > 0) { - return day + ' 天' + hour + ' 小时 ' + minute + ' 分钟' - } - if (hour > 0) { - return hour + ' 小时 ' + minute + ' 分钟' - } - if (minute > 0) { - return minute + ' 分钟' - } - if (second > 0) { - return second + ' 秒' - } else { - return 0 + ' 秒' - } + const day = Math.floor(ms / (24 * 60 * 60 * 1000)) + const hour = Math.floor(ms / (60 * 60 * 1000) - day * 24) + const minute = Math.floor(ms / (60 * 1000) - day * 24 * 60 - hour * 60) + const second = Math.floor(ms / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60) + if (day > 0) { + return day + ' 天' + hour + ' 小时 ' + minute + ' 分钟' + } + if (hour > 0) { + return hour + ' 小时 ' + minute + ' 分钟' + } + if (minute > 0) { + return minute + ' 分钟' + } + if (second > 0) { + return second + ' 秒' + } else { + return 0 + ' 秒' + } } /** @@ -198,7 +198,7 @@ export function formatPast2(ms: number): string { * @param cellValue 字段值 */ export function dateFormatter(_row: any, _column: TableColumnCtx, cellValue: any): string { - return cellValue ? formatDate(cellValue) : '' + return cellValue ? formatDate(cellValue) : '' } /** @@ -209,7 +209,7 @@ export function dateFormatter(_row: any, _column: TableColumnCtx, cellValue * @param cellValue 字段值 */ export function dateFormatter2(_row: any, _column: TableColumnCtx, cellValue: any): string { - return cellValue ? formatDate(cellValue, 'YYYY-MM-DD') : '' + return cellValue ? formatDate(cellValue, 'YYYY-MM-DD') : '' } /** @@ -218,7 +218,7 @@ export function dateFormatter2(_row: any, _column: TableColumnCtx, cellValu * @returns 带时间00:00:00的日期 */ export function beginOfDay(param: Date): Date { - return new Date(param.getFullYear(), param.getMonth(), param.getDate(), 0, 0, 0) + return new Date(param.getFullYear(), param.getMonth(), param.getDate(), 0, 0, 0) } /** @@ -227,7 +227,7 @@ export function beginOfDay(param: Date): Date { * @returns 带时间23:59:59的日期 */ export function endOfDay(param: Date): Date { - return new Date(param.getFullYear(), param.getMonth(), param.getDate(), 23, 59, 59) + return new Date(param.getFullYear(), param.getMonth(), param.getDate(), 23, 59, 59) } /** @@ -236,10 +236,10 @@ export function endOfDay(param: Date): Date { * @param param2 日期2 */ export function betweenDay(param1: Date, param2: Date): number { - param1 = convertDate(param1) - param2 = convertDate(param2) - // 计算差值 - return Math.floor((param2.getTime() - param1.getTime()) / (24 * 3600 * 1000)) + param1 = convertDate(param1) + param2 = convertDate(param2) + // 计算差值 + return Math.floor((param2.getTime() - param1.getTime()) / (24 * 3600 * 1000)) } /** @@ -248,8 +248,8 @@ export function betweenDay(param1: Date, param2: Date): number { * @param param2 添加的时间 */ export function addTime(param1: Date, param2: number): Date { - param1 = convertDate(param1) - return new Date(param1.getTime() + param2) + param1 = convertDate(param1) + return new Date(param1.getTime() + param2) } /** @@ -257,10 +257,10 @@ export function addTime(param1: Date, param2: number): Date { * @param param 日期 */ export function convertDate(param: Date | string): Date { - if (typeof param === 'string') { - return new Date(param) - } - return param + if (typeof param === 'string') { + return new Date(param) + } + return param } /** @@ -269,11 +269,11 @@ export function convertDate(param: Date | string): Date { * @param b 日期 B */ export function isSameDay(a: dayjs.ConfigType, b: dayjs.ConfigType): boolean { - if (!a || !b) return false + if (!a || !b) return false - const aa = dayjs(a) - const bb = dayjs(b) - return aa.year() == bb.year() && aa.month() == bb.month() && aa.day() == bb.day() + const aa = dayjs(a) + const bb = dayjs(b) + return aa.year() == bb.year() && aa.month() == bb.month() && aa.day() == bb.day() } /** @@ -281,39 +281,36 @@ export function isSameDay(a: dayjs.ConfigType, b: dayjs.ConfigType): boolean { * @param date 日期 * @param days 天数 */ -export function getDayRange( - date: dayjs.ConfigType, - days: number -): [dayjs.ConfigType, dayjs.ConfigType] { - const day = dayjs(date).add(days, 'd') - return getDateRange(day, day) +export function getDayRange(date: dayjs.ConfigType, days: number): [dayjs.ConfigType, dayjs.ConfigType] { + const day = dayjs(date).add(days, 'd') + return getDateRange(day, day) } /** * 获取最近7天的开始时间、截止时间 */ export function getLast7Days(): [dayjs.ConfigType, dayjs.ConfigType] { - const lastWeekDay = dayjs().subtract(7, 'd') - const yesterday = dayjs().subtract(1, 'd') - return getDateRange(lastWeekDay, yesterday) + const lastWeekDay = dayjs().subtract(7, 'd') + const yesterday = dayjs().subtract(1, 'd') + return getDateRange(lastWeekDay, yesterday) } /** * 获取最近30天的开始时间、截止时间 */ export function getLast30Days(): [dayjs.ConfigType, dayjs.ConfigType] { - const lastMonthDay = dayjs().subtract(30, 'd') - const yesterday = dayjs().subtract(1, 'd') - return getDateRange(lastMonthDay, yesterday) + const lastMonthDay = dayjs().subtract(30, 'd') + const yesterday = dayjs().subtract(1, 'd') + return getDateRange(lastMonthDay, yesterday) } /** * 获取最近1年的开始时间、截止时间 */ export function getLast1Year(): [dayjs.ConfigType, dayjs.ConfigType] { - const lastYearDay = dayjs().subtract(1, 'y') - const yesterday = dayjs().subtract(1, 'd') - return getDateRange(lastYearDay, yesterday) + const lastYearDay = dayjs().subtract(1, 'y') + const yesterday = dayjs().subtract(1, 'd') + return getDateRange(lastYearDay, yesterday) } /** @@ -321,12 +318,17 @@ export function getLast1Year(): [dayjs.ConfigType, dayjs.ConfigType] { * @param beginDate 开始日期 * @param endDate 截止日期 */ -export function getDateRange( - beginDate: dayjs.ConfigType, - endDate: dayjs.ConfigType -): [string, string] { - return [ - dayjs(beginDate).startOf('d').format('YYYY-MM-DD HH:mm:ss'), - dayjs(endDate).endOf('d').format('YYYY-MM-DD HH:mm:ss') - ] +export function getDateRange(beginDate: dayjs.ConfigType, endDate: dayjs.ConfigType): [string, string] { + return [ + dayjs(beginDate).startOf('d').format('YYYY-MM-DD HH:mm:ss'), + dayjs(endDate).endOf('d').format('YYYY-MM-DD HH:mm:ss') + ] +} +/** + * 获取当月时间 + * @param beginDate 开始日期 + * @param endDate 截止日期 + */ +export function getTimeOfTheMonth(): [string, string] { + return [formatDate(new Date(), 'YYYY-MM') + '-01', formatDate(new Date(), 'YYYY-MM-DD')] } diff --git a/src/views/cockpit/TerminalLog.vue b/src/views/cockpit/TerminalLog.vue new file mode 100644 index 00000000..0ea4e991 --- /dev/null +++ b/src/views/cockpit/TerminalLog.vue @@ -0,0 +1,105 @@ + + + diff --git a/src/views/cockpit/qualifiedRate.vue b/src/views/cockpit/qualifiedRate.vue new file mode 100644 index 00000000..9ce14cc6 --- /dev/null +++ b/src/views/cockpit/qualifiedRate.vue @@ -0,0 +1,263 @@ + + + diff --git a/src/views/cockpit/testEchart.vue b/src/views/cockpit/testEchart.vue new file mode 100644 index 00000000..fe9532df --- /dev/null +++ b/src/views/cockpit/testEchart.vue @@ -0,0 +1,98 @@ + + + diff --git a/src/views/pqs/cockpit/homePage/index.vue b/src/views/pqs/cockpit/homePage/index.vue new file mode 100644 index 00000000..910bba19 --- /dev/null +++ b/src/views/pqs/cockpit/homePage/index.vue @@ -0,0 +1,242 @@ + + + + + diff --git a/src/views/pqs/cockpit/setUp/components/popup.vue b/src/views/pqs/cockpit/setUp/components/popup.vue new file mode 100644 index 00000000..d8a9d5f1 --- /dev/null +++ b/src/views/pqs/cockpit/setUp/components/popup.vue @@ -0,0 +1,374 @@ + + + diff --git a/src/views/pqs/cockpit/setUp/index.vue b/src/views/pqs/cockpit/setUp/index.vue new file mode 100644 index 00000000..64d6060a --- /dev/null +++ b/src/views/pqs/cockpit/setUp/index.vue @@ -0,0 +1,287 @@ + + + diff --git a/src/views/setting/dictionary/component/add.vue b/src/views/setting/dictionary/component/add.vue new file mode 100644 index 00000000..40682714 --- /dev/null +++ b/src/views/setting/dictionary/component/add.vue @@ -0,0 +1,113 @@ + + diff --git a/src/views/setting/dictionary/component/index.vue b/src/views/setting/dictionary/component/index.vue new file mode 100644 index 00000000..939432d2 --- /dev/null +++ b/src/views/setting/dictionary/component/index.vue @@ -0,0 +1,129 @@ + +