修改测试问题

hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts

@@ -2,6 +2,7 @@
 export const voucherColumns = [
   {
     title: '序号',
+    width: 80,
     customRender: (text: any) => {
       return text.index + 1;
     },
@@ -39,4 +40,4 @@ export const drawerColumns = [
     className: 'dataSources',
     dataIndex: 'dataSources',
   },
-];
+];

hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue

@@ -45,7 +45,9 @@
                   <a-input-search
                     v-model:value="searchValue"
                     style="margin-bottom: 8px"
-                    placeholder="请输入关键词" />
+                    placeholder="请输入关键词"
+                    allowClear
+                    @search="onSearchTreeData" />
                 </a-col>
               </a-row>
             </div>
@@ -348,14 +350,14 @@
         </a-row>
         <a-row>
           <a-col :span="24">
-            <a-form-item ref="name" label="因子值" name="factorId">
-              <ns-input v-model:value="editFormState.factorId" />
+            <a-form-item ref="name" label="因子值" name="emissionFactors">
+              <ns-input v-model:value="editFormState.emissionFactors" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item ref="name" label="关键字" name="emissionFactors">
+            <a-form-item ref="name" label="关键字" name="key">
               <a-input-search
-                v-model:value="editFormState.emissionFactors"
+                v-model:value="editFormState.key"
                 @search="searchKey"
                 placeholder="请输入关键字" />
             </a-form-item>
@@ -564,13 +566,19 @@
       getCarbonFlowDirection();
     }
   };
+  // 筛选树结构中的数据
+  const onSearchTreeData = (searchValue: string) => {
+    getReportTreeQuery.value.cnValue = searchValue;
+    getReportTree();
+  };
   // 获取碳盘查报告树
   const selectedIds = ref([]);
+  const getReportTreeQuery = ref({
+    reportId: props.reportId,
+    orgId: orgId.value,
+  });
   const getReportTree = () => {
-    fetch(carbonInventoryCheck.getCategoryTree, {
-      reportId: props.reportId,
-      orgId: orgId.value,
-    }).then((res) => {
+    fetch(carbonInventoryCheck.getCategoryTree, getReportTreeQuery.value).then((res) => {
       gData.value = res.data;
       if (res.data.length > 0) {
         categoryId.value = res.data[0].children[0].conId;
@@ -712,6 +720,7 @@
     year: props.year,
     startTime: props.startTime,
     endTime: props.endTime,
+    categoryId: categoryId.value,
   });
   // 计量单位的变量
   const measurementUnit = ref([]);
@@ -787,6 +796,10 @@
             addTreeNodeVisible.value = false;
             formState.value = {
               orgId: orgId.value,
+              year: props.year,
+              startTime: props.startTime,
+              endTime: props.endTime,
+              categoryId: categoryId.value,
             };
             message.success('操作成功！');
             getEmissionSourceTree();
@@ -796,6 +809,10 @@
             addTreeNodeVisible.value = false;
             formState.value = {
               orgId: orgId.value,
+              year: props.year,
+              startTime: props.startTime,
+              endTime: props.endTime,
+              categoryId: categoryId.value,
             };
             message.success('操作成功！');
             changeSelectedKeys.value = true;
@@ -919,6 +936,10 @@
     addTreeNodeVisible.value = false;
     formState.value = {
       orgId: orgId.value,
+      year: props.year,
+      startTime: props.startTime,
+      endTime: props.endTime,
+      categoryId: categoryId.value,
     };
     formRef.value.resetFields();
   };
@@ -978,6 +999,7 @@
   const selectedRowKeysEdit = ref([]);
   const onSelectionChangeEdit = (selectedKeys, selectedRows) => {
     selectedRowKeysEdit.value = selectedKeys;
+    editFormState.value.emissionFactors = selectedRows[0].emissionFactors;
     editFormState.value.factorId = selectedKeys;
   };
   const queryParams = ref({
@@ -997,12 +1019,14 @@
     // 获取能耗类型
     const options = await dict({ params: { dicKey: 'ENERGY_TYPE' } });
     energyTypeOptions.value = options.data.data;
-    getNewTable();
+    editFormState.value.key = record.factorName;
+    searchKey();
     editFormState.value.id = record.id;
     editFormState.value.dataSources = record.dataSources;
-    editFormState.value.consumption = record.emissions;
+    editFormState.value.consumption = record.consumption;
     editFormState.value.collectionNode = record.carbonSource;
     editFormState.value.factorId = record.factorId;
+    editFormState.value.emissionFactors = record.emissionFactors;
     selectedRowKeysEdit.value = [record.factorId];
     fetch(uploadPic.select, { bizId: record.id, bizType: 2 }).then((res) => {
       fileList.value = res.data.map((item) => ({
@@ -1022,7 +1046,11 @@
     });
   };
   const searchKey = () => {
-    queryData.value.emissionSources = editFormState.value.emissionFactors;
+    if (editFormState.value.key) {
+      queryData.value.emissionSources = editFormState.value.key;
+    } else {
+      queryData.value.emissionSources = '';
+    }
     getNewTable();
   };
   // 数据来源选择框改变