修改测试问题

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

@@ -5,8 +5,8 @@
         <div class="title">{{ props.year }}年济阳站碳盘查报告</div>
         <div class="standard" style="display: flex; align-items: center">
           <img
-            width="11px"
-            height="11px"
+            width="11"
+            height="11"
             style="margin-right: 5px"
             src="../../../../../src/icon/carbonInventoryCheck.svg" />
           <span
@@ -19,7 +19,7 @@
               text-align: left;
               vertical-align: top;
             ">
-            适用标准：ISO 14064-1
+            适用标准：{{ props.standard }}
           </span>
           <a-button type="primary" @click="changeParentData" ghost style="margin-left: 6px">
             返回
@@ -328,7 +328,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item ref="name" label="消耗量" name="consumption">
-              <ns-input
+              <ns-input-number
                 v-model:value="editFormState.consumption"
                 :maxlength="20"
                 @keydown="handleKeyDown"
@@ -482,6 +482,9 @@
     endTime: {
       type: String,
     },
+    standard: {
+      type: String,
+    },
   });
   const activeKey = ref('1');
   const orgId = ref('');
@@ -641,16 +644,18 @@
         }
       } else {
         selectedKeysR.value = ['0-0-0'];
-        getTableId.value = res.data[0].children[0].id;
-        bizId.value = res.data[0].children[0].id;
-        if (res.data.length != 0) {
-          getPFYTableList(getTableId.value);
-          getTableHeardUnit(getTableId.value);
-        } else {
-          data.value = [];
-          columns.value[1].title = '消耗量';
-          columns.value[2].title = '碳排因子';
-          columns.value[3].title = '排放量';
+        if (res.data[0].children.length > 0) {
+          getTableId.value = res.data[0].children[0].id;
+          bizId.value = res.data[0].children[0].id;
+          if (res.data.length != 0) {
+            getPFYTableList(getTableId.value);
+            getTableHeardUnit(getTableId.value);
+          } else {
+            data.value = [];
+            columns.value[1].title = '消耗量';
+            columns.value[2].title = '碳排因子';
+            columns.value[3].title = '排放量';
+          }
         }
       }
     });
