From ba4cc02bfd7536c1c0b34398ba4d9f49295140a8 Mon Sep 17 00:00:00 2001 From: shizhong <124974919@qq.com> Date: Tue, 13 Jun 2023 11:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=85=A8=E5=B1=80=E4=BD=BF?= =?UTF-8?q?=E7=94=A8formatDate=E6=96=B9=E6=B3=95=E7=A7=BB=E9=99=A4parseTim?= =?UTF-8?q?e=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/designer/ProcessViewer.vue | 58 +++---------------- src/layout/components/Message/src/Message.vue | 4 +- src/utils/formatTime.ts | 3 +- src/views/Profile/components/ProfileUser.vue | 4 +- .../detail/ProcessInstanceTaskList.vue | 6 +- src/views/infra/webSocket/index.vue | 4 +- .../mp/components/wx-material-select/main.vue | 8 +-- src/views/mp/components/wx-msg/main.vue | 6 +- 8 files changed, 24 insertions(+), 69 deletions(-) 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 = `

发起人：${processInstance.value.startUser.nickname}

部门：${processInstance.value.startUser.deptName}

-

创建时间：${parseTime(processInstance.value.createTime)}` +

创建时间：${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 = `

审批人：${task.assigneeUser.nickname}

部门：${task.assigneeUser.deptName}

结果：${dataResult}

-

创建时间：${parseTime(task.createTime)}

` +

创建时间：${formatDate(task.createTime)}

` // html = `

审批人：${task.assigneeUser.nickname}

//

部门：${task.assigneeUser.deptName}

//

结果：${getIntDictOptions( // DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, // task.result // )}

- //

创建时间：${parseTime(task.createTime)}

` + //

创建时间：${formatDate(task.createTime)}

` if (task.endTime) { - html += `

结束时间：${parseTime(task.endTime)}

` + html += `

结束时间：${formatDate(task.endTime)}

` } if (task.reason) { html += `

审批建议：${task.reason}

` } } else if (element.value.type === 'bpmn:ServiceTask' && processInstance.value) { if (activity.startTime > 0) { - html = `

创建时间：${parseTime(activity.startTime)}

` + html = `

创建时间：${formatDate(activity.startTime)}

` } if (activity.endTime > 0) { - html += `

结束时间：${parseTime(activity.endTime)}

` + html += `

结束时间：${formatDate(activity.endTime)}

` } console.log(html) } else if (element.value.type === 'bpmn:EndEvent' && processInstance.value) { @@ -333,7 +333,7 @@ const elementHover = (element) => { // processInstance.value.result // )}

` if (processInstance.value.endTime) { - html += `

结束时间：${parseTime(processInstance.value.endTime)}

` + html += `

结束时间：${formatDate(processInstance.value.endTime)}

` } } 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 f1bf53b6..cba22e75 100644 --- a/src/layout/components/Message/src/Message.vue +++ b/src/layout/components/Message/src/Message.vue @@ -1,5 +1,5 @@