修改海南测试问题
This commit is contained in:
@@ -24,7 +24,10 @@ import { dateFormatter, formatPast2 } from '@/utils/formatTime'
|
||||
defineOptions({
|
||||
name: 'businessUser'
|
||||
})
|
||||
|
||||
const props = defineProps({
|
||||
height: [String, Number] ,
|
||||
|
||||
})
|
||||
const { push, options, currentRoute } = useRouter()
|
||||
const flag = ref(false)
|
||||
const tableStore = new TableStore({
|
||||
@@ -106,6 +109,11 @@ const tableStore = new TableStore({
|
||||
onMounted(() => {
|
||||
// 加载数据
|
||||
tableStore.index()
|
||||
setTimeout(() => {
|
||||
if (props.height) {
|
||||
tableStore.table.height = props.height
|
||||
}
|
||||
},0)
|
||||
})
|
||||
tableStore.table.params.searchValue = ''
|
||||
provide('tableStore', tableStore)
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
<div class='default-main'>
|
||||
<el-tabs v-model='activeName' type='border-card'>
|
||||
<el-tab-pane label='待办任务' name='1'>
|
||||
<TodoTask v-if="activeName == '1'" />
|
||||
<TodoTask v-if="activeName == '1'" :height="height"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label='已办任务' name='2'>
|
||||
<DoneTask v-if="activeName == '2'" />
|
||||
<DoneTask v-if="activeName == '2'" :height="height"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label='我发起的' name='3'>
|
||||
<MyInstance v-if="activeName == '3'" />
|
||||
<MyInstance v-if="activeName == '3'" :height="height"/>
|
||||
</el-tab-pane>
|
||||
<!-- <el-tab-pane label='预告警单任务' name='4'>-->
|
||||
<!-- <AlarmTask v-if="activeName == '4'" />-->
|
||||
@@ -24,7 +24,11 @@ import DoneTask from './done/index.vue'
|
||||
import MyInstance from './myInstance/index.vue'
|
||||
import AlarmTask from './alarmTask/index.vue'
|
||||
import { mainHeight } from '@/utils/layout'
|
||||
|
||||
const props = defineProps({
|
||||
height: [String, Number] ,
|
||||
|
||||
})
|
||||
console.log("🚀 ~ height:", props.height)
|
||||
defineOptions({
|
||||
name: 'bpm/task'
|
||||
})
|
||||
@@ -40,7 +44,7 @@ const layout = mainHeight(63) as any
|
||||
}
|
||||
|
||||
:deep(.el-tabs__content) {
|
||||
height: v-bind('layout.height');
|
||||
// height: v-bind('layout.height');
|
||||
overflow-y: auto;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
<TableHeader date-picker theCurrentTime>
|
||||
<template v-slot:select>
|
||||
<el-form-item label="任务名称">
|
||||
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称" clearable maxlength="32" show-word-limit></el-input>
|
||||
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称" clearable
|
||||
maxlength="32" show-word-limit></el-input>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</TableHeader>
|
||||
@@ -23,7 +24,10 @@ import { useRouter } from 'vue-router'
|
||||
import { useDictData } from '@/stores/dictData'
|
||||
const dictData = useDictData()
|
||||
const categoryOptionList = dictData.getBasicData('flow_category')
|
||||
const props = defineProps({
|
||||
height: [String, Number],
|
||||
|
||||
})
|
||||
defineOptions({
|
||||
name: 'businessUser'
|
||||
})
|
||||
@@ -120,17 +124,22 @@ const tableStore = new TableStore({
|
||||
}
|
||||
],
|
||||
beforeSearchFun: () => {
|
||||
for (let key in tableStore.table.params) {
|
||||
if (tableStore.table.params[key] === '') {
|
||||
delete tableStore.table.params[key]
|
||||
}
|
||||
}
|
||||
// for (let key in tableStore.table.params) {
|
||||
// if (tableStore.table.params[key] === '') {
|
||||
// delete tableStore.table.params[key]
|
||||
// }
|
||||
// }
|
||||
}
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
// 加载数据
|
||||
tableStore.index()
|
||||
setTimeout(() => {
|
||||
if (props.height) {
|
||||
tableStore.table.height = props.height
|
||||
}
|
||||
}, 0)
|
||||
})
|
||||
tableStore.table.params.searchValue = ''
|
||||
provide('tableStore', tableStore)
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
<!--待办事项列表-->
|
||||
<template>
|
||||
<div>
|
||||
<TableHeader>
|
||||
<template v-slot:select>
|
||||
<el-form-item label='任务名称'>
|
||||
<el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称' clearable maxlength="32" show-word-limit></el-input>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</TableHeader>
|
||||
<!--表格-->
|
||||
<Table ref='tableRef'></Table>
|
||||
</div>
|
||||
<div>
|
||||
<TableHeader>
|
||||
<template v-slot:select>
|
||||
<el-form-item label='任务名称'>
|
||||
<el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称' clearable
|
||||
maxlength="32" show-word-limit></el-input>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</TableHeader>
|
||||
<!--表格-->
|
||||
<Table ref='tableRef'></Table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
@@ -21,6 +22,10 @@ import { onMounted, provide, ref, watch } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { getById } from '@/api/supervision-boot/leaflet'
|
||||
import { getRunningDeviceById } from '@/api/supervision-boot/device/quitRunningDev'
|
||||
const props = defineProps({
|
||||
height: [String, Number],
|
||||
|
||||
})
|
||||
|
||||
const router = useRouter() // 路由对象
|
||||
defineOptions({
|
||||
@@ -215,6 +220,7 @@ const tableStore = new TableStore({
|
||||
}
|
||||
],
|
||||
beforeSearchFun: () => {
|
||||
|
||||
for (let key in tableStore.table.params) {
|
||||
if (tableStore.table.params[key] === '' && key != 'searchValue') {
|
||||
delete tableStore.table.params[key]
|
||||
@@ -222,6 +228,7 @@ const tableStore = new TableStore({
|
||||
}
|
||||
},
|
||||
loadCallback: () => {
|
||||
|
||||
if (tableStore.table.params.searchValue) {
|
||||
const searchProps = ['taskName', 'taskContent', 'startUser', 'taskCreateTime']
|
||||
const rest = tableStore.table.data.filter(item =>
|
||||
@@ -245,6 +252,11 @@ provide('tableStore', tableStore)
|
||||
onMounted(() => {
|
||||
// 加载数据
|
||||
tableStore.index()
|
||||
setTimeout(() => {
|
||||
if (props.height) {
|
||||
tableStore.table.height = props.height
|
||||
}
|
||||
}, 0)
|
||||
})
|
||||
/** 处理审批按钮 */
|
||||
const handleAudit = (instanceId: string, historyInstanceId: string) => {
|
||||
|
||||
Reference in New Issue
Block a user