@@ -658,10 +663,12 @@
   // 排放源树中被选中的树节点
   const onSelectR = (selectedKey: string[], info: any) => {
     selectedKeysR.value = selectedKey;
-    getTableId.value = info.selectedNodes[0].id;
-    bizId.value = info.selectedNodes[0].id;
-    getPFYTableList(getTableId.value);
-    getTableHeardUnit(getTableId.value);
+    if (info.selectedNodes[0].emissionSource !== '全部') {
+      getTableId.value = info.selectedNodes[0].id;
+      bizId.value = info.selectedNodes[0].id;
+      getPFYTableList(getTableId.value);
+      getTableHeardUnit(getTableId.value);
+    }
   };
   // 获取表头单位
   const getTableHeardUnit = (id) => {
@@ -815,16 +822,17 @@
       .validate()
       .then(() => {
         console.log('values', formState, toRaw(formState));
-        if (formState.value.unitId) {
-          formState.value.unitId = formState.value.unitId.join(',').split(',')[1];
+        const addformState = JSON.parse(JSON.stringify(formState.value));
+        if (addformState.unitId) {
+          addformState.unitId = addformState.unitId.join(',').split(',')[1];
         }
-        if (formState.value.carbonEmissionUnits) {
-          formState.value.carbonEmissionUnits = formState.value.carbonEmissionUnits
+        if (addformState.carbonEmissionUnits) {
+          addformState.carbonEmissionUnits = addformState.carbonEmissionUnits
             .join(',')
             .split(',')[1];
         }
-        if (formState.value.id) {
-          fetch(carbonInventoryCheck.update, formState.value).then((res) => {
+        if (addformState.id) {
+          fetch(carbonInventoryCheck.update, addformState).then((res) => {
             addTreeNodeVisible.value = false;
             formState.value = {
               orgId: orgId.value,
@@ -837,20 +845,25 @@
             getEmissionSourceTree();
           });
         } else {
-          fetch(carbonInventoryCheck.create, formState.value).then((res) => {
+          if (addformState.categoryId) {
+            fetch(carbonInventoryCheck.create, addformState).then((res) => {
+              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;
+              getEmissionSourceTree();
+              getPFYTableList(res.data.id);
+            });
+          } else {
+            message.warning('请选择能源类别');
             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;
-            getEmissionSourceTree();
-            getPFYTableList(res.data.id);
-          });
+          }
         }
       })
       .catch((error) => {
@@ -1266,10 +1279,10 @@
     fetch(carbonInventoryCheck.carbonFlowDirection, queryFlowDirection.value).then((res) => {
       console.log(res);
       linksData.value = res.data[0];
-      if (linksData.value[0].value !== 0) {
-        showChart.value = true;
-      } else {
+      if (linksData.value[0].value === 0 || linksData.value[0].value === undefined) {
         showChart.value = false;
+      } else {
+        showChart.value = true;
       }
       datalist.value = res.data[1];
       drawEcharts();
@@ -1487,11 +1500,13 @@
             colorStops: [
               {
                 offset: 1,
-                color: Color[d], // 0% 处的颜色
+                // color: Color[d], // 0% 处的颜色
+                color: Color[d % Color.length],
               },
               {
                 offset: 0,
-                color: Color1[d], // 100% 处的颜色
+                // color: Color1[d], // 100% 处的颜色
+                color: Color1[d % Color1.length],
               },
             ],
             global: false, // 缺省为 false

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

@@ -10,6 +10,7 @@
       :year="year"
       :startTime="startTime"
       :endTime="endTime"
+      :standard="standard"
       @change-data="updateData" />
   </div>
   <!-- 新增报告弹窗 -->
@@ -23,46 +24,48 @@
     <div class="ns-form-title"
       ><div class="title">{{ text }}</div></div
     >
-    <a-form
-      ref="formRef"
-      :model="formState"
-      :rules="rules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol">
-      <a-form-item ref="name" label="报告名称" name="reportName">
-        <a-input
-          v-model:value="formState.reportName"
-          :maxlength="15"
-          @keydown="handleKeyDown"
-          placeholder="请输入报告名称" />
-      </a-form-item>
-      <a-form-item ref="name" label="报告年度" name="reportYear">
-        <a-date-picker v-model:value="formState.reportYear" picker="year" valueFormat="YYYY" />
-      </a-form-item>
-      <a-form-item ref="name" label="适用标准" name="genericStandard">
-        <a-input
-          v-model:value="formState.genericStandard"
-          :maxlength="20"
-          @keydown="handleKeyDown"
-          placeholder="请输入适用标准" />
-      </a-form-item>
-      <a-form-item label="报告周期" name="reportPeriod">
-        <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>
-      </a-form-item>
-      <a-form-item ref="name" label="报告范围" name="reportScope">
-        <a-range-picker
-          v-model:value="formState.reportScope"
-          picker="month"
-          :disabledDate="disabledDate"
-          valueFormat="YYYY-MM" />
-      </a-form-item>
-    </a-form>
+    <a-spin :spinning="spinning">
+      <a-form
+        ref="formRef"
+        :model="formState"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol">
+        <a-form-item ref="name" label="报告名称" name="reportName">
+          <a-input
+            v-model:value="formState.reportName"
+            :maxlength="15"
+            @keydown="handleKeyDown"
+            placeholder="请输入报告名称" />
+        </a-form-item>
+        <a-form-item ref="name" label="报告年度" name="reportYear">
+          <a-date-picker v-model:value="formState.reportYear" picker="year" valueFormat="YYYY" />
+        </a-form-item>
+        <a-form-item ref="name" label="适用标准" name="genericStandard">
+          <a-input
+            v-model:value="formState.genericStandard"
+            :maxlength="20"
+            @keydown="handleKeyDown"
+            placeholder="请输入适用标准" />
+        </a-form-item>
+        <a-form-item label="报告周期" name="reportPeriod">
+          <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>
+        </a-form-item>
+        <a-form-item ref="name" label="报告范围" name="reportScope">
+          <a-range-picker
+            v-model:value="formState.reportScope"
+            picker="month"
+            :disabledDate="disabledDate"
+            valueFormat="YYYY-MM" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
     <template #footer>
       <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
       <a-button type="primary" @click="onSubmit">确定</a-button>
@@ -121,8 +124,10 @@
       event.preventDefault();
     }
   };
+  const spinning = ref(false);
   // 点击确定提交
   const onSubmit = () => {
+    spinning.value = true;
     formRef.value
       .validate()
       .then(() => {
@@ -133,6 +138,7 @@
         fetch(carbonInventoryCheck.createOrUpdate, formState.value).then((res) => {
           visible.value = false;
           mainRef.value?.nsTableRef.reload();
+          spinning.value = false;
         });
       })
       .catch((error) => {
@@ -145,6 +151,7 @@
   const reportId = ref();
   const startTime = ref();
   const endTime = ref();
+  const standard = ref();
   const year = ref();
   const tableConfig = ref({
     title: '数据库',
@@ -220,6 +227,7 @@
             year.value = record.reportYear;
             startTime.value = record.startTime;
             endTime.value = record.endTime;
+            standard.value = record.genericStandard;
           },
         },
         {