Web/admin-sjzx
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 查看详情 返回页面刷新

Browse Source
This commit is contained in:
GGJ
2024-06-04 18:06:17 +08:00
parent eb62676b5d
commit 9ee495f40d
13 changed files with 404 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
View File

@@ -24,8 +24,8 @@
</vxe-column>
<vxe-column field="qualifyData" title="指标合格率(%)" />
<vxe-colgroup title="电压偏差">
<vxe-column field="vdevAssessLevel" title="评估结论">
<vxe-colgroup title="评估结论">
<vxe-column field="vdevAssessLevel" title="电压偏差">
<template #default="scope">
<span
class="conclusion"
@@ -43,10 +43,8 @@
</span>
</template>
</vxe-column>
<vxe-column field="vdevQualifyData" title="指标合格率(%)" />
</vxe-colgroup>
<vxe-colgroup title="频率偏差">
<vxe-column field="freqAssessLevel" title="评估结论">
<vxe-column field="freqAssessLevel" title="频率偏差">
<template #default="scope">
<span
class="conclusion"
@@ -64,10 +62,8 @@
</span>
</template>
</vxe-column>
<vxe-column field="freqQualifyData" title="指标合格率(%)" />
</vxe-colgroup>
<vxe-colgroup title="电压总谐波畸变率">
<vxe-column field="harmAssessLevel" title="评估结论">
<vxe-column field="harmAssessLevel" title="电压总谐波畸变率">
<template #default="scope">
<span
class="conclusion"
@@ -85,10 +81,8 @@
</span>
</template>
</vxe-column>
<vxe-column field="harmQualifyData" title="指标合格率(%)" />
</vxe-colgroup>
<vxe-colgroup title="电压闪变">
<vxe-column field="flickerAssessLevel" title="评估结论">
<vxe-column field="flickerAssessLevel" title="电压闪变">
<template #default="scope">
<span
class="conclusion"
@@ -106,10 +100,8 @@
</span>
</template>
</vxe-column>
<vxe-column field="flickerQualifyData" title="指标合格率(%)" />
</vxe-colgroup>
<vxe-colgroup title="三相电压不平衡度">
<vxe-column field="unbalanceAssessLevel" title="评估结论">
<vxe-column field="unbalanceAssessLevel" title="三相电压不平衡度">
<template #default="scope">
<span
class="conclusion"
@@ -127,7 +119,7 @@
</span>
</template>
</vxe-column>
<vxe-column field="unbalanceQualifyData" title="指标合格率(%)" />
<!-- <vxe-column field="unbalanceQualifyData" title="指标合格率(%)" /> -->
</vxe-colgroup>
</vxe-table>
</div>
@@ -193,13 +185,17 @@ const analysis = (e: any) => {
let list: any = []
let time: any = []
let mun: any = []
res.data.forEach((item: any, num: any) => {
time.push(item.deptName)
list.push([])
item.children.forEach((val: any, i: any) => {
mun.push(val.score == 3.14159 ? null : val.score)
list[num].push(val.score == 3.14159 ? null : val.score)
})
})
console.log('🚀 ~ getAssessTrend ~ mun:', mun)
list.forEach((item: any, i: any) => {
picEChart.value.options.series.push({
name: time[i],
@@ -207,6 +203,8 @@ const analysis = (e: any) => {
data: item
})
})
picEChart.value.yAxis.min = Math.min(...mun) < 1 ? 0 : (Math.min(...mun) - 0.5).toFixed(2)
picEChart.value.yAxis.max = Math.max(...mun) > 4.5 ? 5 : (Math.max(...mun) + 0.5).toFixed(2)
loading.value = false
})
}

18
src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
View File

@@ -13,7 +13,7 @@
import { useAdminInfo } from '@/stores/adminInfo'
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
import { ref, onMounted, provide, nextTick } from 'vue'
import { ref, onMounted, provide, watch } from 'vue'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
@@ -23,13 +23,14 @@ import planAdd from './planAdd.vue'
import { useRouter } from 'vue-router'
import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
import { getUserByRoleType } from '@/api/user-boot/user'
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const dialogVisible = ref(false)
const tableRef = ref()
const planAddRef = ref()
const TableHeaderRef = ref()
const auditList: any = ref([])
const auditUser = ref('')
const flag = ref(false)
const openType = ref('create')
const tableStore = new TableStore({
url: '/supervision-boot/surveyPlan/surveyPlanPage',
@@ -89,6 +90,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstanceId,row.historyInstanceId)
}
},
@@ -198,6 +200,18 @@ onMounted(() => {
auditList.value = res.data
})
})
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>
<style scoped lang="scss"></style>

