remark:'commit'

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

@@ -60,7 +60,7 @@
         <div class="ns-table-title ns-title-extra-box">排放源</div>
         <a-button type="primary" style="margin-left: 12px" @click="changeParentData">返回</a-button>
       </div>
-      <div style="display: flex" v-if="fillInPage">
+      <div style="display: flex; height: 100%" v-if="fillInPage">
         <div class="mainLeft">
           <a-tree
             :expandedKeys="expandedKeysR"
@@ -370,8 +370,13 @@
     year: {
       type: String,
     },
+    startTime: {
+      type: String,
+    },
+    endTime: {
+      type: String,
+    },
   });
-  console.log(props, 'xxy');
 
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
@@ -624,6 +629,8 @@
   const formState = ref({
     orgId: orgId.value,
     year: props.year,
+    startTime: props.startTime,
+    endTime: props.endTime,
   });
   // 计量单位的变量
   const measurementUnit = ref([]);
@@ -1018,13 +1025,13 @@
     year: props.year,
     categoryId: categoryId.value,
   });
-  const linksData = ref([])
-  const datalist = ref([])
+  const linksData = ref([]);
+  const datalist = ref([]);
   const getCarbonFlowDirection = () => {
     fetch(carbonInventoryCheck.carbonFlowDirection, queryFlowDirection.value).then((res) => {
       console.log(res);
-      linksData.value = res.data[0]
-      datalist.value = res.data[1]
+      linksData.value = res.data[0];
+      datalist.value = res.data[1];
       drawEcharts();
     });
   };
@@ -1431,6 +1438,7 @@
       margin-right: 1%;
       border-right: 1px solid #f2f2f2;
       position: relative;
+      height: 96%;
       .treeRow {
         display: flex;
         justify-content: space-between;

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

@@ -5,7 +5,7 @@
   </div>
   <!-- 填报页 -->
   <div v-if="fillInPage" style="height: 100%">
-    <fillIn :reportId="reportId" :year="year" @change-data="updateData" />
+    <fillIn :reportId="reportId" :year="year" :startTime="startTime" :endTime="endTime" @change-data="updateData" />
   </div>
   <!-- 新增报告弹窗 -->
   <a-drawer
@@ -31,7 +31,10 @@
         <a-input v-model:value="formState.genericStandard" placeholder="请输入适用标准" />
       </a-form-item>
       <a-form-item label="报告周期" name="reportPeriod">
-        <a-select v-model:value="formState.reportPeriod" placeholder="请选择排放类型">
+        <a-select
+          v-model:value="formState.reportPeriod"
+          placeholder="请选择排放类型"
+          @change="selectChange">
           <a-select-option value="1">年度</a-select-option>
           <a-select-option value="2">月度</a-select-option>
         </a-select>
@@ -40,6 +43,7 @@
         <a-range-picker
           v-model:value="formState.reportScope"
           picker="month"
+          :disabledDate="disabledDate"
           valueFormat="YYYY-MM" />
       </a-form-item>
     </a-form>
@@ -71,6 +75,13 @@
   const formRef = ref();
   const labelCol = { span: 5 };
   const wrapperCol = { span: 19 };
+  const disabledDate = (current: moment.Moment | null) => {
+    if (formState.value.reportPeriod === '2') {
+      const year = current.year();
+      return year === Number(formState.value.reportYear) ? false : true;
+    }
+  };
+  const selectChange = (value) => {};
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     reportName: [{ required: true, message: '请输入报告名称', trigger: 'change' }],
@@ -107,6 +118,8 @@
   const data = ref([]);
   const mainRef = ref();
   const reportId = ref();
+  const startTime = ref();
+  const endTime = ref();
   const year = ref();
   const tableConfig = ref({
     title: '数据库',
@@ -178,6 +191,8 @@
             fillInPage.value = true;
             reportId.value = record.id;
             year.value = record.reportYear;
+            startTime.value = record.startTime;
+            endTime.value = record.endTime;
           },
         },
         {