| src/api/wayline.ts | patch | view | raw | blame | history | |
| src/components/task/TaskPanel.vue | ●●●●● patch | view | raw | blame | history | |
| src/types/task.ts | ●●●●● patch | view | raw | blame | history | |
| src/utils/time.ts | ●●●●● patch | view | raw | blame | history |
src/api/wayline.ts
src/components/task/TaskPanel.vue
@@ -166,6 +166,7 @@ import { getErrorMessage } from '/@/utils/error-code/index' import { commonColor } from '/@/utils/color' import { ExclamationCircleOutlined, UploadOutlined } from '@ant-design/icons-vue' import { timestampToTime } from '/@/utils/time' const store = useMyStore() const workspaceId = localStorage.getItem(ELocalStorageKey.WorkspaceId)! @@ -193,9 +194,17 @@ const searchQuery = reactive<TaskQueryParam>({ taskType: '' }) function getSearchTime (n:number) { const nowStamp = new Date().getTime() const timestamp = nowStamp + (n * 60 * 60 * 1000 * 24) const time = timestampToTime(timestamp) return time } const statusArr = reactive([]) const timeRangeArr = reactive({ data: [] as string[] data: [getSearchTime(-3), getSearchTime(3)] as string[] }) const body: IPage = { @@ -343,6 +352,9 @@ } function getPlans () { searchQuery.startTime = timeRangeArr.data[0] searchQuery.endTime = timeRangeArr.data[1] console.log('计划查询请求参数', searchQuery) tableLoading.value = true getWaylineJobs(workspaceId, body, searchQuery).then(res => { src/types/task.ts
@@ -35,13 +35,11 @@ [FrequencyType.month]: '月', } export const FrequencyTypeOptions = [ { value: FrequencyType.month, label: FrequencyTypeMap[FrequencyType.month]}, { value: FrequencyType.week, label: FrequencyTypeMap[FrequencyType.week] }, { value: FrequencyType.day, label: FrequencyTypeMap[FrequencyType.day] }, ] // 重复规则类型 export enum RepeatRuleType { @@ -74,7 +72,6 @@ {value: 5, label: '周五',checked:false}, {value: 6, label: '周六',checked:false}, ] // 失控动作 export enum OutOfControlAction { src/utils/time.ts
@@ -13,3 +13,51 @@ export function formatUnixTime (time: number, format = DATE_FORMAT): string { return time ? moment.unix(time).format(format) : DEFAULT_PLACEHOLDER } export function dateFormat(date:any, format:string) { format = format || 'yyyy-MM-dd hh:mm:ss'; if (date !== 'Invalid Date') { let o = { "M+": date.getMonth() + 1, //month "d+": date.getDate(), //day "h+": date.getHours(), //hour "m+": date.getMinutes(), //minute "s+": date.getSeconds(), //second "q+": Math.floor((date.getMonth() + 3) / 3), //quarter "S": date.getMilliseconds() //millisecond } if (/(y+)/.test(format)) format = format.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length)); for (let k in o) if (new RegExp("(" + k + ")").test(format)) format = format.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)); return format; } return ''; } export function convertTimestampToDate(timestamp:any, format:string) { if (timestamp && (typeof timestamp === "string") && timestamp.indexOf("-") > -1) { timestamp = timestamp.replace(/\-/g, "/") } let time = new Date(timestamp) let formatterTime = dateFormat(time, format) return formatterTime } // 返回年月日 export const timestampToTime = (timestamp:number) => { if (!timestamp) return // 时间戳为10位需*1000,时间戳为13位不需乘1000 var date = new Date(timestamp); var Y = date.getFullYear() + "-"; var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) + "-"; var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()); return Y + M + D; }