From b396c374268f70fbaab956801df4fc759df4af9c Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Tue, 23 Jul 2024 17:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carbonEmissionFactorLibrary/config.ts          | 15 ++++++------
 .../carbonEmissionFactorLibrary/index.vue          | 28 +++++++++++++++-------
 .../energyConsumption/index.vue                    |  9 +++++--
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
index 6c3642a..aa2df7e 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
@@ -52,27 +52,27 @@ export const formConfig = (disabled) => {
               options: [
                 {
                   label: 'CO2',
-                  value: 'CO2',
+                  value: 1,
                 },
                 {
                   label: 'CO2e',
-                  value: 'CO2e',
+                  value: 2,
                 },
                 {
                   label: 'SF6',
-                  value:'SF6',
+                  value: 3,
                 },
                 {
                   label: 'CH4',
-                  value: 'CH4',
+                  value: 4,
                 },
                 {
                   label: 'PFCs',
-                  value: 'PFCs',
+                  value: 5,
                 },
                 {
                   label: 'HFCs',
-                  value: 'HFCs',
+                  value: 6,
                 },
               ],
             },
@@ -195,7 +195,8 @@ export const formConfig = (disabled) => {
             component: 'NsTextarea',
             componentProps: {
               placeholder: '请输入参考文献',
-              maxLength: 20,
+              maxLength: 300,
+              showCount:true
             },
           },
         ],
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index d52c081..bd5c776 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -50,7 +50,7 @@
                 <ns-icon name="actionMore" size="14" class="actionMore" />
                 <template #overlay>
                   <a-menu>
-                    <a-menu-item @click="editTreeNodeData">编辑</a-menu-item>
+                    <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>
@@ -67,7 +67,13 @@
       </div>
     </div>
     <div class="right">
-      <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 2000}"/>
+      <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 2000}">
+        <template #bodyCell="{ record, column }">
+          <template v-if="column.dataIndex === 'emissionGas'">
+            {{ record.emissionGas.label }}
+          </template>
+        </template>
+      </ns-view-list-table>
     </div>
     <!-- 新增树节点 -->
     <ns-modal :visible="treeNodeAdd" :title="operationTree" @ok="handleOk" @cancel="handleCancel">
@@ -406,10 +412,11 @@
     editTreeNode.value.type = 'create'
   };
   // 编辑树节点
-  const editTreeNodeData = () => {
+  const editTreeNodeData = (data) => {
     operationTree.value='编辑'
     treeNodeAdd.value = true;
     editTreeNode.value.type = 'update'
+    addTreeNode.value = data.emissionName
   }
   // 删除树节点
   const deleteTreeNode = () => {
@@ -681,6 +688,9 @@
             opMap.value.type = 'edit';
             opMap.value.fuc = (formData: any) => {
               formData.emissionType = formData.emissionType[formData.emissionType.length - 1]
+              if(formData.emissionGas.value){
+                formData.emissionGas = formData.emissionGas.value
+              }
               return http.post(carbonEmissionFactorLibrary.creatOrUpdate, formData).then(() => {
                 mainRef.value?.nsTableRef.reload();
                 visible.value = false;
@@ -738,27 +748,27 @@
             options: [
               {
                 label: 'CO2',
-                value: '1',
+                value: 1,
               },
               {
                 label: 'CO2e',
-                value: '2',
+                value: 2,
               },
               {
                 label: 'SF6',
-                value:'3',
+                value:3,
               },
               {
                 label: 'CH4',
-                value: '4',
+                value: 4,
               },
               {
                 label: 'PFCs',
-                value: '5',
+                value: 5,
               },
               {
                 label: 'HFCs',
-                value: '6',
+                value: 6,
               },
             ],
           },
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
index 15a471c..410741c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -27,7 +27,7 @@
         </div>
       </template>
     </a-table> -->
-    <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1500}" />
+    <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1500,y:350 }" />
       <!-- <a-pagination 
         :current="queryParams.pageNum"
         :total="total"
@@ -220,7 +220,8 @@
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
-    isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }]
+    isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }],
+    unit: [{ required: true, message: '请选择计量单位', trigger: 'change' }]
   };
   // 排放类型的变量
   const emissionTypeDic = ref()
@@ -363,6 +364,9 @@
             getDictList()
             visible.value = true
             fetch(energyConsumption.findById , {id : record.id }).then((res) => {
+              if(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);
@@ -438,6 +442,7 @@
       .validate()
       .then(() => {
         console.log('values', formState, toRaw(formState));
+        formState.value.year = selectYear.value.format('YYYY')
         if(formState.value.unit){
           formState.value.unit = formState.value.unit.join(',').split(',')[1]
         }