fix: 调整报表

src/components/common/y-chart.vue

@@ -78,7 +78,6 @@ watch(
   },
 );
 
-
 const toFilt = () => {
   const cloneFilter = _.cloneDeep(props.filterConfig);
   const filter = cloneFilter
@@ -89,8 +88,8 @@ const toFilt = () => {
       return item.type === 'time' ? {
         name: item.name,
         type: item.type,
-        start_time: dateType.value === 'month' ? filterData.value[item.name][0].format('YYYY-MM') : filterData.value[item.name][0].format('YYYY-MM-DD'),
-        end_time: dateType.value === 'month' ? filterData.value[item.name][1].format('YYYY-MM') : filterData.value[item.name][1].format('YYYY-MM-DD'),
+        start_time: filterData.value[item.name][0].format('YYYY-MM-DD'),
+        end_time: filterData.value[item.name][1].format('YYYY-MM-DD'),
         date_type: dateType.value,
       } : {
         name: item.name,

src/router/routes.ts

@@ -49,7 +49,7 @@ const routeList: RouteType[] = [
             path: 'module-cfg',
             name: 'module-cfg',
             component: () => import('@/views/config-manage/module-cfg/index.vue'),
-            meta: { title: '数据表配置' },
+            meta: { title: '数据来源配置' },
             isMenu: true,
             children: [],
           },

src/views/config-manage/module-cfg/components/create-modal.vue

@@ -12,6 +12,7 @@
           placeholder="请选择所属项目"
           v-model:value="formData.project_id"
           :options="projectSelect"
+          @change="toGetDbTable"
         />
       </a-form-item>
       <a-form-item label="数据来源" name="modular_name">
@@ -49,7 +50,7 @@
         name="table"
       >
         <a-select
-          placeholder="请选择数据表"
+          placeholder="请先选择项目再选择数据表"
           v-model:value="formData.table"
           :options="tableTypes"
         />
@@ -131,12 +132,12 @@ watch(
   }
 );
 
-onMounted(() => {
-  toGetDbTable();
-});
+// onMounted(() => {
+//   toGetDbTable();
+// });
 
 const toGetDbTable = () => {
-  getDbTableSelect().then((res) => {
+  getDbTableSelect({ projectId: formData.value.project_id }).then((res) => {
     tableTypes.value = res.data;
   });
 };

src/views/config-manage/module-cfg/config.ts

@@ -1,6 +1,6 @@
 export const moduleCfgCols = [
   { dataIndex: 'modular_id', title: '编号', align: 'center'},
-  { dataIndex: 'modular_name', title: '数据表名称', align: 'center'},
+  { dataIndex: 'modular_name', title: '数据来源名称', align: 'center'},
   { dataIndex: 'project_name', title: '项目名称', align: 'center'},
   { dataIndex: 'is_show', title: '展示状态', align: 'center'},
   { dataIndex: 'original_type_handle', title: '数据源类型', align: 'center'},

src/views/config-manage/module-cfg/index.vue

@@ -4,7 +4,7 @@
       <a-space>
         <a-input
           v-model:value="modularName"
-          placeholder="请输入数据表名称"
+          placeholder="请输入数据来源名称"
           allow-clear
           style="width: 200px"
           @change="search"

src/views/config-manage/module-cfg/service.js

@@ -54,10 +54,13 @@ export function getProjectSelect() {
   });
 }
 
-// 数据源表下拉
-export function getDbTableSelect() {
+// 数据表源下拉
+export function getDbTableSelect({ projectId }) {
   return get({
     url: `/api/v1/modular/get-database-table-drop`,
+    params: {
+      project_id: projectId,
+    },
   });
 }
 

src/views/config-manage/project-cfg/components/create-modal.vue

@@ -14,7 +14,7 @@
         />
       </a-form-item>
       <a-form-item label="项目标识" name="mark">
-        <a-input placeholder="请输入项目标识，例如：oa" />
+        <a-input placeholder="请输入项目标识，例如：oa" v-model:value="formData.mark" />
       </a-form-item>
       <a-form-item label="展示状态" name="is_show">
         <a-switch

src/views/view-all-manage/create-view/index.vue

@@ -106,7 +106,7 @@
             />
           </div>
         </div>
-        <y-chart v-else-if="previewData.type === 'chart'" :chart-cfg="previewData.chartCfg"></y-chart>
+        <y-chart v-else-if="previewData.type === 'chart'" :chart-cfg="previewData.chartCfg" :filter-config="previewData.filter" @toFilt="toPreview"></y-chart>
         <div class="preview-area" v-else>
           <div><BarChartOutlined /></div>
           <div>预览区</div>
@@ -165,7 +165,8 @@ const previewData = reactive({
   columnConfig: [], // 表格表头
   dataList: [], // 表格数据
   filterData: {},
-  chartCfg: {},
+  config: {},
+  filter: [],
   page: 1,
   perPage: 20,
   total: 0,
@@ -246,25 +247,33 @@ const resetPreviewData = () => {
   previewData.total = 0;
 };
 
-const toPreview = () => {
+const toPreview = ({filter}) => {
   previewLoading.value = true;
-  const filter = previewData.filterConfig
-    .filter((item) => {
-      return previewData.filterData[item.name] !== undefined;
-    })
-    .map((item) => {
-      return {
-        name: item.name,
-        type: item.type,
-        value: previewData.filterData[item.name],
-      };
-    });
+  let filterData
+  if (!filter) {
+    
+    filterData = previewData.filterConfig
+      .filter((item) => {
+        return previewData.filterData[item.name] !== undefined;
+      })
+      .map((item) => {
+        return {
+          name: item.name,
+          type: item.type,
+          value: previewData.filterData[item.name],
+        };
+      });
+  } else {
+    filterData = filter;
+  }
+  console.log('filterData',filterData)
+  
   preview({
     modularId: modularId.value,
     fieldIds: fieldIds.value.toString(),
     page: previewData.page,
     perPage: previewData.perPage,
-    filter,
+    filter: filterData,
     showTypeId: showTypeId.value,
     xDataId: xDataId.value?.toString(),
     yDataId: yDataId.value?.toString(),
@@ -283,6 +292,7 @@ const toPreview = () => {
         previewData.total = res.data.count;
       } else {
         previewData.chartCfg = res.data.config;
+        previewData.filter = res.data.filter;
       }
     })
     .finally(() => {