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

Merge branch 'master' of http://192.168.1.22:3000/frontend/admin-sjzx

Browse Source 
# Conflicts:
#	src/views/system/bpm/task/todo/index.vue
This commit is contained in:
GGJ
2024-09-18 15:54:17 +08:00
parent 1a8e5e88a4 802e7e0983
commit 1e3372df77
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/pqs/supervise/terminal/index.vue
View File

@@ -43,8 +43,6 @@ watch(() => route.query.t, async (newValue, oldValue) => {
let type = (route.query.type as string) || 'null' let type = (route.query.type as string) || 'null'
if (type == '1') { if (type == '1') {
activeName.value = '1' activeName.value = '1'
} else {
activeName.value = '4'
} }
id.value = (route.query.id as string) || 'null' id.value = (route.query.id as string) || 'null'
id.value = id.value + '@' + route.query.t id.value = id.value + '@' + route.query.t

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

@@ -1,27 +1,16 @@
<!--待办事项列表--> <!--待办事项列表-->
<template> <template>
<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>
<!-- <el-form-item label='任务类型'>--> </TableHeader>
<!-- <el-select v-model="tableStore.table.params.runF" clearable placeholder="请选择任务类型">--> <!--表格-->
<!-- <el-option--> <Table ref='tableRef'></Table>
<!-- v-for="item in runFlagList"--> </div>
<!-- :key="item.id"-->
<!-- :label="item.name"-->
<!-- :value="item.id"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</template>
</TableHeader>
<!--表格-->
<Table ref="tableRef"></Table>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">