0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#20093

This commit is contained in:
leiqiaochu 2023-11-13 10:20:12 +08:00
parent 2777cca778
commit 35b574d7da
3 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/account/notificationRecord.ts
View File

@ -9,7 +9,7 @@ export const changeStatus_api = (type: '_read' | '_unread', data: string[]): any
export const changeAllStatus = (type: '_read' | '_unread', data: string[]): any => server.post(`/notifications/${type}/provider`, data)
//查看工作流通知详情
export const getWorkflowNotice = (data:any) => server.post('/process/runtime/processes/_query?history=true',data)
export const getWorkflowNotice = (data:any) => server.post('/process/runtime/processes/_query/no-paging',data)
// 查询告警记录详情
export const getDetail = (id: string): any => server.get(`/alarm/record/${id}`)

39
src/views/account/Center/components/StationMessage/components/NotificationRecord/components/ViewDialog.vue
View File

@ -16,6 +16,43 @@
</div>
</div>
</template>
<template v-else-if="['workflow-task-cc','workflow-task-todo','workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed'].includes(data?.topicProvider)">
<j-descriptions
:column="2"
:contentStyle="{
color: '#333333',
}"
:labelStyle="{
color: 'rgba(0, 0, 0, 0.6)',
width: '72px',
}"
>
<j-descriptions-item label="发起人">
<j-ellipsis>{{ _data?.creatorName }}</j-ellipsis>
</j-descriptions-item>
<j-descriptions-item label="发起时间">
<j-ellipsis>
{{ dayjs(_data?.createTime).format('YYYY-MM-DD HH:mm:ss') }}
</j-ellipsis>
</j-descriptions-item>
<j-descriptions-item label="流程分类">
<j-ellipsis>
{{ _data?.classifiedName }}
</j-ellipsis>
</j-descriptions-item>
<j-descriptions-item label="流程名称"><j-ellipsis>
{{ _data?.modelName }}
</j-ellipsis></j-descriptions-item>
<j-descriptions-item label="标题"><j-ellipsis>
{{ _data?.name }}
</j-ellipsis></j-descriptions-item>
<j-descriptions-item label="摘要">
<j-ellipsis>
{{ _data?.summary }}
</j-ellipsis>
</j-descriptions-item>
</j-descriptions>
</template>
<template v-else>
<j-descriptions
:column="2"
@ -75,7 +112,7 @@
<script setup lang="ts">
import { JsonViewer } from 'vue3-json-viewer';
import 'vue3-json-viewer/dist/index.css';
import { queryLevel as queryLevel_api } from '@/api/rule-engine/config';
import { queryLevel as queryLevel_api} from '@/api/rule-engine/config';
import dayjs from 'dayjs';
const emits = defineEmits(['update:visible']);

33
src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
View File

@ -221,21 +221,24 @@ const queryParams = ref({});
const tableRef = ref();
const view = (row: any) => {
// if(props.type === 'workflow-notification'){
// const params = {
// terms:[{
// type: "or",
// value: ['workflow-process-finish', 'workflow-process-repealed'].includes(row.topicProvider) ? row.dataId : JSON.parse(row.detailJson)?.processId,
// termType: "eq",
// column: "id"
// }]
// }
// getWorkflowNotice(params).then((res)=>{
// console.log(res)
// })
// }
viewItem.value = row;
viewVisible.value = true;
if(props.type === 'workflow-notification'){
const params = {
terms:[{
type: "or",
value: ['workflow-process-finish', 'workflow-process-repealed'].includes(row.topicProvider) ? row.dataId : JSON.parse(row.detailJson)?.processId,
termType: "eq",
column: "id"
}]
}
getWorkflowNotice(params).then((res)=>{
viewItem.value = {'topicProvider':row.topicProvider,...res?.result?.[0]}
viewVisible.value = true;
})
}else{
viewItem.value = row;
viewVisible.value = true;
}
};
const refresh = () => {
tableRef.value && tableRef.value.reload();