18
src/views/pqs/supervise/interfere/components/undocumented/index.vue
View File

@@ -30,7 +30,7 @@
<addForm ref="addForms" @onSubmit="tableStore.index()" openType="create"></addForm>
</template>
<script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue'
import { ref, onMounted, provide, watch } from 'vue'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
@@ -47,7 +47,7 @@ import { useAdminInfo } from '@/stores/adminInfo'
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
const dictData = useDictData()
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const TableHeaderRef = ref()
const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area')
@@ -56,6 +56,7 @@ const AuditRef = ref()
const ruleFormRef = ref()
const show: any = ref(false)
const fileList = ref([])
const flag = ref(false)
const tableStore = new TableStore({
url: '/supervision-boot/userReport/getUserReport',
publicHeight: 65,
@@ -133,6 +134,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
@@ -238,6 +240,18 @@ const cancelLeave = async (row: any) => {
onMounted(() => {
tableStore.index()
})
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
/** 处理审批按钮 */
const handleAudit = (instanceId: any, historyInstanceId: any) => {

24
src/views/pqs/supervise/plan/index.vue
View File

@@ -53,9 +53,10 @@ const adminInfo = useAdminInfo()
defineOptions({
name: 'plan'
})
const flag = ref(false)
// const layout = mainHeight(120) as any
const dictData = useDictData()
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const router = useRouter() // 路由对象
const TableHeaderRef = ref()
const tableRef = ref()
@@ -172,6 +173,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleDetails(row.processInstanceId, row.historyInstanceId)
},
disabled: row => {
@@ -208,9 +210,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return (
row.createBy != adminInfo.$state.id || row.status !=3
)
return row.createBy != adminInfo.$state.id || row.status != 3
},
click: row => {
addForms.value.open({
@@ -226,9 +226,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return (
row.createBy != adminInfo.$state.id || row.status != 1
)
return row.createBy != adminInfo.$state.id || row.status != 1
},
click: row => {
cancelLeave(row)
@@ -359,4 +357,16 @@ const handleEffectProblem = (row: any) => {
}
})
}
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>

44
src/views/pqs/supervise/retire/monitor.vue
View File

@@ -1,6 +1,6 @@
<!--待办事项列表-->
<template>
<div class='default-main'>
<div>
<TableHeader date-picker>
<template v-slot:select>
<!-- <el-form-item label='任务名称'>-->
@@ -12,22 +12,21 @@
<!-- </el-form-item>-->
</template>
<template #operation>
<el-button icon='el-icon-Plus' type='primary' @click='add'>新增</el-button>
<el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
<Table ref="tableRef"></Table>
<!--弹框-->
<device-quit-popup ref='deviceQuitPopup' />
<device-quit-popup ref="deviceQuitPopup" />
</div>
</template>
<script setup lang='ts'>
<script setup lang="ts">
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { onMounted, provide, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue'
import { ElMessage } from 'element-plus'
@@ -37,16 +36,20 @@ import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunni
defineOptions({
name: 'supervision/retire'
})
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const deviceQuitPopup = ref()
const flag = ref(false)
const tableStore = new TableStore({
url: '/supervision-boot/quitRunningDevice/list',
method: 'POST',
publicHeight: 65,
column: [
{ title: '序号', type: 'seq', width: 80 },
{
title: '设备类型', field: 'deviceType', minWidth: 130,
title: '设备类型',
field: 'deviceType',
minWidth: 130,
render: 'tag',
custom: {
1: 'primary',
@@ -62,7 +65,9 @@ const tableStore = new TableStore({
{ title: '设备名称', field: 'deviceName', minWidth: 130 },
{ title: '退役原因', field: 'propertyNo', minWidth: 130 },
{
title: '设备状态', field: 'deviceStatus', minWidth: 130,
title: '设备状态',
field: 'deviceStatus',
minWidth: 130,
render: 'tag',
custom: {
0: 'success',
@@ -80,7 +85,9 @@ const tableStore = new TableStore({
}
},
{
field: 'status', title: '审核状态', minWidth: 100,
field: 'status',
title: '审核状态',
minWidth: 100,
render: 'tag',
custom: {
1: 'primary',
@@ -111,6 +118,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
@@ -149,7 +157,6 @@ const tableStore = new TableStore({
delete tableStore.table.params[key]
}
}
}
})
@@ -197,5 +204,16 @@ const cancelLeave = async (row: any) => {
tableStore.index()
}
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>

45
src/views/pqs/supervise/retire/terminal.vue
View File

@@ -1,6 +1,6 @@
<!--待办事项列表-->
<template>
<div class='default-main'>
<div>
<TableHeader date-picker>
<template v-slot:select>
<!-- <el-form-item label='任务名称'>-->
@@ -12,22 +12,21 @@
<!-- </el-form-item>-->
</template>
<template #operation>
<el-button icon='el-icon-Plus' type='primary' @click='add'>新增</el-button>
<el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
<Table ref="tableRef"></Table>
<!--弹框-->
<device-quit-popup ref='deviceQuitPopup' />
<device-quit-popup ref="deviceQuitPopup" />
</div>
</template>
<script setup lang='ts'>
<script setup lang="ts">
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { onMounted, provide, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue'
import { ElMessage } from 'element-plus'
@@ -37,16 +36,19 @@ import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunni
defineOptions({
name: 'supervision/retire'
})
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const deviceQuitPopup = ref()
const flag = ref(false)
const tableStore = new TableStore({
url: '/supervision-boot/quitRunningDevice/list',
method: 'POST',
publicHeight: 65,
column: [
{ title: '序号', type: 'seq', width: 80 },
{
title: '设备类型', field: 'deviceType', minWidth: 130,
title: '设备类型',
field: 'deviceType',
minWidth: 130,
render: 'tag',
custom: {
1: 'primary',
@@ -62,7 +64,9 @@ const tableStore = new TableStore({
{ title: '设备名称', field: 'deviceName', minWidth: 130 },
{ title: '退役原因', field: 'propertyNo', minWidth: 130 },
{
title: '设备状态', field: 'deviceStatus', minWidth: 130,
title: '设备状态',
field: 'deviceStatus',
minWidth: 130,
render: 'tag',
custom: {
0: 'success',
@@ -80,7 +84,9 @@ const tableStore = new TableStore({
}
},
{
field: 'status', title: '审核状态', minWidth: 100,
field: 'status',
title: '审核状态',
minWidth: 100,
render: 'tag',
custom: {
1: 'primary',
@@ -111,6 +117,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
@@ -149,7 +156,6 @@ const tableStore = new TableStore({
delete tableStore.table.params[key]
}
}
}
})
@@ -197,5 +203,16 @@ const cancelLeave = async (row: any) => {
tableStore.index()
}
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>

11
src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
View File

@@ -20,7 +20,13 @@
label-position="right"
>
<el-form-item label="原因：" prop="reason">
<el-input v-model="form.reason" autocomplete="off" placeholder="请输入原因" />
<el-input
v-model="form.reason"
autocomplete="off"
:autosize="{ minRows: 2, maxRows: 4 }"
type="textarea"
placeholder="请输入原因"
/>
</el-form-item>
</el-form>
<template #footer>
@@ -52,7 +58,7 @@ const selectFormType = ref('')
selectFormType.value = '0'
const resetForm = () => {
form.value = {
reason: '', //填报人
reason: '' //填报人
}
}
//初始化数据
@@ -118,4 +124,3 @@ const confirmForm = () => {
}
defineExpose({ open })
</script>

25
src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
View File

@@ -27,7 +27,7 @@
<addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
</template>
<script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue'
import { ref, onMounted, provide, watch } from 'vue'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
@@ -42,14 +42,8 @@ import { cancelMointorPointFormData } from '@/api/supervision-boot/monitorpoint/
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
const dictData = useDictData()
const { push, beforeEach } = useRouter()
beforeEach((to, from) => {
if (from.path == '/bpm/instanceDetail') {
if (to.path == '/admin/terminalNetwotk') {
console.log('监测点2222')
}
}
})
const { push, options, currentRoute } = useRouter()
const flag = ref(false)
const TableHeaderRef = ref()
const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area')
@@ -107,6 +101,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
@@ -205,6 +200,18 @@ const exportEvent = () => {
onMounted(() => {
tableStore.index()
})
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
/** 处理审批按钮 */
const handleAudit = (instanceId: any, historyInstanceId: any) => {

26
src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
View File

@@ -12,7 +12,7 @@
<addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
</template>
<script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue'
import { ref, onMounted, provide, watch } from 'vue'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
@@ -27,20 +27,15 @@ import { useAdminInfo } from '@/stores/adminInfo'
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
const dictData = useDictData()
const { push, beforeEach } = useRouter()
beforeEach((to, from) => {
if (from.path == '/bpm/instanceDetail') {
if (to.path == '/admin/terminalNetwotk') {
console.log('终端1111')
}
}
})
const { push, options, currentRoute } = useRouter()
const TableHeaderRef = ref()
const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area')
const ruleFormRef = ref()
const show: any = ref(false)
const fileList = ref([])
const flag = ref(false)
const tableStore = new TableStore({
url: '/supervision-boot/deVReport/list',
publicHeight: 65,
@@ -137,6 +132,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
@@ -233,6 +229,18 @@ onMounted(() => {
tableStore.index()
})
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
/** 处理审批按钮 */
const handleAudit = (instanceId: any, historyInstanceId: any) => {
push({

20
src/views/system/bpm/task/done/index.vue
View File

@@ -17,7 +17,7 @@
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { onMounted, provide, ref,watch } from 'vue'
import { useRouter } from 'vue-router'
import { dateFormatter, formatPast2 } from '@/utils/formatTime'
@@ -25,8 +25,8 @@ defineOptions({
name: 'businessUser'
})
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const flag = ref(false)
const tableStore = new TableStore({
url: '/bpm-boot/bpm/task/doneList',
method: 'POST',
@@ -87,6 +87,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstance.id)
}
}
@@ -118,4 +119,17 @@ const handleAudit = (instanceId: any) => {
}
})
}
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>

2
src/views/system/bpm/task/index.vue
View File

@@ -22,7 +22,7 @@ import MyInstance from './myInstance/index.vue'
import { mainHeight } from '@/utils/layout'
defineOptions({
// name: 'bpm/task'
name: 'bpm/task'
})
const activeName = ref('1')

49
src/views/system/bpm/task/myInstance/index.vue
View File

@@ -3,25 +3,21 @@
<div>
<TableHeader date-picker>
<template v-slot:select>
<el-form-item label='任务名称'>
<el-input
v-model='tableStore.table.params.searchValue'
placeholder='请输入任务名称'
></el-input>
<el-form-item label="任务名称">
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称"></el-input>
</el-form-item>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
<Table ref="tableRef"></Table>
</div>
</template>
<script setup lang='ts'>
<script setup lang="ts">
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { onMounted, provide, ref, watch } from 'vue'
import { formatDate, formatPast2 } from '@/utils/formatTime'
import { useRouter } from 'vue-router'
import { useDictData } from '@/stores/dictData'
@@ -32,8 +28,8 @@ defineOptions({
name: 'businessUser'
})
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const flag = ref(false)
const tableStore = new TableStore({
url: '/bpm-boot/bpm/processInstance/myPage',
@@ -49,10 +45,14 @@ const tableStore = new TableStore({
}
},
{ title: '任务名称', field: 'name', minWidth: 130 },
{ title: '流程分类', field: 'category', minWidth: 130 ,
{
title: '流程分类',
field: 'category',
minWidth: 130,
formatter: (row: any) => {
return categoryOptionList.filter(item => item.id === row.cellValue)[0]?.name
}},
}
},
{
field: 'status',
title: '流程状态',
@@ -74,14 +74,18 @@ const tableStore = new TableStore({
{ title: '发起时间', field: 'startTime', minWidth: 140 },
{ title: '结束时间', field: 'endTime', minWidth: 140 },
{
title: '耗时', field: 'durationInMillis', minWidth: 130,
title: '耗时',
field: 'durationInMillis',
minWidth: 130,
formatter: (obj: any) => {
const millis = obj.row.durationInMillis
return millis > 0 ? formatPast2(millis) : ''
}
},
{
title: '当前审批任务', field: 'tasks', minWidth: 140,
title: '当前审批任务',
field: 'tasks',
minWidth: 140,
formatter: (obj: any) => {
const tasks = obj.row.tasks
if (tasks) {
@@ -107,6 +111,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.id)
}
}
@@ -119,7 +124,6 @@ const tableStore = new TableStore({
delete tableStore.table.params[key]
}
}
}
})
@@ -139,5 +143,16 @@ const handleAudit = (instanceId: any) => {
}
})
}
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>

34
src/views/system/bpm/task/todo/index.vue
View File

@@ -3,34 +3,29 @@
<div>
<TableHeader>
<template v-slot:select>
<el-form-item label='任务名称'>
<el-input
v-model='tableStore.table.params.searchValue'
placeholder='请输入任务名称'
></el-input>
<el-form-item label="任务名称">
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称"></el-input>
</el-form-item>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
<Table ref="tableRef"></Table>
</div>
</template>
<script setup lang='ts'>
<script setup lang="ts">
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { onMounted, provide, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
defineOptions({
name: 'businessUser'
})
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const flag = ref(false)
const tableStore = new TableStore({
url: '/bpm-boot/bpm/task/todoList',
@@ -63,6 +58,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstance.id)
}
}
@@ -75,7 +71,6 @@ const tableStore = new TableStore({
delete tableStore.table.params[key]
}
}
}
})
@@ -96,5 +91,16 @@ const handleAudit = (instanceId: any) => {
}
})
}
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>