diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue index a206c45b..a90d468e 100644 --- a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue +++ b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue @@ -280,7 +280,7 @@ const elementHover = (element) => { if (element.value.type === 'bpmn:StartEvent' && processInstance.value) { html = `<p>发起人:${processInstance.value.startUser.nickname}</p> <p>部门:${processInstance.value.startUser.deptName}</p> - <p>创建时间:${parseTime(processInstance.value.createTime)}` + <p>创建时间:${formatDate(processInstance.value.createTime)}` } else if (element.value.type === 'bpmn:UserTask') { // debugger let task = taskList.value.find((m) => m.id === activity.taskId) // 找到活动对应的 taskId @@ -297,26 +297,26 @@ const elementHover = (element) => { html = `<p>审批人:${task.assigneeUser.nickname}</p> <p>部门:${task.assigneeUser.deptName}</p> <p>结果:${dataResult}</p> - <p>创建时间:${parseTime(task.createTime)}</p>` + <p>创建时间:${formatDate(task.createTime)}</p>` // html = `<p>审批人:${task.assigneeUser.nickname}</p> // <p>部门:${task.assigneeUser.deptName}</p> // <p>结果:${getIntDictOptions( // DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, // task.result // )}</p> - // <p>创建时间:${parseTime(task.createTime)}</p>` + // <p>创建时间:${formatDate(task.createTime)}</p>` if (task.endTime) { - html += `<p>结束时间:${parseTime(task.endTime)}</p>` + html += `<p>结束时间:${formatDate(task.endTime)}</p>` } if (task.reason) { html += `<p>审批建议:${task.reason}</p>` } } else if (element.value.type === 'bpmn:ServiceTask' && processInstance.value) { if (activity.startTime > 0) { - html = `<p>创建时间:${parseTime(activity.startTime)}</p>` + html = `<p>创建时间:${formatDate(activity.startTime)}</p>` } if (activity.endTime > 0) { - html += `<p>结束时间:${parseTime(activity.endTime)}</p>` + html += `<p>结束时间:${formatDate(activity.endTime)}</p>` } console.log(html) } else if (element.value.type === 'bpmn:EndEvent' && processInstance.value) { @@ -333,7 +333,7 @@ const elementHover = (element) => { // processInstance.value.result // )}</p>` if (processInstance.value.endTime) { - html += `<p>结束时间:${parseTime(processInstance.value.endTime)}</p>` + html += `<p>结束时间:${formatDate(processInstance.value.endTime)}</p>` } } console.log(html, 'html111111111111111') @@ -348,50 +348,6 @@ const elementOut = (element) => { toRaw(overlays.value).remove({ element }) elementOverlayIds.value[element.id] = null } -const parseTime = (time) => { - if (!time) { - return null - } - const format = '{y}-{m}-{d} {h}:{i}:{s}' - let date - if (typeof time === 'object') { - date = time - } else { - if (typeof time === 'string' && /^[0-9]+$/.test(time)) { - time = parseInt(time) - } else if (typeof time === 'string') { - time = time - .replace(new RegExp(/-/gm), '/') - .replace('T', ' ') - .replace(new RegExp(/\.[\d]{3}/gm), '') - } - if (typeof time === 'number' && time.toString().length === 10) { - time = time * 1000 - } - date = new Date(time) - } - const formatObj = { - y: date.getFullYear(), - m: date.getMonth() + 1, - d: date.getDate(), - h: date.getHours(), - i: date.getMinutes(), - s: date.getSeconds(), - a: date.getDay() - } - const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { - let value = formatObj[key] - // Note: getDay() returns 0 on Sunday - if (key === 'a') { - return ['日', '一', '二', '三', '四', '五', '六'][value] - } - if (result.length > 0 && value < 10) { - value = '0' + value - } - return value || 0 - }) - return time_str -} onMounted(() => { xml.value = props.value diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue index 4ac85860..d42a51c0 100644 --- a/src/layout/components/Message/src/Message.vue +++ b/src/layout/components/Message/src/Message.vue @@ -1,5 +1,5 @@ <script setup lang="ts"> -import { parseTime } from '@/utils/formatTime' +import { formatDate } from '@/utils/formatTime' import * as NotifyMessageApi from '@/api/system/notify/message' const { push } = useRouter() @@ -57,7 +57,7 @@ onMounted(() => { {{ item.templateNickname }}:{{ item.templateContent }} </span> <span class="message-date"> - {{ parseTime(item.createTime) }} + {{ formatDate(item.createTime) }} </span> </div> </div> diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index 80a5900f..0ed1a84d 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -23,7 +23,6 @@ declare module '@vue/runtime-core' { DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default'] Echart: typeof import('./../components/Echart/src/Echart.vue')['default'] Editor: typeof import('./../components/Editor/src/Editor.vue')['default'] - ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer'] ElBadge: typeof import('element-plus/es')['ElBadge'] ElButton: typeof import('element-plus/es')['ElButton'] ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] @@ -53,7 +52,6 @@ declare module '@vue/runtime-core' { ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] @@ -62,7 +60,6 @@ declare module '@vue/runtime-core' { ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] @@ -71,14 +68,10 @@ declare module '@vue/runtime-core' { ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTableV2: typeof import('element-plus/es')['ElTableV2'] ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTransfer: typeof import('element-plus/es')['ElTransfer'] ElTree: typeof import('element-plus/es')['ElTree'] ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index d4dea9b5..0d68e362 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -23,53 +23,6 @@ export function formatDate(date: Date, format?: string): string { return dayjs(date).format(format) } -// TODO 芋艿:稍后去掉 -// 日期格式化 -export function parseTime(time: any, pattern?: string) { - if (arguments.length === 0 || !time) { - return null - } - const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' - let date - if (typeof time === 'object') { - date = time - } else { - if (typeof time === 'string' && /^[0-9]+$/.test(time)) { - time = parseInt(time) - } else if (typeof time === 'string') { - time = time - .replace(new RegExp(/-/gm), '/') - .replace('T', ' ') - .replace(new RegExp(/\.\d{3}/gm), '') - } - if (typeof time === 'number' && time.toString().length === 10) { - time = time * 1000 - } - date = new Date(time) - } - const formatObj = { - y: date.getFullYear(), - m: date.getMonth() + 1, - d: date.getDate(), - h: date.getHours(), - i: date.getMinutes(), - s: date.getSeconds(), - a: date.getDay() - } - const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { - let value = formatObj[key] - // Note: getDay() returns 0 on Sunday - if (key === 'a') { - return ['日', '一', '二', '三', '四', '五', '六'][value] - } - if (result.length > 0 && value < 10) { - value = '0' + value - } - return value || 0 - }) - return time_str -} - /** * 获取当前日期是第几周 * @param dateTime 当前传入的日期值 @@ -87,8 +40,7 @@ export function getWeek(dateTime: Date): number { if (dayOfWeek != 0) spendDay = 7 - dayOfWeek + 1 firstDay = new Date(temptTime.getFullYear(), 0, 1 + spendDay) const d = Math.ceil((temptTime.valueOf() - firstDay.valueOf()) / 86400000) - const result = Math.ceil(d / 7) - return result + return Math.ceil(d / 7) } /** diff --git a/src/views/Profile/components/ProfileUser.vue b/src/views/Profile/components/ProfileUser.vue index 015440fc..4e4de722 100644 --- a/src/views/Profile/components/ProfileUser.vue +++ b/src/views/Profile/components/ProfileUser.vue @@ -34,13 +34,13 @@ </li> <li class="list-group-item"> <Icon icon="ep:calendar" class="mr-5px" />{{ t('profile.user.createTime') }} - <div class="pull-right">{{ parseTime(userInfo?.createTime) }}</div> + <div class="pull-right">{{ formatDate(userInfo?.createTime) }}</div> </li> </ul> </div> </template> <script setup lang="ts"> -import { parseTime } from '@/utils/formatTime' +import { formatDate } from '@/utils/formatTime' import UserAvatar from './UserAvatar.vue' import { getUserProfileApi, ProfileVO } from '@/api/system/user/profile' diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue index 3bbabcc6..a8aa0120 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue @@ -20,13 +20,13 @@ </label> <label style="font-weight: normal" v-if="item.createTime">创建时间:</label> <label style="color: #8a909c; font-weight: normal"> - {{ parseTime(item?.createTime) }} + {{ formatDate(item?.createTime) }} </label> <label v-if="item.endTime" style="margin-left: 30px; font-weight: normal"> 审批时间: </label> <label v-if="item.endTime" style="color: #8a909c; font-weight: normal"> - {{ parseTime(item?.endTime) }} + {{ formatDate(item?.endTime) }} </label> <label v-if="item.durationInMillis" style="margin-left: 30px; font-weight: normal"> 耗时: @@ -45,7 +45,7 @@ </el-card> </template> <script setup lang="ts"> -import { parseTime, formatPast2 } from '@/utils/formatTime' +import { formatDate, formatPast2 } from '@/utils/formatTime' import { propTypes } from '@/utils/propTypes' defineProps({ diff --git a/src/views/infra/webSocket/index.vue b/src/views/infra/webSocket/index.vue index f090ba9b..b4e0acc0 100644 --- a/src/views/infra/webSocket/index.vue +++ b/src/views/infra/webSocket/index.vue @@ -44,7 +44,7 @@ <li v-for="item in getList" class="mt-2" :key="item.time"> <div class="flex items-center"> <span class="mr-2 text-primary font-medium">收到消息:</span> - <span>{{ parseTime(item.time) }}</span> + <span>{{ formatDate(item.time) }}</span> </div> <div> {{ item.res }} @@ -56,7 +56,7 @@ </div> </template> <script setup lang="ts"> -import { parseTime } from '@/utils/formatTime' +import { formatDate } from '@/utils/formatTime' import { useUserStore } from '@/store/modules/user' import { useWebSocket } from '@vueuse/core' diff --git a/src/views/mp/components/wx-material-select/main.vue b/src/views/mp/components/wx-material-select/main.vue index 26b747e2..4c477078 100644 --- a/src/views/mp/components/wx-material-select/main.vue +++ b/src/views/mp/components/wx-material-select/main.vue @@ -41,7 +41,7 @@ </el-table-column> <el-table-column label="上传时间" align="center" prop="createTime" width="180"> <template #default="scope"> - <span>{{ parseTime(scope.row.createTime) }}</span> + <span>{{ formatDate(scope.row.createTime) }}</span> </template> </el-table-column> <el-table-column @@ -80,7 +80,7 @@ </el-table-column> <el-table-column label="上传时间" align="center" prop="createTime" width="180"> <template #default="scope"> - <span>{{ parseTime(scope.row.createTime) }}</span> + <span>{{ formatDate(scope.row.createTime) }}</span> </template> </el-table-column> <el-table-column @@ -136,7 +136,7 @@ import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue' import { getMaterialPage } from '@/api/mp/material' import { getFreePublishPage } from '@/api/mp/freePublish' import { getDraftPage } from '@/api/mp/draft' -import { dateFormatter, parseTime } from '@/utils/formatTime' +import { dateFormatter, formatDate } from '@/utils/formatTime' import { defineComponent, PropType } from 'vue' export default defineComponent({ @@ -238,7 +238,7 @@ export default defineComponent({ selectMaterialFun, getMaterialPageFun, getPage, - parseTime, + formatDate, newsTypeRef, queryParams, objDataRef, diff --git a/src/views/mp/components/wx-msg/main.vue b/src/views/mp/components/wx-msg/main.vue index 215b4f97..52397e12 100644 --- a/src/views/mp/components/wx-msg/main.vue +++ b/src/views/mp/components/wx-msg/main.vue @@ -32,7 +32,7 @@ </div> <div class="avue-comment__main"> <div class="avue-comment__header"> - <div class="avue-comment__create_time">{{ parseTime(item.createTime) }}</div> + <div class="avue-comment__create_time">{{ formatDate(item.createTime) }}</div> </div> <div class="avue-comment__body" @@ -145,7 +145,7 @@ import { defineComponent } from 'vue' const message = useMessage() // 消息弹窗 import profile from '@/assets/imgs/profile.jpg' import wechat from '@/assets/imgs/wechat.png' -import { parseTime } from '@/utils/formatTime' +import { formatDate } from '@/utils/formatTime' export default defineComponent({ components: { @@ -286,7 +286,7 @@ export default defineComponent({ return { sendMsg, loadingMore, - parseTime, + formatDate, scrollToBottom, objData, mp, diff --git a/src/views/system/notify/my/MyNotifyMessageDetail.vue b/src/views/system/notify/my/MyNotifyMessageDetail.vue index bcad4711..247136b0 100644 --- a/src/views/system/notify/my/MyNotifyMessageDetail.vue +++ b/src/views/system/notify/my/MyNotifyMessageDetail.vue @@ -5,7 +5,7 @@ {{ detailData.templateNickname }} </el-descriptions-item> <el-descriptions-item label="发送时间"> - {{ formatDate(detailData.createTime, 'YYYY-MM-DD HH:mm:ss') }} + {{ formatDate(detailData.createTime) }} </el-descriptions-item> <el-descriptions-item label="消息类型"> <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="detailData.templateType" /> @@ -14,7 +14,7 @@ <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="detailData.readStatus" /> </el-descriptions-item> <el-descriptions-item label="阅读时间" v-if="detailData.readStatus"> - {{ formatDate(detailData.readTime, 'YYYY-MM-DD HH:mm:ss') }} + {{ formatDate(detailData.readTime) }} </el-descriptions-item> <el-descriptions-item label="内容"> {{ detailData.templateContent }}