修改测试问题

hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts

@@ -8,6 +8,8 @@ export enum carbonEmissionFactorLibrary {
   getCarbonFactorTree = '/carbon-smart/api/carbon/emission/type/getCarbonFactorTree',
   creat = '/carbon-smart/api/carbon/emission/type/creatOrUpdate',
   delTreeNode = '/carbon-smart/api/carbon/emission/type/del',
+  move = '/carbon-smart/api/carbon/emission/type/move',
+  excel = '/carbon-smart/api/carbon/emission/factor/excel',
   // 单位管理
   dictionaryUnitManagement = '/carbon-smart/client/dict/dictionaryUnitManagement',
   findOutermost = '/carbon-smart/client/dict/findOutermost',
@@ -15,7 +17,7 @@ export enum carbonEmissionFactorLibrary {
   updateDictionary = '/carbon-smart/client/dict/updateDictionary',
   delDictionary = '/carbon-smart/client/dict/delDictionary',
 }
-// 碳排管理-碳排统计接口
+// 碳排管理-能耗统计接口
 export enum energyConsumption {
   getDicList = '/carbon-smart/client/dict/list',
   pageList = '/carbon-smart/api/carbon/stats/pageList',
@@ -23,6 +25,7 @@ export enum energyConsumption {
   creat = '/carbon-smart/api/carbon/stats/creat',
   update = '/carbon-smart/api/carbon/stats/update',
   del = '/carbon-smart/api/carbon/stats/del',
+  voucherDownloadList = '/carbon-smart/api/carbon/stats/voucherDownloadList',
 }
 // 碳排管理-碳排速算接口
 export enum quickCalculation {
@@ -55,6 +58,7 @@ export enum carbonInventoryCheck {
   findUnitById = '/carbon-smart/api/carbon/inventory/findById',
   getDetailsList = '/carbon-smart/api/carbon/inventory/details/getDetailsList',
   updateTable = '/carbon-smart/api/carbon/inventory/details/update',
+  voucherDownloadList = '/carbon-smart/api/carbon/inventory/details/voucherDownloadList',
   // 排放统计接口
   emissionStatistic = '/carbon-smart/api/carbon/inventory/emissionStatistic',
   // 碳排流向
@@ -75,6 +79,7 @@ export enum uploadPic {
   uploadfiles = '/carbon-smart/api/common/file/uploadfiles',
   select = '/carbon-smart/api/common/file/select',
   uploadfile = '/carbon-smart/api/common/file/uploadfile',
+  download = '/carbon-smart/api/common/file/download',
 }
 // 碳规划
 export enum carbonPlanning {
@@ -90,4 +95,6 @@ export enum carbonPlanning {
   detailedStatisticalDataChart = '/carbon-smart/api/carbon/planning/detailedStatisticalDataChart',
   batchOrUpdate = '/carbon-smart/api/carbon/planning/batchOrUpdate',
   addNodes = '/carbon-smart/api/carbon/planning/addNodes',
+  benchmarkSetting = '/carbon-smart/api/carbon/planning/benchmarkSetting',
+  benchmarkSubmit = '/carbon-smart/api/carbon/planning/benchmarkSubmit',
 }

hx-ai-intelligent/src/router/carbonEmissionManage.ts

@@ -40,6 +40,9 @@ const equipment = {
           meta: {
             title: '碳排因子库',
             keepAlive: false,
+            operates: [
+              { title: '碳排因子库导入', code: 'carbonEmissionFactorLibraryImport' },
+            ],
             // backApi: [],
           },
         },

hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue

@@ -290,7 +290,7 @@
     getDictList();
     visible.value = true;
     formState.value.id = record.id;
-    fetch(uploadPic.select, { bizId: record.id, bizTpye: 1 }).then((res) => {
+    fetch(uploadPic.select, { bizId: record.id, bizType: 1 }).then((res) => {
       fileList.value = res.data.map((item) => ({
         uid: item.id.toString(), // 使用文件的id作为唯一标识
         name: item.fileName, // 文件名
@@ -424,9 +424,6 @@
     });
     fileList.value = newFileList;
   };
-  const uploadQuery = ref({
-    bizTpye: 1,
-  });
   const onSubmit = () => {
     formRef.value
       .validate()
@@ -445,7 +442,7 @@
             fileList.value.forEach((file) => {
               formData.value.append('files', file.originFileObj);
             });
-            formData.value.append('bizTpye', 1);
+            formData.value.append('bizType', 1);
             formData.value.append('bizId', res.data.id);
             fetch(uploadPic.uploadfiles, formData.value)
               .then((res) => {

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

@@ -62,9 +62,17 @@
                   <a-menu>
                     <a-menu-item @click="editTreeNodeData(data)">编辑</a-menu-item>
                     <a-menu-item @click="addTreeNodeData">新增子节点</a-menu-item>
-                    <a-menu-item>上移</a-menu-item>
+                    <a-menu-item
-                    <a-menu-item>下移</a-menu-item>
+                      v-if="!data.isFirst && data.emissionName !== '未分类'"
-                    <a-menu-item @click="deleteTreeNode">删除</a-menu-item>
+                      @click="moveNode(data, 'up')"
+                      >上移</a-menu-item
+                    >
+                    <a-menu-item
+                      v-if="!data.isEnd && data.emissionName !== '未分类'"
+                      @click="moveNode(data, 'down')"
+                      >下移</a-menu-item
+                    >
+                    <a-menu-item @click="deleteTreeNode(data)">删除</a-menu-item>
                   </a-menu>
                 </template>
               </a-dropdown>
@@ -228,6 +236,7 @@
     TreeProps,
   } from 'ant-design-vue/es/tree';
   import { log } from 'node:console';
+  import { or } from '@vueuse/core';
 
   defineOptions({ name: 'OrderListIndex' });
   const orgId = ref('');
@@ -253,7 +262,7 @@
   const disabled = ref(false);
   const treeNodeAdd = ref<boolean>(false);
   const operationTree = ref<string>('新增');
-  const showOperation = ref(false);
+  // const showOperation = ref(false);
 
   const opMap: any = ref({
     type: 'add',
@@ -442,8 +451,15 @@
     editTreeNode.value.type = 'update';
     addTreeNode.value = data.emissionName;
   };
+  const moveNode = (data, type: opType) => {
+    const flag = type === 'up';
+    http.post(carbonEmissionFactorLibrary.move, { ...data, isUp: flag }).then(() => {
+      getOrgTree();
+      NsMessage.success('操作成功');
+    });
+  };
   // 删除树节点
-  const deleteTreeNode = () => {
+  const deleteTreeNode = (data) => {
     Modal.confirm({
       title: '警告',
       icon: createVNode(ExclamationCircleOutlined),
@@ -452,7 +468,9 @@
       okType: 'primary',
       cancelText: '取消',
       onOk() {
-        http.post(carbonEmissionFactorLibrary.delTreeNode, editTreeNode.value).then(() => {
+        http
+          .post(carbonEmissionFactorLibrary.delTreeNode, { orgId: orgId.value, id: data.id })
+          .then(() => {
             getOrgTree();
             NsMessage.success('操作成功');
           });
@@ -511,7 +529,7 @@
   const editTreeNode = ref({});
   const onSelect = (selectedKeys: string[], info: any) => {
     if (info.selected) {
-      showOperation.value = true;
+      // showOperation.value = true;
       editTreeNode.value = {
         id: info.selectedNodes[0].id,
         level: info.selectedNodes[0].level,
@@ -519,6 +537,8 @@
         sortNumber: info.selectedNodes[0].sortNumber,
         parentEmissionId: info.selectedNodes[0].parentEmissionId,
       };
+    } else {
+      editTreeNode.value = {};
     }
   };
 
@@ -573,6 +593,15 @@
       opMap.value.fuc && opMap.value.fuc({ ...formData.value });
     });
   };
+  const doWnload = (url: any) => {
+    const a = document.createElement('a');
+    document.body.appendChild(a);
+    a.href = encodeURI(url);
+    //设置下载的文件名
+    // a.download = fileName.value;
+    //触发a标签的点击事件，进行下载
+    a.click();
+  };
   const tableConfig = ref({
     title: '数据库',
     api: carbonEmissionFactorLibrary.getTableList,
@@ -609,13 +638,26 @@
       {
         label: '导入',
         type: 'primary',
-        name: 'userImport',
+        name: 'carbonEmissionFactorLibraryImport',
-        handle: () => {},
+        extra: {
+          api: carbonEmissionFactorLibrary.excel, // 导入接口名
+          title: '设备信息', // 弹窗title
+          templateName: 'whiteListUser', // 所使用的文件名称
+          indexName: '设备id', // 匹配类型字段
+          message: [
+            { label: '1、若必填项未填写，则不能进行导入操作' },
+            { label: `2、当重复时，则更新数据。` },
+            { label: '3、数据将从模版的第五行进行导入。' },
+            { label: '4、文件导入勿超过5MB。' },
+          ],
+        },
       },
       {
         label: '导出',
         type: 'primary',
-        name: 'userExports',
+        handle: () => {
+          doWnload('/hx-ai-intelligent/asset/file/whiteListUser.xlsx');
+        },
       },
       {
         label: '批量删除',
@@ -687,6 +729,7 @@
       {
         title: '参考文献',
         dataIndex: 'bibliography',
+        ellipsis: true,
       },
       {
         title: '引用数量',
@@ -917,7 +960,7 @@
     } else {
       canSelect.value = false;
     }
-    fetch(carbonEmissionFactorLibrary.findOutermost).then((res) => {
+    fetch(carbonEmissionFactorLibrary.findOutermost, { grp: 'MEASUREMENT_UNIT' }).then((res) => {
       groupData.value = res.data;
     });
     addUnitTitle.value = '新增单位';

hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue

@@ -27,7 +27,11 @@
         </div>
       </template>
     </a-table> -->
-    <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1500,y:350 }">
+    <ns-view-list-table
+      v-bind="tableConfig"
+      :model="data"
+      ref="mainRef"
+      :scroll="{ x: 1500, y: 350 }">
       <!-- <template #bodyCell="{ record, column }">
         <template v-if="column.dataIndex === 'enableRules'">
           <a-switch
@@ -61,8 +65,7 @@
         :model="formState"
         :rules="rules"
         :label-col="labelCol"
-        :wrapper-col="wrapperCol"
+        :wrapper-col="wrapperCol">
-      >
         <a-form-item ref="name" label="能源种类" name="energyType">
           <a-input v-model:value="formState.energyType" placeholder="请输入能源种类" />
         </a-form-item>
@@ -73,8 +76,7 @@
           <a-tree-select
             v-model:value="formState.collectionNode"
             :tree-line="true"
-            :tree-data="treeData"
+            :tree-data="treeData">
-          >
           </a-tree-select>
         </a-form-item>
         <a-form-item label="计算碳排" name="isComputeCarbon">
@@ -91,51 +93,149 @@
           </a-select>
         </a-form-item>
         <a-row>
-          <a-col :span="24" style="display:flex;justify-content: space-around;">
+          <a-col :span="24" style="display: flex; justify-content: space-around">
-            <a-form-item label="1月" name="janFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.janFlag" :checked-value="1" :unCheckedValue="0" />
+              label="1月"
+              name="janFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.janFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
-            <a-form-item label="2月" name="febFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.febFlag" :checked-value="1" :unCheckedValue="0" />
+              label="2月"
+              name="febFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.febFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
-            <a-form-item label="3月" name="marFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.marFlag" :checked-value="1" :unCheckedValue="0" />
+              label="3月"
+              name="marFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.marFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
           </a-col>
-          <a-col :span="24" style="display:flex;justify-content: space-around;">
+          <a-col :span="24" style="display: flex; justify-content: space-around">
-            <a-form-item label="4月" name="aprFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.aprFlag" :checked-value="1" :unCheckedValue="0" />
+              label="4月"
+              name="aprFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.aprFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
-            <a-form-item label="5月" name="mayFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.mayFlag" :checked-value="1" :unCheckedValue="0" />
+              label="5月"
+              name="mayFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.mayFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
-            <a-form-item label="6月" name="junFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.junFlag" :checked-value="1" :unCheckedValue="0" />
+              label="6月"
+              name="junFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.junFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
           </a-col>
-          <a-col :span="24" style="display:flex;justify-content: space-around;">
+          <a-col :span="24" style="display: flex; justify-content: space-around">
-            <a-form-item label="7月" name="julFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.julFlag" :checked-value="1" :unCheckedValue="0" />
+              label="7月"
+              name="julFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.julFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
-            <a-form-item label="8月" name="augFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.augFlag" :checked-value="1" :unCheckedValue="0" />
+              label="8月"
+              name="augFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.augFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
-            <a-form-item label="9月" name="sepFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.sepFlag" :checked-value="1" :unCheckedValue="0" />
+              label="9月"
+              name="sepFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.sepFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
           </a-col>
-          <a-col :span="24" style="display:flex;justify-content: space-around;">
+          <a-col :span="24" style="display: flex; justify-content: space-around">
-            <a-form-item label="10月" name="octFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.octFlag" :checked-value="1" :unCheckedValue="0" />
+              label="10月"
+              name="octFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.octFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
-            <a-form-item label="11月" name="novFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.novFlag" :checked-value="1" :unCheckedValue="0" />
+              label="11月"
+              name="novFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.novFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
-            <a-form-item label="12月" name="decFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
+            <a-form-item
-              <a-switch v-model:checked="formState.decFlag" :checked-value="1" :unCheckedValue="0" />
+              label="12月"
+              name="decFlag"
+              :label-col="switchLabelCol"
+              :wrapper-col="switchWrapperCol">
+              <a-switch
+                v-model:checked="formState.decFlag"
+                :checked-value="1"
+                :unCheckedValue="0" />
             </a-form-item>
           </a-col>
         </a-row>
+        <a-form-item ref="name" label="上传凭证">
+          <a-upload
+            :file-list="fileList"
+            name="file"
+            accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf"
+            @remove="handleFileRemove"
+            :before-upload="beforeUpload"
+            @change="handleChange">
+            <a-button>
+              <upload-outlined></upload-outlined>
+              上传
+            </a-button>
+          </a-upload>
+        </a-form-item>
       </a-form>
       <template #footer>
         <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
@@ -143,7 +243,7 @@
       </template>
     </a-drawer>
     <!-- 上传凭证弹窗 -->
-    <a-modal :visible="openUpload" title="凭证上传" @ok="handleOk" @cancel="closeOpenUpload">
+    <!-- <a-modal :visible="openUpload" title="凭证上传" @ok="handleOk" @cancel="closeOpenUpload">
       <a-upload-dragger
         v-model:fileList="fileList"
         name="file"
@@ -161,19 +261,55 @@
           <p>3.每次上传自动覆盖</p>
         </p>
       </a-upload-dragger>
-    </a-modal>
+    </a-modal> -->
+    <!-- 凭证下载 -->
+    <a-drawer
+      :visible="downLoadVisible"
+      title="凭证列表"
+      :width="500"
+      @close="onCloseDownLoad"
+      :footer-style="{ textAlign: 'right' }">
+      <div></div>
+      <a-table
+        :columns="downLoadColumns"
+        :data-source="downLoadData"
+        bordered
+        :rowKey="(record, index) => index"
+        :rowSelection="{
+          selectedRowKeys: selectedRowKeysSet,
+          onChange: onSelectionChangeSet,
+        }"
+        :pagination="false">
+        <template #bodyCell="{ column, text, record }">
+          <template v-if="column.key === 'action'">
+            <span>
+              <a @click="downLoad(record)">下载</a>
+            </span>
+          </template>
+        </template>
+      </a-table>
+      <template #footer>
+        <a-button style="margin-right: 8px" @click="onCloseDownLoad">取消</a-button>
+        <a-button type="primary" @click="onSubmitDownLoad">确定</a-button>
+      </template>
+    </a-drawer>
   </div>
 </template>
 <script lang="ts" setup>
   import { ref, toRaw, defineExpose } from 'vue';
   import type { Rule } from 'ant-design-vue/es/form';
   import { Pagination, message, Modal } from 'ant-design-vue';
-  import type { TreeSelectProps,UploadChangeParam } from 'ant-design-vue';
+  import { UploadOutlined } from '@ant-design/icons-vue';
+  import type { TreeSelectProps, UploadChangeParam, UploadProps } from 'ant-design-vue';
   import { NsMessage } from '/nerv-lib/component';
   import dayjs, { Dayjs } from 'dayjs';
   import { http } from '/nerv-lib/util/http';
   import { tableColumns } from '../config';
-  import { energyConsumption,carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
+  import {
+    energyConsumption,
+    carbonEmissionFactorLibrary,
+    uploadPic,
+  } from '/@/api/carbonEmissionFactorLibrary';
   import { group } from '/@/api/deviceManage';
   defineOptions({
     energyType: 'EnergyConsumption', // 与页面路由name一致缓存才可生效
@@ -188,13 +324,13 @@
     return http.post(api, params);
   };
   const selectYear = ref<Dayjs>(dayjs(new Date().getFullYear().toString()));
-  const total = ref<number>()
+  const total = ref<number>();
   const queryParams = ref({
     pageNum: 1,
     pageSize: 10,
     orgId: orgId.value,
-    year: selectYear.value.format('YYYY')
+    year: selectYear.value.format('YYYY'),
-  })
+  });
   const isRequired = ref(false);
   const visible = ref(false);
   const openUpload = ref<boolean>(false);
@@ -225,26 +361,26 @@
   const switchWrapperCol = { span: 14 };
   const formState = ref({
     orgId: orgId.value,
-  })
+  });
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
     isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }],
-    unit: [{ required: true, message: '请选择计量单位', trigger: 'change' }]
+    unit: [{ required: true, message: '请选择计量单位', trigger: 'change' }],
   };
   // 排放类型的变量
-  const emissionTypeDic = ref()
+  const emissionTypeDic = ref();
   // 计量单位的变量
-  const measurementUnit = ref([])
+  const measurementUnit = ref([]);
   // 定义自动采集节点数的变量
   const treeData = ref<TreeSelectProps['treeData']>([]);
   // 年份选择改变触发
   const changeYearData = () => {
-    queryParams.value.year = selectYear.value
+    queryParams.value.year = selectYear.value;
-    getTableList()
+    getTableList();
-  }
+  };
   const mainRef = ref();
-  const year = selectYear.value.format('YYYY')
+  const year = selectYear.value.format('YYYY');
   const tableConfig = ref({
     title: '能耗统计',
     api: energyConsumption.pageList,
@@ -255,8 +391,8 @@
         name: 'userAdd',
         type: 'primary',
         handle: () => {
-          getDictList()
+          getDictList();
-          visible.value = true
+          visible.value = true;
         },
       },
       {
@@ -273,20 +409,24 @@
       {
         label: '模板下载',
         type: 'primary',
-        name: 'userExports',
       },
+      // {
+      //   label: '上传凭证',
+      //   type: 'primary',
+      //   handle: () => {
+      //     openUpload.value = true;
+      //   },
+      // },
       {
-        label: '上传凭证',
+        label: '凭证下载',
         type: 'primary',
         handle: () => {
-          openUpload.value = true;
+          fetch(energyConsumption.voucherDownloadList, { bizType: 3 }).then((res) => {
+            downLoadData.value = res.data;
+          });
+          downLoadVisible.value = true;
         },
       },
-      {
-        label: '凭证下载',
-        type: 'primary',
-        name: 'userExports',
-      },
     ],
     columns: [
       {
@@ -370,25 +510,33 @@
           label: '编辑',
           name: 'userEdit',
           handle: (record: any) => {
-            getDictList()
+            getDictList();
-            visible.value = true
+            visible.value = true;
             fetch(energyConsumption.findById, { id: record.id }).then((res) => {
               if (res.data.emissionType) {
-                res.data.emissionType = Number(res.data.emissionType)
+                res.data.emissionType = Number(res.data.emissionType);
               }
               if (res.data.unit) {
                 let selectDevice = ref([Number(res.data.unit)]);
                 findParentIds(measurementUnit.value, res.data.unit, selectDevice.value);
-                res.data.unit = selectDevice
+                res.data.unit = selectDevice;
               }
-              formState.value = res.data
+              formState.value = res.data;
-              emissionType.value = res.data.emissionType
+              emissionType.value = res.data.emissionType;
               if (formState.value.isComputeCarbon === 0) {
-                isRequired.value = true
+                isRequired.value = true;
               } else {
-                isRequired.value = false
+                isRequired.value = false;
               }
             });
+            fetch(uploadPic.select, { bizId: record.id, bizType: 3 }).then((res) => {
+              fileList.value = res.data.map((item) => ({
+                uid: item.id.toString(), // 使用文件的id作为唯一标识
+                name: item.fileName, // 文件名
+                status: 'done', // 设置默认状态为已完成
+                url: item.filePath, // 文件的URL，这里假设用示例的URL格式
+              }));
+            });
           },
         },
         {
@@ -438,7 +586,7 @@
   // 获取表格数据
   const getTableList = () => {
     fetch(energyConsumption.pageList, queryParams.value).then((res) => {
-      data.value = res.data.records
+      data.value = res.data.records;
     });
   };
   // 分页器
@@ -448,16 +596,16 @@
     mainRef.value?.nsTableRef.reload();
   };
   // 计算碳排切换
-  const emissionType = ref()
+  const emissionType = ref();
   const changeRadio = (e) => {
     if (e.target.value === 0) {
-      isRequired.value = true
+      isRequired.value = true;
       if (emissionType.value) {
-      formState.value.emissionType = emissionType.value
+        formState.value.emissionType = emissionType.value;
       }
     } else {
-      isRequired.value = false
+      isRequired.value = false;
-      formState.value.emissionType = ''
+      formState.value.emissionType = '';
     }
   };
   // 点击确定提交
@@ -466,36 +614,78 @@
       .validate()
       .then(() => {
         console.log('values', formState, toRaw(formState));
-        formState.value.year = selectYear.value.format('YYYY')
+        formState.value.year = selectYear.value.format('YYYY');
         if (formState.value.unit) {
-          formState.value.unit = formState.value.unit.join(',').split(',')[1]
+          formState.value.unit = formState.value.unit.join(',').split(',')[1];
         }
         if (formState.value.id) {
           fetch(energyConsumption.update, formState.value).then((res) => {
-            visible.value = false
+            if (fileList.value.length !== 0) {
+              const formData = ref(new FormData());
+              fileList.value.forEach((file) => {
+                formData.value.append('files', file.originFileObj);
+              });
+              formData.value.append('bizType', 3);
+              formData.value.append('bizId', formState.value.id);
+              fetch(uploadPic.uploadfiles, formData.value)
+                .then((res) => {
+                  message.success('操作成功！');
+                  visible.value = false;
                   formState.value = {
                     orgId: orgId.value,
-            }
+                  };
+                  mainRef.value?.nsTableRef.reload();
+                })
+                .catch((error) => {
+                  console.log('error', error);
+                });
+            } else {
+              visible.value = false;
+              formState.value = {
+                orgId: orgId.value,
+              };
               message.success('操作成功！');
               mainRef.value?.nsTableRef.reload();
+            }
           });
         } else {
           fetch(energyConsumption.creat, formState.value).then((res) => {
             if (res.data === '新增数据已存在') {
-              visible.value = false
+              visible.value = false;
               NsMessage.warning(res.data);
             } else {
-              visible.value = false
+              if (fileList.value.length !== 0) {
+                const formData = ref(new FormData());
+                fileList.value.forEach((file) => {
+                  formData.value.append('files', file.originFileObj);
+                });
+                formData.value.append('bizType', 3);
+                formData.value.append('bizId', res.data);
+                fetch(uploadPic.uploadfiles, formData.value)
+                  .then((res) => {
+                    message.success('操作成功！');
+                    visible.value = false;
                     formState.value = {
                       orgId: orgId.value,
-              }
+                    };
+                    mainRef.value?.nsTableRef.reload();
+                  })
+                  .catch((error) => {
+                    console.log('error', error);
+                  });
+              } else {
+                visible.value = false;
+                formState.value = {
+                  orgId: orgId.value,
+                };
                 message.success('操作成功！');
                 mainRef.value?.nsTableRef.reload();
               }
+            }
           });
         }
       })
-      .catch(error => {
+      .catch((error) => {
         console.log('error', error);
       });
   };
@@ -503,47 +693,55 @@
   const getDictList = () => {
     // 获取排放类型的数据
     fetch(energyConsumption.getDicList, { grp: 'EMISSION_TYPE' }).then((res) => {
-      emissionTypeDic.value = res.data
+      emissionTypeDic.value = res.data;
     });
     // 获取计量单位的数据
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'MEASUREMENT_UNIT'}).then((res) => {
+    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'MEASUREMENT_UNIT' }).then(
-      measurementUnit.value = res.data
+      (res) => {
-      measurementUnit.value = measurementUnit.value.map(item => ({
+        measurementUnit.value = res.data;
+        measurementUnit.value = measurementUnit.value.map((item) => ({
           value: item.id,
           label: item.cnValue,
-        children: item.children ? item.children.map(child => ({
+          children: item.children
+            ? item.children.map((child) => ({
                 value: child.id,
-            label: child.cnValue
+                label: child.cnValue,
-        })) : []
+              }))
+            : [],
         }));
-    });
+      },
+    );
     // 获取自动采集节点的数据
-    fetch(group.queryDeviceGroupTree, { energyType: 'ELECTRICITY_USAGE',orgId: orgId.value }).then((res) => {
+    fetch(group.queryDeviceGroupTree, { energyType: 'ELECTRICITY_USAGE', orgId: orgId.value }).then(
-      treeData.value = res.data
+      (res) => {
-      treeData.value = treeData.value.map(item => ({
+        treeData.value = res.data;
+        treeData.value = treeData.value.map((item) => ({
           value: item.id,
           label: item.pointName,
-        children: item.children ? item.children.map(child => ({
+          children: item.children
+            ? item.children.map((child) => ({
                 value: child.id,
-            label: child.pointName
+                label: child.pointName,
-        })) : []
+              }))
+            : [],
         }));
-    });
+      },
-  }
+    );
+  };
   // 点击新增按钮
   const addNewData = () => {
-    getDictList()
+    getDictList();
-    visible.value = true
+    visible.value = true;
-  }
+  };
   // 点击编辑按钮
   const editData = (record) => {
-    getDictList()
+    getDictList();
-    visible.value = true
+    visible.value = true;
     fetch(energyConsumption.findById, { id: record.id }).then((res) => {
       if (res.data.unitName) {
-        res.data.unitName = res.data.unitName.split(',')
+        res.data.unitName = res.data.unitName.split(',');
       }
-      formState.value = res.data
+      formState.value = res.data;
     });
   };
   // 点击删除
@@ -564,13 +762,13 @@
         console.log('Cancel');
       },
     });
-  }
+  };
   // 关闭新增抽屉
   const onClose = () => {
     visible.value = false;
     formState.value = {
       orgId: orgId.value,
-    }
+    };
     formRef.value.resetFields();
   };
   // 点击上传凭证按钮
@@ -583,25 +781,73 @@
     openUpload.value = false;
   };
   // 上传凭证相关方法及变量
-  const fileList = ref([]);
+  const fileList = ref<UploadProps['fileList']>([]);
+  const beforeUpload: UploadProps['beforeUpload'] = (file) => {
+    return false;
+  };
   const handleChange = (info: UploadChangeParam) => {
-    const status = info.file.status;
+    fileList.value = [...info.fileList];
-    if (status !== 'uploading') {
+    if (info.file.status !== 'uploading') {
       console.log(info.file, info.fileList);
     }
-    if (status === 'done') {
+    if (info.file.status === 'done') {
       message.success(`${info.file.name} 文件上传成功`);
-    } else if (status === 'error') {
+    } else if (info.file.status === 'error') {
       message.error(`${info.file.name} 文件上传失败`);
     }
   };
-  function handleDrop(e: DragEvent) {
+  const handleFileRemove = (file) => {
-    console.log(e);
+    const newFileList = [];
+    fileList.value.forEach((item) => {
+      if (item.uid !== file.uid) {
+        newFileList.push(item);
       }
+    });
+    fileList.value = newFileList;
+  };
   // 关闭上传凭证弹窗
   const closeOpenUpload = () => {
     openUpload.value = false;
   };
+  // 凭证下载
+  const downLoadVisible = ref(false);
+  const downLoadColumns = [
+    {
+      title: '序号',
+      customRender: (text: any) => {
+        return text.index + 1;
+      },
+    },
+    {
+      title: '能源类型',
+      dataIndex: 'bizName',
+    },
+    {
+      title: '文件名',
+      dataIndex: 'fileName',
+      ellipsis: true,
+    },
+    {
+      title: '操作',
+      key: 'action',
+    },
+  ];
+  const downLoadData = ref([]);
+  const selectedRowKeysSet = ref([]);
+  const onSelectionChangeSet = (selectedKeys, selectedRows) => {
+    selectedRowKeysSet.value = selectedKeys;
+  };
+  const downLoad = (record) => {
+    const deleteId = ref(new FormData());
+    deleteId.value.append('id', record.id);
+    fetch(uploadPic.download, deleteId.value).then((res) => {
+      console.log(res);
+    });
+  };
+  const onSubmitDownLoad = () => {};
+  const onCloseDownLoad = () => {
+    downLoadVisible.value = false;
+  };
 </script>
 <style scoped lang="less">
   :deep(.ant-table-title) {

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

@@ -8,13 +8,14 @@ export const voucherColumns = [
   },
   {
     title: '日期',
-    dataIndex: 'age',
+    dataIndex: 'updateTime',
-    key: 'age',
+    key: 'updateTime',
+    ellipsis: true,
   },
   {
     title: '文件名称',
-    dataIndex: 'address',
+    dataIndex: 'fileName',
-    key: 'address 1',
+    key: 'fileName',
     ellipsis: true,
   },
 ];

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

@@ -275,6 +275,7 @@
               <a-tree-select
                 v-model:value="editFormState.collectionNode"
                 :tree-line="true"
+                @select="selectNode"
                 :tree-data="collectingNodes">
               </a-tree-select>
             </a-form-item>
@@ -320,8 +321,9 @@
       <a-upload
         v-model:file-list="fileList"
         name="file"
-        action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+        accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf"
-        :headers="headers"
+        @remove="handleFileRemove"
+        :before-upload="beforeUpload"
         @change="handleChange">
         <a-button>
           <upload-outlined></upload-outlined>
@@ -353,6 +355,7 @@
     energyConsumption,
     carbonEmissionFactorLibrary,
     carbonInventoryCheck,
+    uploadPic,
   } from '/@/api/carbonEmissionFactorLibrary';
   import { group } from '/@/api/deviceManage';
   import { debug, log } from 'node:console';
@@ -844,6 +847,9 @@
   // 点击凭证弹出框
   const openVoucher = ref(false);
   const downLoadVoucher = () => {
+    fetch(carbonInventoryCheck.voucherDownloadList, { bizType: 2 }).then((res) => {
+      voucherData.value = res.data
+    });
     openVoucher.value = true;
   };
   const selectedRowKeys = ref([]);
@@ -851,29 +857,7 @@
     selectedRowKeys.value = selectedKeys;
   };
 
-  const voucherData = [
+  const voucherData = ref([]);
-    {
-      key: '1',
-      name: 'John Brown',
-      age: 32,
-      address: 'New York No. 1 Lake Park, New York No. 1 Lake Park',
-      tags: ['nice', 'developer'],
-    },
-    {
-      key: '2',
-      name: 'Jim Green',
-      age: 42,
-      address: 'London No. 2 Lake Park, London No. 2 Lake Park',
-      tags: ['loser'],
-    },
-    {
-      key: '3',
-      name: 'Joe Black',
-      age: 32,
-      address: 'Sidney No. 1 Lake Park, Sidney No. 1 Lake Park',
-      tags: ['cool', 'teacher'],
-    },
-  ];
   const onCloseVoucher = () => {
     openVoucher.value = false;
   };
@@ -909,6 +893,14 @@
     editFormState.value.collectionNode = record.carbonSource;
     editFormState.value.factorId = record.factorId;
     selectedRowKeysEdit.value = [record.factorId];
+    fetch(uploadPic.select, { bizId: record.id, bizType: 2 }).then((res) => {
+      fileList.value = res.data.map((item) => ({
+        uid: item.id.toString(), // 使用文件的id作为唯一标识
+        name: item.fileName, // 文件名
+        status: 'done', // 设置默认状态为已完成
+        url: item.filePath, // 文件的URL，这里假设用示例的URL格式
+      }));
+    });
     editData.value = true;
   };
   const getNewTable = () => {
@@ -946,23 +938,35 @@
       },
     );
   };
+  const selectNode = (value) => {
+    debugger;
+  };
   // 上传附件
+  const fileList = ref<UploadProps['fileList']>([]);
+  const beforeUpload: UploadProps['beforeUpload'] = (file) => {
+    return false;
+  };
   const handleChange = (info: UploadChangeParam) => {
+    fileList.value = [...info.fileList];
     if (info.file.status !== 'uploading') {
       console.log(info.file, info.fileList);
     }
     if (info.file.status === 'done') {
-      message.success(`${info.file.name} file uploaded successfully`);
+      message.success(`${info.file.name} 文件上传成功`);
     } else if (info.file.status === 'error') {
-      message.error(`${info.file.name} file upload failed.`);
+      message.error(`${info.file.name} 文件上传失败`);
     }
   };
-
+  const handleFileRemove = (file) => {
-  const fileList = ref([]);
+    const newFileList = [];
-  const headers = {
+    fileList.value.forEach((item) => {
-    authorization: 'authorization-text',
+      if (item.uid !== file.uid) {
+        newFileList.push(item);
+      }
+    });
+    fileList.value = newFileList;
   };
-  // 编辑数据提交
+  // 数据提交;
   const submitEditData = () => {
     editFormRef.value
       .validate()
@@ -978,8 +982,26 @@
           editFormState.value.collectionNode = editFormState.value.collectionNode.value;
         }
         fetch(carbonInventoryCheck.updateTable, editFormState.value).then((res) => {
+          if (fileList.value.length !== 0) {
+            const formData = ref(new FormData());
+            fileList.value.forEach((file) => {
+              formData.value.append('files', file.originFileObj);
+            });
+            formData.value.append('bizType', 2);
+            formData.value.append('bizId', editFormState.value.id);
+            fetch(uploadPic.uploadfiles, formData.value)
+              .then((res) => {
+                message.success('操作成功！');
+                editData.value = false;
+                getPFYTableList(getTableId.value);
+              })
+              .catch((error) => {
+                console.log('error', error);
+              });
+          } else {
             editData.value = false;
             getPFYTableList(getTableId.value);
+          }
         });
       })
       .catch((error) => {

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

@@ -5,7 +5,12 @@
   </div>
   <!-- 填报页 -->
   <div v-if="fillInPage" style="height: 100%">
-    <fillIn :reportId="reportId" :year="year" :startTime="startTime" :endTime="endTime" @change-data="updateData" />
+    <fillIn
+      :reportId="reportId"
+      :year="year"
+      :startTime="startTime"
+      :endTime="endTime"
+      @change-data="updateData" />
   </div>
   <!-- 新增报告弹窗 -->
   <a-drawer
@@ -33,7 +38,7 @@
       <a-form-item label="报告周期" name="reportPeriod">
         <a-select
           v-model:value="formState.reportPeriod"
-          placeholder="请选择排放类型"
+          placeholder="请选择报告周期"
           @change="selectChange">
           <a-select-option value="1">年度</a-select-option>
           <a-select-option value="2">月度</a-select-option>
@@ -81,7 +86,9 @@
       return year === Number(formState.value.reportYear) ? false : true;
     }
   };
-  const selectChange = (value) => {};
+  const selectChange = (value) => {
+    formState.value.reportScope = '';
+  };
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     reportName: [{ required: true, message: '请输入报告名称', trigger: 'change' }],

hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue

@@ -74,9 +74,7 @@
           </div>
         </div>
         <div class="button" style="margin-bottom: 12px">
-          <a-button type="primary" :disabled="selectedRowKeys.length === 0" @click="editData">
+          <a-button type="primary" @click="editData"> 批量设置 </a-button>
-            批量设置
-          </a-button>
           <a-button type="primary" style="margin-left: 6px" @click="setBasicData">
             基准值设置
           </a-button>
@@ -137,20 +135,13 @@
         :columns="drawerColumns"
         :data-source="newTableData"
         bordered
-        rowKey="id"
+        :rowKey="(record, index) => index"
         :rowSelection="{
           selectedRowKeys: selectedRowKeysSet,
           onChange: onSelectionChangeSet,
           type: 'radio',
         }"
         :pagination="false">
-        <template #bodyCell="{ column, text, record }">
-          <template v-if="column.key === 'action'">
-            <span>
-              <a @click="setBasic(record)">设为基准值</a>
-            </span>
-          </template>
-        </template>
       </a-table>
       <template #footer>
         <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
@@ -206,9 +197,11 @@
     itemizeId: props.parentId,
     type: props.type,
   });
+  const ids = ref([]);
   const getTableData = () => {
     fetch(carbonPlanning.detailedStatisticalDataTable, queryParams.value).then((res) => {
       data.value = res.data;
+      ids.value = data.value.map((item) => item.id);
     });
   };
   getTableData();
@@ -261,7 +254,7 @@
   const wrapperCol = { span: 18 };
   const editData = (record) => {
     open.value = true;
-    if (record) {
+    if (record.isLastYear) {
       formState.value.ids = [record.id];
       if (record.lastYear === '是') {
         formState.value.isLastYear = 1;
@@ -285,6 +278,9 @@
       .validate()
       .then(() => {
         console.log('values', formState, toRaw(formState));
+        if (formState.value.ids[0] === undefined) {
+          formState.value.ids = ids.value;
+        }
         fetch(carbonPlanning.batchOrUpdate, formState.value).then((res) => {
           open.value = false;
           formState.value = {};
@@ -301,27 +297,38 @@
   };
   const visible = ref(false);
   const selectedRowKeysSet = ref([]);
+  const referenceQuery = ref();
   const onSelectionChangeSet = (selectedKeys, selectedRows) => {
     selectedRowKeysSet.value = selectedKeys;
+    referenceQuery.value = selectedRows[0].referenceValue;
   };
   const drawerColumns = [
     {
       title: '年份',
-      dataIndex: 'emissionSources',
+      dataIndex: 'year',
     },
     {
       title: '用电量',
-      dataIndex: 'emissionFactors',
+      dataIndex: 'referenceValue',
-    },
-    {
-      title: '操作',
-      key: 'action',
     },
   ];
   const newTableData = ref([]);
   const setBasicData = () => {
+    fetch(carbonPlanning.benchmarkSetting, { orgId: orgId.value }).then((res) => {
+      newTableData.value = res.data;
+    });
     visible.value = true;
   };
+  const onSubmit = () => {
+    fetch(carbonPlanning.benchmarkSubmit, {
+      ids: ids.value,
+      referenceValue: referenceQuery.value,
+    }).then((res) => {
+      visible.value = false;
+      selectedRowKeysSet.value = [];
+      getTableData();
+    });
+  };
   const onClose = () => {
     visible.value = false;
   };