|
@@ -253,13 +253,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
- <pagination
|
|
|
- v-show="total2 > 0"
|
|
|
- v-model:page="drillForm.page"
|
|
|
- v-model:limit="drillForm.pageSize"
|
|
|
- :total="total2"
|
|
|
- @pagination="getList2"
|
|
|
- />
|
|
|
+ <pagination v-show="total2 > 0" v-model:page="drillForm.page" v-model:limit="drillForm.pageSize" :total="total2" @pagination="getList2" />
|
|
|
</el-card>
|
|
|
</el-col>
|
|
|
<el-col :lg="30" :xs="24">
|
|
@@ -509,7 +503,7 @@
|
|
|
|
|
|
<script setup name="User" lang="ts">
|
|
|
import api from '@/api/system/user';
|
|
|
-import { UserForm, UserQuery, UserVO, PlanVO, DrillVO, ResponseVO, PlanForm } from "@/api/system/user/types";
|
|
|
+import { UserForm, UserQuery, UserVO, PlanVO, DrillVO, ResponseVO, PlanForm } from '@/api/system/user/types';
|
|
|
import { DeptVO } from '@/api/system/dept/types';
|
|
|
import { RoleVO } from '@/api/system/role/types';
|
|
|
import { PostQuery, PostVO } from '@/api/system/post/types';
|
|
@@ -729,25 +723,22 @@ const data = reactive<PageData<UserForm, UserQuery>>(initData);
|
|
|
const { queryParams, form2, rules } = toRefs<PageData<UserForm, UserQuery>>(data);
|
|
|
//演练
|
|
|
const drillForm = reactive<DrillForm>({
|
|
|
- page: 1,
|
|
|
+ pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
- planNum: 'YJYA0000000001'
|
|
|
+ planId: 'YJYA0000000001'
|
|
|
});
|
|
|
//培训
|
|
|
const queryParams3 = reactive({
|
|
|
- page:1 ,
|
|
|
+ page: 1,
|
|
|
pageSize: 10,
|
|
|
planNum: 'YJYA0000000001'
|
|
|
});
|
|
|
//响应
|
|
|
const responseParams = reactive({
|
|
|
- page: 1,
|
|
|
+ pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
- planNum: 'YJYA0000000001'
|
|
|
+ planId: 'YJYA0000000001'
|
|
|
});
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
/** 通过条件过滤节点 */
|
|
|
const filterNode = (value: string, data: any) => {
|
|
|
if (!value) return true;
|