提取核心信息并应用到我的工作中的三个tab中

This commit is contained in:
2024-06-19 10:19:38 +08:00
parent b5b79e4f81
commit f73a3572b2
10 changed files with 116 additions and 108 deletions

View File

@@ -77,7 +77,6 @@ const tableStore = new TableStore({
} }
}, },
{ field: 'dutyOrgName', title: '负责单位', minWidth: '150' }, { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
{ field: 'leafletName', title: '单据名称', minWidth: '150' }, { field: 'leafletName', title: '单据名称', minWidth: '150' },
{ field: 'issueDetail', title: '告警内容', minWidth: '150' }, { field: 'issueDetail', title: '告警内容', minWidth: '150' },
{ {

View File

@@ -116,6 +116,7 @@ const tableStore = new TableStore({
return row.status !== 5 return row.status !== 5
}, },
click: row => { click: row => {
feedbackPopup.value.open('填报反馈单', row.id, row.status, row.issueDetail,row.problemPath) feedbackPopup.value.open('填报反馈单', row.id, row.status, row.issueDetail,row.problemPath)
} }
}, },

View File

@@ -116,7 +116,6 @@ const open = async (
) => { ) => {
title.value = text title.value = text
resetForm() resetForm()
console.log(66666, reportPath)
if (takeStep) { if (takeStep) {
form.value.takeStep = takeStep form.value.takeStep = takeStep
} }

View File

@@ -97,7 +97,6 @@ const submit = async () => {
let data = new FormData() let data = new FormData()
data.append('file', form.file) data.append('file', form.file)
await importSensitiveUserData(data).then((res: any) => { await importSensitiveUserData(data).then((res: any) => {
debugger
if(res.type === 'application/json'){ if(res.type === 'application/json'){
// 说明是普通对象数据,读取信息 // 说明是普通对象数据,读取信息
const fileReader = new FileReader() const fileReader = new FileReader()

View File

@@ -5,7 +5,7 @@
<el-form-item label="搜索"> <el-form-item label="搜索">
<el-input <el-input
v-model="tableStore.table.params.searchValue" v-model="tableStore.table.params.searchValue"
placeholder="输入变电站.终端.监测点名称" placeholder="输入变电站终端监测点名称"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>

View File

@@ -5,7 +5,7 @@
<el-form-item label="搜索"> <el-form-item label="搜索">
<el-input <el-input
v-model="tableStore.table.params.searchValue" v-model="tableStore.table.params.searchValue"
placeholder="输入变电站.终端.监测点名称" placeholder="输入变电站终端监测点名称"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>

View File

@@ -5,7 +5,7 @@
<el-form-item label="搜索"> <el-form-item label="搜索">
<el-input <el-input
v-model="tableStore.table.params.searchValue" v-model="tableStore.table.params.searchValue"
placeholder="输入变电站.终端.监测点名称" placeholder="输入变电站终端监测点名称"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>

View File

@@ -17,7 +17,7 @@
import TableStore from '@/utils/tableStore' import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue' import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue' import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref,watch } from 'vue' import { onMounted, provide, ref, watch } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { dateFormatter, formatPast2 } from '@/utils/formatTime' import { dateFormatter, formatPast2 } from '@/utils/formatTime'
@@ -41,6 +41,7 @@ const tableStore = new TableStore({
} }
}, },
{ title: '任务名称', field: 'processInstance.name', minWidth: 130 }, { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
{ title: '任务内容', field: 'instanceSign', minWidth: 170 },
{ title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 }, { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
{ title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 }, { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
{ title: '当前任务', field: 'name', minWidth: 130 }, { title: '当前任务', field: 'name', minWidth: 130 },
@@ -88,7 +89,7 @@ const tableStore = new TableStore({
render: 'basicButton', render: 'basicButton',
click: row => { click: row => {
flag.value = true flag.value = true
handleAudit(row.processInstance.id) handleAudit(row.processInstance.id, row.historyInstanceId)
} }
} }
] ]
@@ -111,15 +112,17 @@ tableStore.table.params.searchValue = ''
provide('tableStore', tableStore) provide('tableStore', tableStore)
/** 处理审批按钮 */ /** 处理审批按钮 */
const handleAudit = (instanceId: any) => { const handleAudit = (instanceId: string, historyInstanceId: string) => {
push({ push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
state: { state: {
id: instanceId id: instanceId,
historyInstanceId
} }
}) })
} }
watch( watch(
() => currentRoute.value.path, () => currentRoute.value.path,
() => { () => {

View File

@@ -45,6 +45,7 @@ const tableStore = new TableStore({
} }
}, },
{ title: '任务名称', field: 'name', minWidth: 130 }, { title: '任务名称', field: 'name', minWidth: 130 },
{ title: '任务内容', field: 'instanceSign', minWidth: 170 },
{ {
title: '流程分类', title: '流程分类',
field: 'category', field: 'category',
@@ -112,7 +113,7 @@ const tableStore = new TableStore({
render: 'basicButton', render: 'basicButton',
click: row => { click: row => {
flag.value = true flag.value = true
handleAudit(row.id) handleAudit(row.id, row.historyInstanceId)
} }
} }
] ]
@@ -135,14 +136,16 @@ tableStore.table.params.searchValue = ''
provide('tableStore', tableStore) provide('tableStore', tableStore)
/** 处理审批按钮 */ /** 处理审批按钮 */
const handleAudit = (instanceId: any) => { const handleAudit = (instanceId: string, historyInstanceId: string) => {
push({ push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
state: { state: {
id: instanceId id: instanceId,
historyInstanceId
} }
}) })
} }
watch( watch(
() => currentRoute.value.path, () => currentRoute.value.path,
() => { () => {

View File

@@ -3,17 +3,17 @@
<div> <div>
<TableHeader> <TableHeader>
<template v-slot:select> <template v-slot:select>
<el-form-item label="任务名称"> <el-form-item label='任务名称'>
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称"></el-input> <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称'></el-input>
</el-form-item> </el-form-item>
</template> </template>
</TableHeader> </TableHeader>
<!--表格--> <!--表格-->
<Table ref="tableRef"></Table> <Table ref='tableRef'></Table>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang='ts'>
import TableStore from '@/utils/tableStore' import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue' import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue' import TableHeader from '@/components/table/header/index.vue'
@@ -41,6 +41,7 @@ const tableStore = new TableStore({
} }
}, },
{ title: '任务名称', field: 'processInstance.name', minWidth: 130 }, { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
{ title: '任务内容', field: 'instanceSign', minWidth: 170 },
{ title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 }, { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
{ title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 }, { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
{ title: '发起时间', field: 'createTime', minWidth: 170 }, { title: '发起时间', field: 'createTime', minWidth: 170 },
@@ -59,7 +60,7 @@ const tableStore = new TableStore({
render: 'basicButton', render: 'basicButton',
click: row => { click: row => {
flag.value = true flag.value = true
handleAudit(row.processInstance.id) handleAudit(row.processInstance.id, row.historyInstanceId)
} }
} }
] ]
@@ -82,15 +83,18 @@ tableStore.table.params.searchValue = ''
provide('tableStore', tableStore) provide('tableStore', tableStore)
/** 处理审批按钮 */ /** 处理审批按钮 */
const handleAudit = (instanceId: any) => { const handleAudit = (instanceId: string, historyInstanceId: string) => {
push({ push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
state: { state: {
id: instanceId, id: instanceId,
todo: 'todo' todo: 'todo',
historyInstanceId
} }
}) })
} }
watch( watch(
() => currentRoute.value.path, () => currentRoute.value.path,
() => { () => {