解决服务指令-镜像日志查询接口:后台使用@DS注解 内部使用DynamicDataSourceContextHolder.push(dataSource);切换后再清理 导致默认切回到了主数据源问题
This commit is contained in:
parent
2c816902bc
commit
6ddbfcdcd2
|
|
@ -395,7 +395,7 @@
|
|||
<div style="flex: 1; min-height: 0; width: 100%;margin-top: 14px;">
|
||||
<a-row style="width: 100%; height: 100%; margin: 0;">
|
||||
<a-col :span="24" style="width: 100%; height: 100%; padding: 0;">
|
||||
<DirectiveSyncLogMainList style="width: 100%; height: 100%;" />
|
||||
<DirectiveSyncLogMainList :orgCode="ownOrgCode" style="width: 100%; height: 100%;" />
|
||||
</a-col>
|
||||
</a-row>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ export const columns: BasicColumn[] = [
|
|||
{
|
||||
title: '镜像机构',
|
||||
align: 'center',
|
||||
dataIndex: 'targetOrgCode_dictText',
|
||||
dataIndex: 'opeOrgCode_dictText',
|
||||
},
|
||||
{
|
||||
title: '镜像日期',
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<a-col :lg="6">
|
||||
<a-form-item name="opeOrgCode">
|
||||
<template #label><span title="镜像机构">镜像机构</span></template>
|
||||
<j-dict-select-tag v-model:value="queryParam.targetOrgCode" dictCode="sys_depart,depart_name,org_code"
|
||||
<j-dict-select-tag v-model:value="queryParam.opeOrgCode" dictCode="sys_depart,depart_name,org_code"
|
||||
placeholder="请选择镜像机构" allowClear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" name="directivesynclog-directiveSyncLogMain" setup>
|
||||
import { ref, reactive } from 'vue';
|
||||
import { ref, reactive, defineProps } from 'vue';
|
||||
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import { columns, superQuerySchema } from './DirectiveSyncLogMain.data';
|
||||
|
|
@ -74,6 +74,9 @@ const queryParam = reactive<any>({});
|
|||
const toggleSearchStatus = ref<boolean>(false);
|
||||
const registerModal = ref();
|
||||
const userStore = useUserStore();
|
||||
const props = defineProps({
|
||||
orgCode: ''
|
||||
});
|
||||
//注册table数据
|
||||
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
||||
tableProps: {
|
||||
|
|
@ -88,7 +91,9 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
},
|
||||
beforeFetch: async (params) => {
|
||||
let rangerQuery = await setRangeQuery();
|
||||
return Object.assign(params, rangerQuery);
|
||||
return Object.assign(params, rangerQuery, {
|
||||
targetOrgCode: props.orgCode
|
||||
});
|
||||
},
|
||||
},
|
||||
exportConfig: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue