dac5d293 by xukangle

Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

2 parents 4d695af8 d6e60d1a
...@@ -328,6 +328,7 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => { ...@@ -328,6 +328,7 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => {
328 328
329 const getTableData = () => { 329 const getTableData = () => {
330 loading.value = true; 330 loading.value = true;
331 getExchangeData();
331 getRegisterList({ 332 getRegisterList({
332 pageSize: pageInfo.value.limit, 333 pageSize: pageInfo.value.limit,
333 pageIndex: pageInfo.value.curr, 334 pageIndex: pageInfo.value.curr,
...@@ -376,7 +377,7 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -376,7 +377,7 @@ const toSearch = (val: any, clear: boolean = false) => {
376 pageInfo.value.tenantGuid = val.tenantGuid; 377 pageInfo.value.tenantGuid = val.tenantGuid;
377 } 378 }
378 getTableData(); 379 getTableData();
379 getExchangeData(); 380 // getExchangeData();
380 }; 381 };
381 382
382 const pageChange = (info) => { 383 const pageChange = (info) => {
...@@ -389,13 +390,13 @@ onActivated(() => { ...@@ -389,13 +390,13 @@ onActivated(() => {
389 if (assetStore.isRefresh) {//如果是首次加载,则不需要调用 390 if (assetStore.isRefresh) {//如果是首次加载,则不需要调用
390 pageInfo.value.curr = 1; 391 pageInfo.value.curr = 1;
391 getTableData(); 392 getTableData();
392 getExchangeData(); 393 // getExchangeData();
393 assetStore.set(false); 394 assetStore.set(false);
394 } 395 }
395 }) 396 })
396 397
397 onBeforeMount(() => { 398 onBeforeMount(() => {
398 getExchangeData(); 399 // getExchangeData();
399 }) 400 })
400 401
401 const passDialogInfo = ref({ 402 const passDialogInfo = ref({
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!