Lin Qilong пре 2 месеци
родитељ
комит
0f2a733143

+ 0 - 1
ruoyi-ui/src/views/monitor/server/index.vue

@@ -128,7 +128,6 @@ function getList() {
       return a
     })
     networkData.value = serverList.value.map(item => {
-      debugger
       return {
         name: item.system.primary_ip,
         total_download_mbps: (item.network.speed.total_download_mbps || 0).toFixed(2),

+ 6 - 10
ruoyi-ui/src/views/register/modelData/dataQuery.vue

@@ -137,6 +137,7 @@ import {cloneDeep} from 'lodash'
 import BizDataShowConfigApi from "@/views/standardization/bizDataShowConfig/api/index.vue";
 import BizDataShowConfigList from "@/views/standardization/bizDataShowConfig/list/index.vue";
 import BizDisplay from "@/views/standardization/bizDataShowConfig/show/index.vue";
+import bus from "@/utils/bus.js";
 
 const total = ref(0)
 
@@ -272,6 +273,8 @@ function handleNodeClick(node, data) {
       let data = res.data.dataSet
       data.id = data.dcCode
       dataSetConfig.value = data
+      const queryOptions = JSON.parse(data.queryOptions)
+      params.value = [...queryOptions.params, ...queryOptions.body]
     })
   })
 
@@ -306,7 +309,9 @@ function renameTreeProperties(tree) {
 }
 
 function handleQuery() {
-
+  const param = {}
+  params.value.forEach(p => param[p.key] = p.value)
+  bus.emit('load-params', param)
 }
 
 
@@ -323,13 +328,6 @@ watch(() => form.value.queryOptions, queryOptions => {
     columns.value = api.response
   }
 }, {immediate: true, deep: true})
-
-watch(() => dataSetConfig.value, config => {
-  const queryOptions = JSON.parse(config.queryOptions)
-  const param = [...queryOptions.params, ...queryOptions.body]
-  debugger
-  params.value = param
-}, {deep: true})
 </script>
 <style scoped>
 :deep(.svg-icon) {
@@ -385,8 +383,6 @@ watch(() => dataSetConfig.value, config => {
 }
 </style>
 <style scoped lang="scss">
-
-
 .el-table .el-table__row td {
   height: 60px !important; /* 行高 */
 }

+ 17 - 22
ruoyi-ui/src/views/standardization/bizDataShowConfig/show/index.vue

@@ -71,6 +71,7 @@ const bodyHeight = computed(() => {
   }
 })
 
+const backConfig = ref(null)
 const data = ref(null)
 const title = ref(null)
 const displayType = ref(null)
@@ -88,7 +89,7 @@ function loadData(config) {
   if (!config) {
     return
   }
-  config.value = config
+  backConfig.value = config
   displayType.value = config.type || 'list'
   title.value = config.name
 
@@ -120,17 +121,16 @@ function loadData(config) {
 async function loadTableData(config, page = 1) {
   try {
     const params = {}
-
     // 添加从外部传入的参数
-    if (config.value && config.value.params) {
-      Object.assign(params, config.value.params);
+    if (config && config.params) {
+      Object.assign(params, config.params);
     }
 
     if (paginationConfig.value.enabled) {
       params[paginationConfig.value.pageNumParam || 'pageNum'] = page
       params[paginationConfig.value.pageSizeParam || 'pageSize'] = paginationConfig.value.pageSize || 10
     }
-
+    debugger
     let res;
     switch (props.source) {
       case "DATA_SET":
@@ -235,26 +235,21 @@ bus.on('load-params', (params) => {
   // 修改配置里的参数
   if (params && typeof params === 'object') {
     // 遍历传入的参数并更新到当前配置中
-    Object.keys(params).forEach(key => {
-      // 这里可以将参数应用到当前组件的配置中
-      // 例如,如果需要更新分页参数或其他配置项
-      if (config.value) {
-        // 如果配置中已有该参数,则更新它
-        if (config.value[key] !== undefined) {
-          config.value[key] = params[key];
-        }
-        // 或者可以将参数存储到一个专门的参数对象中
-        if (!config.value.params) {
-          config.value.params = {};
-        }
-        config.value.params[key] = params[key];
+    const keys = Object.keys(params);
+    if (!backConfig.value) {
+      return
+    }
+
+    for (let key of keys) {
+      // 或者可以将参数存储到一个专门的参数对象中
+      if (!backConfig.value.params) {
+        backConfig.value.params = {};
       }
-    });
+      backConfig.value.params[key] = params[key];
 
-    // 重新加载数据以应用新的参数
-    if (config.value) {
-      loadData(config.value);
     }
+    // 重新加载数据以应用新的参数
+    loadData(backConfig.value);
   }
 })