项目全局使用formatDate方法移除parseTime方法
							parent
							
								
									8be4f31a1b
								
							
						
					
					
						commit
						ba4cc02bfd
					
				|  | @ -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 | ||||
|  |  | |||
|  | @ -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() | ||||
|  | @ -60,7 +60,7 @@ onUnmounted(() => { | |||
|                     {{ item.templateNickname }}:{{ item.templateContent }} | ||||
|                   </span> | ||||
|                   <span class="message-date"> | ||||
|                     {{ parseTime(item.createTime) }} | ||||
|                     {{ formatDate(item.createTime) }} | ||||
|                   </span> | ||||
|                 </div> | ||||
|               </div> | ||||
|  |  | |||
|  | @ -87,8 +87,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) | ||||
| } | ||||
| 
 | ||||
| /** | ||||
|  |  | |||
|  | @ -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' | ||||
|  |  | |||
|  | @ -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({ | ||||
|  |  | |||
|  | @ -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' | ||||
| 
 | ||||
|  |  | |||
|  | @ -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, | ||||
|  |  | |||
|  | @ -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, | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 shizhong
						shizhong