Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

2024-08-20 15:56:24 +08:00
parent 257716253c 43fcd2b161
commit d212ab2f02
31 changed files with 1312 additions and 812 deletions
--- a/hx-ai-intelligent/src/api/IlluminationInfo.ts
+++ b/hx-ai-intelligent/src/api/IlluminationInfo.ts
@@ -1,4 +1,4 @@
-const prefix = '/carbon-smart';
+const prefix = '/carbon-smart/api';
 // 照明系统及相关接口
 export enum lightingManage {
  // 主页 ========================================================
--- a/hx-ai-intelligent/src/api/airConditionControlSystem.ts
+++ b/hx-ai-intelligent/src/api/airConditionControlSystem.ts
@@ -1,4 +1,4 @@
-const prefix = '/carbon-smart';
+const prefix = '/carbon-smart/api';
 // 空调系统及相关接口
 export enum airConditionControl {
  // 主页 ======================================================
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -108,4 +108,5 @@ export enum carbonPlanning {
  benchmarkSetting = '/carbon-smart/api/carbon/planning/benchmarkSetting',
  monthBenchmarkSetting = '/carbon-smart/api/carbon/planning/monthBenchmarkSetting',
  benchmarkSubmit = '/carbon-smart/api/carbon/planning/benchmarkSubmit',
+  autoObtained = '/carbon-smart/api/carbon/planning/autoObtained',
 }
--- a/hx-ai-intelligent/src/api/planManage.ts
+++ b/hx-ai-intelligent/src/api/planManage.ts
@@ -1,4 +1,4 @@
-const prefix = '/carbon-smart';
+const prefix = '/carbon-smart/api';
 // 照明系统及相关接口
 export enum planManage {
  /**
@@ -10,4 +10,6 @@ export enum planManage {
  getTableData = prefix + '/deviceCtrlPlan/getActivatedPlanList',
  // 提交计划状态修改
  submitTransData = prefix + '/deviceCtrlPlan/activePlanByIdList',
+  // 用于确认当前是否有计划正在运行
+  getRunningPlan = prefix + '/deviceCtrlPlan/getRunningPlan',
 }
--- a/hx-ai-intelligent/src/api/ventilatingSystem.ts
+++ b/hx-ai-intelligent/src/api/ventilatingSystem.ts
@@ -1,5 +1,5 @@
 // 前缀
-const prefix = '/carbon-smart';
+const prefix = '/carbon-smart/api';
 // 通风系统相关接口
 export enum ventilating {
  // 排风扇相关 =============================================
--- a/hx-ai-intelligent/src/icon/carbonInventoryCheck.svg
+++ b/hx-ai-intelligent/src/icon/carbonInventoryCheck.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11.05419921875" height="11.55615234375" viewBox="0 0 11.05419921875 11.55615234375" fill="none">
+<path d="M10.9138 2.84916C10.8847 2.81354 10.8562 2.77791 10.8239 2.74831C10.7389 2.6699 10.6445 2.6025 10.5427 2.54769C9.03643 1.74524 7.53183 0.940587 6.02611 0.138129C5.89809 0.0686747 5.759 0.0219399 5.61502 8.98451e-08L5.4747 0C5.12499 0.0696122 4.82407 0.271323 4.51219 0.435761C3.14669 1.1531 1.7835 1.87517 0.422787 2.60189C0.210487 2.71542 0.0460472 2.89521 0.00767517 3.17037C0.00658035 3.18024 0.00274277 3.18901 0 3.19778L0 3.31453C0.0219307 3.44005 0.0586548 3.55899 0.137035 3.65875C0.16444 3.69274 0.190201 3.72836 0.221451 3.75632C0.30476 3.82922 0.389175 3.89938 0.486191 3.95145C2.00341 4.75994 3.51843 5.57171 5.0373 6.37746C5.16556 6.44653 5.29766 6.5134 5.44565 6.52765C5.59584 6.543 5.73671 6.51504 5.86935 6.44488L10.4747 3.99969C10.5262 3.97173 10.58 3.94816 10.6282 3.91583C10.7724 3.8221 10.9072 3.71412 10.9828 3.54529C11.0157 3.47349 11.03 3.39182 11.0541 3.31453L11.0541 3.19778C11.03 3.07061 10.9927 2.94893 10.9132 2.84917L10.9138 2.84916ZM10.3952 5.04387C10.2329 5.00984 10.0637 5.0339 9.91727 5.11184C9.62566 5.2686 9.33626 5.43249 9.04191 5.58542C7.88811 6.18507 6.73156 6.78143 5.57719 7.37999C5.54431 7.39643 5.5169 7.39917 5.48292 7.38163L1.23986 5.15789C1.01208 5.03459 0.748119 4.99558 0.494411 5.04771C0.231308 5.10197 0.0487823 5.33712 0.0120583 5.63585C0.00986099 5.6523 0.00383377 5.66874 0.000545502 5.68518L0.000545502 5.83647C0.0224686 5.95925 0.0591965 6.07545 0.133739 6.17521C0.204994 6.26894 0.287212 6.34677 0.386429 6.39939C1.94036 7.2331 3.49541 8.06789 5.05154 8.89722C5.17596 8.96299 5.30532 9.02877 5.45057 9.04137C5.59638 9.05453 5.7345 9.02822 5.86441 8.9608C7.46275 8.13313 9.06109 7.30655 10.6572 6.47504C10.871 6.36322 10.9932 6.16534 11.0415 5.91595C11.0464 5.89786 11.0497 5.87867 11.0541 5.86004L11.0541 5.71972C11.0393 5.66874 11.03 5.61448 11.0108 5.56624C10.8979 5.26532 10.6852 5.10033 10.3952 5.04442L10.3952 5.04387ZM10.3963 7.55319C10.2338 7.51913 10.0644 7.54318 9.91782 7.62116C9.62183 7.78012 9.32913 7.94456 9.03205 8.10023C7.88317 8.69659 6.73429 9.28967 5.58541 9.88602C5.5499 9.90681 5.50577 9.90618 5.47086 9.88438C4.06491 9.1455 2.65787 8.40882 1.25082 7.66994C1.04099 7.56197 0.804203 7.51759 0.569508 7.54223C0.295444 7.56415 0.0838623 7.78066 0.0241203 8.08104C0.0158997 8.11886 0.00767517 8.15558 0.000556946 8.19285L0.000556946 8.34414C0.0224762 8.46473 0.0581055 8.57983 0.12991 8.67849C0.202263 8.77661 0.287773 8.85554 0.390812 8.91035C1.94312 9.74351 3.49596 10.5767 5.0499 11.4043C5.18254 11.4756 5.32232 11.5414 5.47415 11.5562L5.58158 11.5562C5.70617 11.5342 5.82623 11.4916 5.93677 11.4301C6.08257 11.3506 6.23659 11.287 6.38404 11.2103C7.8026 10.4725 9.2206 9.73365 10.6375 8.99532C10.8622 8.87802 10.9922 8.68014 11.0426 8.41869L11.0541 8.36826L11.0541 8.22794C11.0393 8.17696 11.03 8.1227 11.0108 8.07446C10.8995 7.77299 10.6857 7.60856 10.3963 7.55374L10.3963 7.55319Z"   fill="#4388FB" >
+</path>
+</svg>
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
@@ -48,7 +48,6 @@
  </div>
  <div style="display: flex; margin-top: 20px; height: calc(84% - 20px)">
    <div class="detailTable">
-      <a-card>
      <div class="ns-form-title">
        <div class="title">交易明细</div>
        <div class="operation" style="display: flex">
@@ -103,9 +102,16 @@
        :show-size-changer="true"
        :show-quick-jumper="true"
        @change="onChange" />
-      </a-card>
    </div>
    <div class="total">
+      <div class="ns-form-title">
+        <div class="title">配额统计</div>
+        <div class="operation" style="display: flex; justify-content: space-around; width: 63%">
+          <a-button type="primary" @click="getTotalTable(1)">全国配额</a-button>
+          <a-button type="primary" @click="getTotalTable(2)">地方配额</a-button>
+          <a-button type="primary" @click="getTotalTable(3)">CCER配额</a-button>
+        </div>
+      </div>
      <a-table :columns="totalColumns" :data-source="totalData" bordered :pagination="false">
        <template #bodyCell="{ column, text }">
          <template v-if="column.dataIndex === 'name'">
@@ -123,6 +129,9 @@
    :footer-style="{ textAlign: 'right' }"
    destroyOnClose
    @close="onClose">
+    <div class="ns-form-title" style="display: flex">
+      <div class="title">{{ text }}</div>
+    </div>
    <a-form
      ref="formRef"
      :model="formState"
@@ -295,6 +304,7 @@
  };
  const editData = (record) => {
    getDictList();
+    text.value = '编辑';
    visible.value = true;
    formState.value.id = record.id;
    fetch(uploadPic.select, { bizId: record.id, bizType: 1 }).then((res) => {
@@ -376,6 +386,7 @@
  };
  // 新增相关数据
  const visible = ref(false);
+  const text = ref('新增');
  const formState = ref({
    orgId: orgId.value,
  });
@@ -404,6 +415,7 @@
  getDictList();
  // 点击新增
  const addDetail = () => {
+    text.value = '新增';
    visible.value = true;
    getDictList();
  };
@@ -447,7 +459,7 @@

        // 清理 URL 对象
        window.URL.revokeObjectURL(url);
-        selectedRowKeys.value = []
+        selectedRowKeys.value = [];
      })
      .catch((error) => {
        console.error('下载失败：', error);
@@ -545,7 +557,10 @@
    formRef.value.resetFields();
  };
  // 统计表格
-  const getTotalTable = () => {
+  const getTotalTable = (type) => {
+    if (type) {
+      queryParams.value.accountType = type;
+    }
    fetch(carbonAssets.quotaStatistics, queryParams.value).then((res) => {
      totalData.value = res.data;
    });
@@ -614,11 +629,13 @@
    height: 100%;
    background: white;
    border-radius: 12px;
+    padding: 16px;
  }
  .total {
    width: calc(35% - 20px);
    height: 100%;
    background: white;
    border-radius: 12px;
+    padding: 16px;
  }
 </style>
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -5,7 +5,7 @@
    <div class="left">
      <div class="top">
        <a-form style="width: 100%; margin: 0 auto">
-          <div class="ns-form-title"><div class="title">排放分类</div></div>
+          <div class="ns-form-title"><div class="title">能源分组</div></div>
          <div style="padding: 0 16px !important; width: 100%">
            <a-row>
              <a-col :span="24" style="margin-bottom: 16px">
@@ -23,7 +23,6 @@
          class="draggable-tree"
          style="padding: 0 16px !important"
          draggable
-          show-line
          checkable
          block-node
          :tree-data="gData"
@@ -80,9 +79,9 @@
            </div>
          </template>
        </a-tree>
-        <div class="addTreeNode">
+        <!-- <div class="addTreeNode">
          <a-button type="primary" style="width: 100%" @click="addTreeNodeData">新增</a-button>
-        </div>
+        </div> -->
      </div>
    </div>
    <div class="right">
@@ -96,7 +95,7 @@
    </div>
    <!-- 新增树节点 -->
    <ns-modal :visible="treeNodeAdd" :title="operationTree" @ok="handleOk" @cancel="handleCancel">
-      <ns-input v-model:value="addTreeNode" class="input" placeholder="请输入排放类型" />
+      <ns-input v-model:value="addTreeNode" :maxlength="10" class="input" placeholder="请输入排放类型" />
    </ns-modal>
    <!-- 新增数据库数据 -->
    <a-drawer
@@ -106,6 +105,9 @@
      :footer-style="{ textAlign: 'right' }"
      destroyOnClose
      @close="onClose">
+      <div class="ns-form-title-add" style="display: flex">
+        <div class="title">{{ text }}</div>
+      </div>
      <ns-form
        ref="formRef"
        :schemas="formSchema"
@@ -129,8 +131,8 @@
      @close="closeUnitManag">
      <div class="ns-form-title titleUnit">
        <div class="title">单位管理</div>
-        <a-button type="primary" @click="addGroup">新增分组</a-button>
-        <a-button type="primary" @click="addUnit">新增单位</a-button>
+        <a-button type="primary" @click="addGroup" ghost>新增分组</a-button>
+        <a-button type="primary" @click="addUnit" ghost>新增单位</a-button>
      </div>
      <!-- <div class="addButton">
      </div> -->
@@ -147,7 +149,7 @@
            ref="select"
            :value="unitTreeParams.id"
            allowClear
-            style="width: 96%"
+            style="width: 90%"
            placeholder="选择分组"
            @change="handleChange">
            <a-select-option v-for="(item, index) in groupData" :key="index" :value="item.id">
@@ -185,11 +187,12 @@
      </template>
    </a-drawer>
    <!-- 新增分组管理 -->
-    <ns-modal
-      :visible="addGroupManage"
-      :title="addGroupTitle"
-      @ok="unitOrGroupOk"
-      @cancel="groupCancel">
+    <ns-modal :visible="addGroupManage" @ok="unitOrGroupOk" @cancel="groupCancel">
+      <template #title>
+        <div style="display: flex; align-items: center">
+          <span class="titleStyleGroup">{{ addGroupTitle }}</span>
+        </div>
+      </template>
      <a-form ref="unitFormRef" :model="formState" :label-col="labelCol" :wrapper-col="wrapperCol">
        <a-form-item label="分组名称" name="cnValue" :required="true">
          <a-input v-model:value="formState.cnValue" placeholder="请输入分组名称" />
@@ -197,11 +200,12 @@
      </a-form>
    </ns-modal>
    <!-- 新增单位 -->
-    <ns-modal
-      :visible="addUnitManage"
-      :title="addUnitTitle"
-      @ok="unitOrGroupOk"
-      @cancel="unitCancel">
+    <ns-modal :visible="addUnitManage" @ok="unitOrGroupOk" @cancel="unitCancel">
+      <template #title>
+        <div style="display: flex; align-items: center">
+          <span class="titleStyle">{{ addUnitTitle }}</span>
+        </div>
+      </template>
      <a-form ref="unitFormRef" :model="formState" :label-col="labelCol" :wrapper-col="wrapperCol">
        <a-form-item label="单位名称" name="cnValue" :required="true">
          <a-input v-model:value="formState.cnValue" placeholder="请输入单位名称" />
@@ -265,6 +269,7 @@
  const disabled = ref(false);
  const treeNodeAdd = ref<boolean>(false);
  const operationTree = ref<string>('新增');
+  const text = ref('新增数据');
  // const showOperation = ref(false);

  const opMap: any = ref({
@@ -473,7 +478,11 @@
      cancelText: '取消',
      onOk() {
        http
-          .post(carbonEmissionFactorLibrary.delTreeNode, { orgId: orgId.value, id: data.id })
+          .post(carbonEmissionFactorLibrary.delTreeNode, {
+            orgId: orgId.value,
+            id: data.id,
+            emissionName: data.emissionName,
+          })
          .then(() => {
            getOrgTree();
            NsMessage.success('操作成功');
@@ -637,6 +646,7 @@
            });
          };
          show.value = false;
+          text.value = '新增数据';
          visible.value = true;
        },
      },
@@ -812,6 +822,7 @@
              });
            };
            show.value = true;
+            text.value = '编辑数据';
            visible.value = true;
          },
        },
@@ -1122,6 +1133,10 @@
    padding-bottom: 10px;
    border-bottom: 1px solid #e9e9e9;
  }
+  .ns-form-title-add {
+    font-weight: bold;
+    user-select: text;
+  }
  .titleUnit {
    font-weight: bold;
    user-select: text;
@@ -1176,6 +1191,7 @@
    margin-left: 10%;
    flex-direction: column;
    border-radius: 12px;
+    overflow: auto;
  }
  .actionMore {
    display: none;
@@ -1198,5 +1214,27 @@
    text-align: right;
    width: 27%;
  }
+  .titleStyleGroup::before {
+    content: '';
+    position: absolute;
+    left: 16px;
+    top: 13%;
+    transform: translateY(-50%);
+    height: 16px;
+    width: 3px;
+    border-radius: 1px;
+    background-color: #2778ff;
+  }
+  .titleStyle::before {
+    content: '';
+    position: absolute;
+    left: 16px;
+    top: 10.5%;
+    transform: translateY(-50%);
+    height: 16px;
+    width: 3px;
+    border-radius: 1px;
+    background-color: #2778ff;
+  }
 </style>
  
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -3,15 +3,15 @@
    <a-table
      :columns="column"
      :data-source="data"
-      :bordered="false"
+      :bordered="true"
      :pagination="false"
      :scroll="{ x: 2000, y: 480 }">
      <template #title>
-        <a-date-picker
-          v-model:value="selectYear"
-          picker="year"
-          @change="changeYearData"
-          valueFormat="YYYY" />
+        <a-date-picker v-model:value="selectYear" picker="year" valueFormat="YYYY" />
+        <span style="margin-left: 30px">
+          <a-button type="primary" @click="changeYearData">查询</a-button>
+          <a-button type="primary" ghost style="margin-left: 6px" @click="reset">重置</a-button>
+        </span>
      </template>
    </a-table>
    <a-pagination
@@ -57,11 +57,17 @@
    queryParams.value.year = selectYear.value;
    getTableList();
  };
+  const reset = () => {
+    selectYear.value = dayjs(new Date().getFullYear().toString());
+    queryParams.value.year = selectYear.value.format('YYYY');
+    getTableList();
+  };
  // 表头
  const column: TableColumnsType[] = [
    {
      title: '排放类型',
      dataIndex: 'cnValue',
+      width: 130,
      customCell: (record, rowIndex) => {
        if (rowIndex == undefined) {
          return {
@@ -84,66 +90,82 @@
    {
      title: '能源种类',
      dataIndex: 'energyType',
+      width: 80,
    },
    {
      title: '计量单位',
      dataIndex: 'unitName',
+      width: 80,
    },
    {
      title: '加权平均',
      dataIndex: 'averageFactorValue',
+      width: 80,
    },
    {
      title: '全年',
      dataIndex: 'carbonYearly',
+      width: 80,
    },
    {
      title: '1月',
      dataIndex: 'jan',
+      width: 80,
    },
    {
      title: '2月',
      dataIndex: 'feb',
+      width: 80,
    },
    {
      title: '3月',
      dataIndex: 'mar',
+      width: 80,
    },
    {
      title: '4月',
      dataIndex: 'apr',
+      width: 80,
    },
    {
      title: '5月',
      dataIndex: 'may',
+      width: 80,
    },
    {
      title: '6月',
      dataIndex: 'jun',
+      width: 80,
    },
    {
      title: '7月',
      dataIndex: 'jul',
+      width: 80,
    },
    {
      title: '8月',
      dataIndex: 'aug',
+      width: 80,
    },
    {
      title: '9月',
      dataIndex: 'sep',
+      width: 80,
    },
    {
      title: '10月',
      dataIndex: 'oct',
+      width: 80,
    },
    {
      title: '11月',
      dataIndex: 'nov',
+      width: 80,
    },
    {
      title: '12月',
      dataIndex: 'dec',
+      width: 80,
    },
  ];
  // 合并单元格
@@ -189,9 +211,12 @@
  :deep(.ant-table-container) {
    padding: 0px 16px;
  }
-  :deep(.ant-table-cell) {
-    border: 1px solid #f0f0f0;
-  }
+  // :deep(.ant-table-cell) {
+  //   border: 1px solid #f0f0f0;
+  // }
+  // :deep(.ant-table-cell::before) {
+  //   display: none;
+  // }
 </style>
 <style scoped>
  th.column-money,
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -54,150 +54,18 @@
          </a-radio-group>
        </a-form-item>
        <a-form-item label="排放类型" name="emissionType" :required="isRequired">
-          <a-select v-model:value="formState.emissionType" placeholder="请选择排放类型">
+          <a-select
+            v-model:value="formState.emissionType"
+            placeholder="请选择排放类型"
+            :disabled="!isRequired">
            <a-select-option v-for="(item, index) in emissionTypeDic" :key="index" :value="item.id">
              {{ item.cnValue }}
            </a-select-option>
          </a-select>
        </a-form-item>
      </a-form>
-      <!-- <a-row>
-          <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-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-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-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-form-item
-              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-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-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-form-item
-              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-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-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-form-item
-              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-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-switch
-                v-model:checked="formState.decFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-          </a-col>
-        </a-row> -->
      <div class="ns-form-title"><div class="title">能耗统计</div></div>
-      <a-table
-        :columns="addColumns"
-        :data-source="addData"
-        size="small"
-        :pagination="false"
-        :scroll="{ y: 200 }">
+      <a-table :columns="addColumns" :data-source="addData" size="small" :pagination="false">
        <template #bodyCell="{ column, text, record }">
          <template v-if="column.key === 'action'">
            <a-switch
@@ -267,11 +135,20 @@
    <!-- 凭证下载 -->
    <a-drawer
      :visible="downLoadVisible"
-      title="凭证列表"
      :width="500"
      @close="onCloseDownLoad"
      :footer-style="{ textAlign: 'right' }">
-      <div></div>
+      <div class="ns-form-title" style="display: flex">
+        <div class="title">凭证列表</div>
+        <a-button
+          type="primary"
+          ghost
+          style="margin-left: 16px"
+          @click="onSubmitDownLoad"
+          :disabled="selectedRowKeysSet.length === 0">
+          批量下载
+        </a-button>
+      </div>
      <a-table
        :columns="downLoadColumns"
        :data-source="downLoadData"
@@ -281,6 +158,7 @@
          selectedRowKeys: selectedRowKeysSet,
          onChange: onSelectionChangeSet,
        }"
+        style="margin-top: 15px"
        :pagination="false">
        <template #bodyCell="{ column, text, record }">
          <template v-if="column.key === 'action'">
@@ -485,23 +363,29 @@
        customRender: (text: any) => {
          return text.index + 1;
        },
+        width: 100,
      },
      {
        title: '能源种类',
        dataIndex: 'energyType',
+        width: 100,
+        ellipsis: true,
      },
      {
        title: '计量单位',
        className: 'unitName',
        dataIndex: 'unitName',
+        width: 100,
      },
      {
        title: '全年',
        dataIndex: 'yearly',
+        width: 100,
      },
      {
        title: '1月',
        dataIndex: 'jan',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -522,6 +406,7 @@
      {
        title: '2月',
        dataIndex: 'feb',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -542,6 +427,7 @@
      {
        title: '3月',
        dataIndex: 'mar',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -562,6 +448,7 @@
      {
        title: '4月',
        dataIndex: 'apr',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -582,6 +469,7 @@
      {
        title: '5月',
        dataIndex: 'may',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -602,6 +490,7 @@
      {
        title: '6月',
        dataIndex: 'jun',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -622,6 +511,7 @@
      {
        title: '7月',
        dataIndex: 'jul',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -642,6 +532,7 @@
      {
        title: '8月',
        dataIndex: 'aug',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -662,6 +553,7 @@
      {
        title: '9月',
        dataIndex: 'sep',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -682,6 +574,7 @@
      {
        title: '10月',
        dataIndex: 'oct',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -702,6 +595,7 @@
      {
        title: '11月',
        dataIndex: 'nov',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -722,6 +616,7 @@
      {
        title: '12月',
        dataIndex: 'dec',
+        width: 100,
        customRender: (value) => {
          let text;
          let color;
@@ -878,6 +773,12 @@
          ? item.children.map((child) => ({
              value: child.id,
              label: child.pointName,
+              children: child.children
+                ? child.children.map((childs) => ({
+                    value: childs.id,
+                    label: childs.pointName,
+                  }))
+                : [],
            }))
          : [],
      }));
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -82,7 +82,9 @@
        :footer-style="{ textAlign: 'right' }"
        destroyOnClose
        @close="onClose">
-        <div class="editTitle"><div class="title">编辑</div></div>
+        <div class="editTitle">
+          <div class="title">{{ text }}</div>
+        </div>
        <a-form
          ref="formRef"
          :model="formState"
@@ -162,6 +164,7 @@
    return http.post(api, params);
  };
  const mainRef = ref();
+  const text = ref('新增');
  // 数结构
  const x = 3;
  const y = 2;
@@ -290,6 +293,7 @@
        name: 'userAdd',
        type: 'primary',
        handle: () => {
+          text.value = '新增';
          visible.value = true;
          // getNewTable();
        },
@@ -345,6 +349,7 @@
            formState.value.emissionFactors = record.emissionFactors;
            formState.value.dateRange = [record.startTime, record.endTime];
            formState.value.factorId = record.factorId;
+            text.value = '编辑';
            visible.value = true;
            emissionSources.value = record.emissionSources;
            queryData.value.emissionSources = emissionSources.value;
@@ -493,6 +498,7 @@
  const onClose = () => {
    visible.value = false;
    selectedRowKeys.value = [];
+    newTableData.value = [];
    formState.value = {};
    selectData.value = '';
    formRef.value.resetFields();
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index
@@ -45,7 +45,7 @@
          </template>
        </a-tree>
      </div>
-      <div class="bottom">
+      <!-- <div class="bottom">
        <a-form style="width: 100%; margin: 0 auto">
          <div class="ns-form-title"><div class="title">报告相关</div></div>
          <div class="button" style="padding: 0 16px !important">
@@ -53,14 +53,18 @@
            <div :class="{ tplx: isClickedTplx }" @click="showTplx">碳排流向</div>
          </div>
        </a-form>
-      </div>
+      </div> -->
    </div>
    <div class="right">
-      <div style="display: flex">
-        <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; height: 100%" v-if="fillInPage">
+      <a-button
+        type="primary"
+        @click="changeParentData"
+        style="position: absolute; right: 25px; top: 10px; z-index: 99">
+        返回
+      </a-button>
+      <a-tabs v-model:activeKey="activeKey" @change="handleTabChange" style="height: 100%">
+        <a-tab-pane key="1" tab="排放源">
+          <div style="display: flex; height: 100%">
            <div class="mainLeft">
              <a-tree
                :expandedKeys="expandedKeysR"
@@ -82,7 +86,9 @@
                </template>
              </a-tree>
              <div class="addTreeNode">
-            <a-button type="primary" style="width: 100%" @click="addTreeNodeData">新增</a-button>
+                <a-button type="primary" style="width: 100%" @click="addTreeNodeData"
+                  >新增</a-button
+                >
              </div>
            </div>
            <div class="mainRight">
@@ -92,7 +98,7 @@
                :pagination="false"
                bordered
                size="middle"
-            :scroll="{ y: 480 }">
+                :scroll="{ y: 500 }">
                <template #title>
                  <a-button type="primary" @click="downLoadVoucher">凭证</a-button>
                </template>
@@ -112,21 +118,23 @@
              </a-table>
            </div>
          </div>
-      <div v-if="isClickedPftj">
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="排放统计">
          <a-table
            :columns="pftjColumn"
            :data-source="pftjData"
            bordered
            :pagination="false"
-          :scroll="{ x: 2000 }">
+            :scroll="{ x: 2000, y: 500 }">
            <template #bodyCell="{ column, text, record }">
              {{ text || '-' }}
            </template>
          </a-table>
-      </div>
-      <div v-if="isClickedTplx" style="width: 100%; height: 100%">
+        </a-tab-pane>
+        <a-tab-pane key="3" tab="碳排流向">
          <div ref="tplxChart" style="width: 100%; height: 68vh"></div>
-      </div>
+        </a-tab-pane>
+      </a-tabs>
    </div>
    <!-- 类别配置 -->
    <a-drawer
@@ -240,7 +248,7 @@
    </a-drawer>
    <!-- 点击编辑弹出框 -->
    <a-drawer
-      :width="700"
+      :width="500"
      :visible="editData"
      :body-style="{ paddingBottom: '80px' }"
      :footer-style="{ textAlign: 'right' }"
@@ -252,7 +260,7 @@
        :label-col="labelCol"
        :wrapper-col="wrapperCol">
        <a-row>
-          <a-col :span="12">
+          <a-col :span="24">
            <a-form-item ref="name" label="数据来源" name="dataSources">
              <a-select
                ref="select"
@@ -264,14 +272,29 @@
              </a-select>
            </a-form-item>
          </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
            <a-form-item ref="name" label="消耗量" name="consumption">
              <ns-input v-model:value="editFormState.consumption" :disabled="canEdit" />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row v-if="automatic">
-          <a-col :span="12">
+          <a-col :span="24">
+            <a-form-item label="能耗类型">
+              <a-select
+                v-model:value="editFormState.energyConsumptionType"
+                @change="changeEnergyType"
+                placeholder="请选择能耗类型">
+                <a-select-option
+                  v-for="(item, index) in energyTypeOptions"
+                  :key="index"
+                  :value="item.dicKey">
+                  {{ item.cnValue }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
            <a-form-item ref="name" label="采集节点" name="collectionNode">
              <a-tree-select
                v-model:value="editFormState.collectionNode"
@@ -283,12 +306,12 @@
          </a-col>
        </a-row>
        <a-row>
-          <a-col :span="12">
+          <a-col :span="24">
            <a-form-item ref="name" label="因子值" name="factorId">
              <ns-input v-model:value="editFormState.factorId" />
            </a-form-item>
          </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
            <a-form-item ref="name" label="关键字" name="emissionFactors">
              <a-input-search
                v-model:value="editFormState.emissionFactors"
@@ -303,7 +326,8 @@
        :data-source="newTableData"
        bordered
        rowKey="id"
-        :scroll="{ y: 400 }"
+        :scroll="{ y: 300 }"
+        size="small"
        style="margin-bottom: 10px"
        :rowSelection="{
          selectedRowKeys: selectedRowKeysEdit,
@@ -313,25 +337,28 @@
        :pagination="false">
      </a-table>
      <a-pagination
-        :current="queryParams.pageNum"
+        :current="queryData.pageNum"
        :total="total"
-        :page-size="queryParams.pageSize"
+        :page-size="queryData.pageSize"
+        :pageSizeOptions="['5']"
        style="display: flex; justify-content: center; margin-top: 16px"
        :show-size-changer="true"
        :show-quick-jumper="true"
        @change="onChange" />
-      <a-upload
-        v-model:file-list="fileList"
+      <a-upload-dragger
+        v-model:fileList="fileList"
+        accept=".pdf"
        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>
+        <p class="ant-upload-drag-icon">
+          <inbox-outlined></inbox-outlined>
+        </p>
+        <p class="ant-upload-hint">1.仅支持pdf格式文件或文件夹</p>
+        <p class="ant-upload-hint">2.文件名命名规则为【能源种类_年份】</p>
+        <p class="ant-upload-hint">3.每次上传自动覆盖</p>
+      </a-upload-dragger>
      <template #footer>
        <a-button style="margin-right: 8px" @click="onCloseEditData">取消</a-button>
        <a-button type="primary" @click="submitEditData">确定</a-button>
@@ -341,15 +368,16 @@
 </template>

 <script lang="ts" setup>
-  import { ref, watch, toRaw, defineEmits } from 'vue';
+  import { ref, watch, toRaw, defineEmits, nextTick } from 'vue';
  import { http } from '/nerv-lib/util/http';
-  import { Pagination, Modal, message } from 'ant-design-vue';
+  import { Pagination, Modal, message, Upload } from 'ant-design-vue';
  import type { TreeProps, UploadChangeParam } from 'ant-design-vue';
  import {
    EditOutlined,
    PlusCircleOutlined,
    MinusCircleOutlined,
    UploadOutlined,
+    InboxOutlined,
  } from '@ant-design/icons-vue';
  import * as echarts from 'echarts';
  import { voucherColumns, drawerColumns } from '../config';
@@ -361,6 +389,7 @@
  } from '/@/api/carbonEmissionFactorLibrary';
  import { group } from '/@/api/deviceManage';
  import { debug, log } from 'node:console';
+  import { dict } from '/@/api';
  defineOptions({
    energyType: 'fillInPage', // 与页面路由name一致缓存才可生效
    components: {
@@ -382,12 +411,12 @@
      type: String,
    },
  });
-
+  const activeKey = ref('1');
  const orgId = ref('');
  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
  orgId.value = result;
-  const fetch = (api, params = { orgId: orgId.value }) => {
-    return http.post(api, params);
+  const fetch = (api, params = { orgId: orgId.value }, config) => {
+    return http.post(api, params, config);
  };
  // 左侧树结构
  const x = 3;
@@ -865,15 +894,17 @@
    selectedRowKeys.value.forEach((item) => {
      deleteIds.value.append('ids', item);
    });
-    fetch(uploadPic.downloadZip, deleteIds.value)
+    const config = {
+      responseType: 'blob',
+    };
+    fetch(uploadPic.downloadZip, deleteIds.value, config)
      .then((res) => {
        // 创建一个 URL 对象，指向图片数据的 blob
-        const url = window.URL.createObjectURL(new Blob([res.data]));
+        const url = window.URL.createObjectURL(new Blob([res]));
        // 创建一个 <a> 标签，用于触发下载
        const link = document.createElement('a');
        link.href = url;
-        debugger;
-        link.setAttribute('download', ''); // 设置下载的文件名
+        link.setAttribute('download', '碳盘查凭证.zip'); // 设置下载的文件名
        document.body.appendChild(link);
        link.click();

@@ -910,10 +941,15 @@
  const queryData = ref({
    orgId: orgId.value,
    pageNum: 1,
-    pageSize: 999,
+    pageSize: 5,
  });
-  const edit = (record) => {
-    getDictList();
+  const energyTypeOptions = ref([]);
+  const acquisitionDate = ref();
+  const edit = async (record) => {
+    acquisitionDate.value = record.acquisitionDate;
+    // 获取能耗类型
+    const options = await dict({ params: { dicKey: 'ENERGY_TYPE' } });
+    energyTypeOptions.value = options.data.data;
    getNewTable();
    editFormState.value.id = record.id;
    editFormState.value.dataSources = record.dataSources;
@@ -949,14 +985,17 @@
    if (value === '3') {
      canEdit.value = true;
      automatic.value = true;
+    } else {
+      automatic.value = false;
    }
  };
  // 定义采集节点数的变量
  const collectingNodes = ref<TreeSelectProps['treeData']>([]);
-  const getDictList = () => {
+  const getTypeConsume = ref();
+  const changeEnergyType = (value) => {
+    getTypeConsume.value = value;
    // 获取自动采集节点的数据
-    fetch(group.queryDeviceGroupTree, { energyType: 'ELECTRICITY_USAGE', orgId: orgId.value }).then(
-      (res) => {
+    fetch(group.queryDeviceGroupTree, { energyType: value, orgId: orgId.value }).then((res) => {
      collectingNodes.value = res.data;
      collectingNodes.value = collectingNodes.value.map((item) => ({
        value: item.id,
@@ -968,27 +1007,44 @@
            }))
          : [],
      }));
-      },
-    );
+    });
  };
  const selectNode = (value) => {
-    debugger;
+    const getConsumeData = ref({
+      acquisitionDate: acquisitionDate.value,
+      collectionNode: value,
+      orgId: orgId.value,
+      energyConsumptionType: getTypeConsume.value,
+    });
+    fetch(carbonInventoryCheck.nodeCancellationConsumption, getConsumeData.value).then((res) => {
+      editFormState.value.consumption = res.data;
+    });
  };
  // 上传附件
  const fileList = ref<UploadProps['fileList']>([]);
+  const isValidFileName = (filename: string): boolean => {
+    const regex = /^[\s\S]+_\d{4}\.pdf$/;
+    return regex.test(filename);
+  };
  const beforeUpload: UploadProps['beforeUpload'] = (file) => {
+    const filename = file.name;
+    if (!isValidFileName(filename)) {
+      message.error('文件名不符合规则');
+      return Upload.LIST_IGNORE; // 阻止文件上传
+    }
    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} 文件上传成功`);
-    } else if (info.file.status === 'error') {
-      message.error(`${info.file.name} 文件上传失败`);
+    // fileList.value = [...info.fileList];
+    const { fileList: newFileList } = info;
+    // 删除fileList中的第一条数据
+    if (newFileList.length > 1) {
+      delIds.value.push(info.fileList[0].uid);
+      newFileList.shift(); // 删除第一条数据
    }
+
+    // 更新fileList
+    fileList.value = [...newFileList];
  };
  const delIds = ref([]);
  const handleFileRemove = (file) => {
@@ -1062,8 +1118,8 @@
  };
  // 分页器
  const onChange = (pageNumber: number, size: number) => {
-    queryParams.value.pageNum = pageNumber;
-    queryParams.value.pageSize = size;
+    queryData.value.pageNum = pageNumber;
+    queryData.value.pageSize = size;
    getNewTable();
  };
  // 点击切换排放统计/碳排流向
@@ -1388,6 +1444,20 @@
    chartInstance = echarts.init(tplxChart.value);
    chartInstance.setOption(option);
  };
+
+  const handleTabChange = (key) => {
+    console.log('Tab changed:', key);
+    // 在这里可以执行需要在页面切换时执行的逻辑
+    if (key === '2') {
+      nextTick(() => {
+        getEmissionStatistic();
+      });
+    } else if (key === '3') {
+      nextTick(() => {
+        getCarbonFlowDirection();
+      });
+    }
+  };
  // 点击返回
  const emit = defineEmits(['change-data']);
  const changeParentData = () => {
@@ -1413,7 +1483,7 @@
    flex-direction: column;
    .top {
      position: relative;
-      height: 80%;
+      height: 100%;
      margin-bottom: 20px;
      .ns-form-title {
        font-weight: bold;
@@ -1492,10 +1562,13 @@
    flex: 1;
    min-width: 0;
    height: 100%;
-    padding: @ns-gap;
    background-color: @white;
    border-radius: @ns-border-radius;
    box-shadow: @ns-content-box-shadow;
+    position: relative;
+    :deep(.ant-tabs-content-holder) {
+      padding: 20px;
+    }
    .ns-table-title {
      text-align: left;
      font-size: 16px;
@@ -1552,4 +1625,8 @@
    margin-left: 10%;
    flex-direction: column;
  }
+  :deep(.ant-upload.ant-upload-drag) {
+    height: 18vh;
+    margin-top: 10px;
+  }
 </style>
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -1,15 +1,42 @@
 <template>
  <div class="main">
+    <div class="totalTitle">
+      <div class="ns-form-title">
+        <div class="title">{{ props.year }}年济阳站碳盘查报告</div>
+        <div class="standard" style="display: flex; align-items: center">
+          <img
+            width="11px"
+            height="11px"
+            style="margin-right: 5px"
+            src="../../../../../src/icon/carbonInventoryCheck.svg" />
+          <span
+            style="
+              font-size: 12px;
+              font-weight: 400;
+              letter-spacing: 0px;
+              line-height: 16.8px;
+              color: rgba(67, 136, 251, 1);
+              text-align: left;
+              vertical-align: top;
+            ">
+            适用标准：ISO 14064-1
+          </span>
+          <a-button type="primary" @click="changeParentData" ghost style="margin-left: 6px">
+            返回
+          </a-button>
+        </div>
+      </div>
+    </div>
+    <div style="display: flex; height: 100%">
      <div class="left">
        <div class="top">
          <a-form style="width: 100%; margin: 0 auto">
            <div class="ns-form-title">
-            <div class="title">{{ props.year }}年济阳站碳盘查报告</div>
+              <div>能源类别</div>
              <div class="standard">
-              <span>适用标准：ISO 14064-1</span>
-              <a-button type="primary" style="margin-left: 12px" @click="openCategoryConfig"
-                >类别配置</a-button
-              >
+                <a-button type="primary" style="margin-left: 12px" @click="openCategoryConfig">
+                  类别配置
+                </a-button>
              </div>
            </div>
            <div style="padding: 0 16px !important; width: 100%">
@@ -44,6 +71,7 @@
              <span v-else>{{ cnValue }}</span>
            </template>
          </a-tree>
+          <a-empty v-else />
        </div>
        <!-- <div class="bottom">
        <a-form style="width: 100%; margin: 0 auto">
@@ -56,17 +84,12 @@
      </div> -->
      </div>
      <div class="right">
-      <a-button
-        type="primary"
-        @click="changeParentData"
-        style="position: absolute; right: 25px; top: 10px; z-index: 99">
-        返回
-      </a-button>
        <a-tabs v-model:activeKey="activeKey" @change="handleTabChange" style="height: 100%">
          <a-tab-pane key="1" tab="排放源">
            <div style="display: flex; height: 100%">
              <div class="mainLeft">
                <a-tree
+                  v-if="treeData && treeData.length > 0"
                  :expandedKeys="expandedKeysR"
                  :selectedKeys="selectedKeysR"
                  :checkedKeys="checkedKeys"
@@ -85,15 +108,17 @@
                    </div>
                  </template>
                </a-tree>
+                <a-empty v-else />
                <div class="addTreeNode">
-                <a-button type="primary" style="width: 100%" @click="addTreeNodeData"
-                  >新增</a-button
-                >
+                  <a-button type="primary" style="width: 100%" @click="addTreeNodeData">
+                    新增
+                  </a-button>
                </div>
              </div>
              <div class="mainRight">
                <a-table
                  :columns="columns"
+                  v-if="data && data.length > 0"
                  :data-source="data"
                  :pagination="false"
                  bordered
@@ -116,12 +141,14 @@
                    </template>
                  </template>
                </a-table>
+                <a-empty v-else />
              </div>
            </div>
          </a-tab-pane>
          <a-tab-pane key="2" tab="排放统计">
            <a-table
              :columns="pftjColumn"
+              v-if="pftjData && pftjData.length > 0"
              :data-source="pftjData"
              bordered
              :pagination="false"
@@ -130,12 +157,15 @@
                {{ text || '-' }}
              </template>
            </a-table>
+            <a-empty v-else />
          </a-tab-pane>
          <a-tab-pane key="3" tab="碳排流向">
-          <div ref="tplxChart" style="width: 100%; height: 68vh"></div>
+            <div v-if="showChart" ref="tplxChart" style="width: 100%; height: 68vh"></div>
+            <a-empty v-else />
          </a-tab-pane>
        </a-tabs>
      </div>
+    </div>
    <!-- 类别配置 -->
    <a-drawer
      :width="500"
@@ -144,8 +174,11 @@
      :body-style="{ paddingBottom: '80px' }"
      :footer-style="{ textAlign: 'right' }"
      destroyOnClose
-      title="类别配置"
      @close="closeCategoryConfig">
+      <div class="ns-form-title" style="margin-left: 10%">
+        <div class="title">类别设置</div>
+      </div>
+      <div class="treePart">
        <div class="search">
          <a-input-search
            v-model:value="searchcategoryConfig"
@@ -153,7 +186,6 @@
            style="width: 250px"
            @search="onSearch" />
        </div>
-      <div class="treePart">
        <a-tree
          :expanded-keys="categoryExpandedKeys"
          :selectedKeys="categorySelectedKeys"
@@ -186,6 +218,9 @@
      :footer-style="{ textAlign: 'right' }"
      destroyOnClose
      @close="onClose">
+      <div class="ns-form-title" style="display: flex">
+        <div class="title">新增</div>
+      </div>
      <a-form
        ref="formRef"
        :model="formState"
@@ -229,6 +264,9 @@
      :footer-style="{ textAlign: 'right' }"
      destroyOnClose
      @close="onCloseVoucher">
+      <div class="ns-form-title">
+        <div class="title">凭证列表</div>
+      </div>
      <a-table
        :columns="voucherColumns"
        :data-source="voucherData"
@@ -254,6 +292,9 @@
      :footer-style="{ textAlign: 'right' }"
      destroyOnClose
      @close="onCloseEditData">
+      <div class="ns-form-title-edit">
+        <div class="title">编辑</div>
+      </div>
      <a-form
        ref="editFormRef"
        :model="editFormState"
@@ -321,6 +362,9 @@
          </a-col>
        </a-row>
      </a-form>
+      <div class="ns-form-title-edit" style="display: flex">
+        <div class="titleEdit">因子列表</div>
+      </div>
      <a-table
        :columns="drawerColumns"
        :data-source="newTableData"
@@ -345,6 +389,9 @@
        :show-size-changer="true"
        :show-quick-jumper="true"
        @change="onChange" />
+      <div class="ns-form-title-edit" style="display: flex">
+        <div class="titleEdit">凭证上传</div>
+      </div>
      <a-upload-dragger
        v-model:fileList="fileList"
        accept=".pdf"
@@ -658,8 +705,8 @@
  // 新增/编辑排放源树节点
  const addTreeNodeVisible = ref(false);
  const formRef = ref();
-  const labelCol = { span: 5 };
-  const wrapperCol = { span: 19 };
+  const labelCol = { span: 4 };
+  const wrapperCol = { span: 20 };
  const formState = ref({
    orgId: orgId.value,
    year: props.year,
@@ -1148,10 +1195,16 @@
  });
  const linksData = ref([]);
  const datalist = ref([]);
+  const showChart = ref(true);
  const getCarbonFlowDirection = () => {
    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 {
+        showChart.value = false;
+      }
      datalist.value = res.data[1];
      drawEcharts();
    });
@@ -1467,14 +1520,18 @@

 <style lang="less" scoped>
  .main {
-    background-color: @ns-content-bg;
-    display: flex;
+    background-color: #ffffff;
    height: 100%;
+    padding: 16px;
  }
  .left {
    width: 300px;
    margin-right: @ns-gap;
    min-width: fit-content;
+    height: 93%;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
    > div {
      background-color: @white;
    }
@@ -1491,7 +1548,6 @@
        padding: 16px;
        margin-bottom: 16px;
        padding-bottom: 10px;
-        border-bottom: 1px solid #e9e9e9;
      }
      .title {
        text-align: left;
@@ -1561,11 +1617,10 @@
  .right {
    flex: 1;
    min-width: 0;
-    height: 100%;
-    background-color: @white;
-    border-radius: @ns-border-radius;
-    box-shadow: @ns-content-box-shadow;
-    position: relative;
+    height: 93%;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
    :deep(.ant-tabs-content-holder) {
      padding: 20px;
    }
@@ -1611,17 +1666,17 @@
  }

  .search {
-    width: 70%;
    height: 5vh;
    display: flex;
    align-items: center;
-    margin-left: 10%;
+    justify-content: center;
  }
  .treePart {
    width: 70%;
    height: 100%;
    display: flex;
-    border: 1px solid #bfbfbf;
+    border: 1px solid rgba(235, 238, 245, 1);
+    border-radius: 8px;
    margin-left: 10%;
    flex-direction: column;
  }
@@ -1629,4 +1684,48 @@
    height: 18vh;
    margin-top: 10px;
  }
+  .ns-form-title {
+    font-weight: bold;
+    user-select: text;
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .ns-form-title-edit {
+    font-weight: bold;
+    user-select: text;
+  }
+  .title {
+    text-align: left;
+    height: 32px;
+    line-height: 32px;
+    font-weight: bold;
+    user-select: text;
+    position: relative;
+    padding-left: 9px;
+  }
+  .titleEdit {
+    text-align: left;
+    height: 32px;
+    line-height: 32px;
+    font-weight: bold;
+    user-select: text;
+    position: relative;
+  }
+  .title::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    height: 13px;
+    width: 3px;
+    border-radius: 1px;
+    background-color: #2778ff;
+  }
+  :deep(.ant-table-title) {
+    display: flex;
+    justify-content: right;
+  }
 </style>
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -20,6 +20,7 @@
    :footer-style="{ textAlign: 'right' }"
    destroyOnClose
    @close="onClose">
+    <div class="ns-form-title"><div class="title">{{text}}</div></div>
    <a-form
      ref="formRef"
      :model="formState"
@@ -78,8 +79,9 @@
  const visible = ref(false);
  const formState = ref({});
  const formRef = ref();
-  const labelCol = { span: 5 };
-  const wrapperCol = { span: 19 };
+  const labelCol = { span: 4 };
+  const wrapperCol = { span: 20 };
+  const text = ref('新增报告')
  const disabledDate = (current: moment.Moment | null) => {
    if (formState.value.reportPeriod === '2') {
      const year = current.year();
@@ -140,6 +142,7 @@
        name: 'userAdd',
        type: 'primary',
        handle: () => {
+          text.value = '新增报告'
          visible.value = true;
        },
      },
@@ -183,6 +186,7 @@
          label: '编辑',
          name: 'userEdit',
          handle: (record: any) => {
+          text.value = '编辑报告'
            visible.value = true;
            fetch(carbonInventoryCheck.findById, { id: record.id }).then((res) => {
              formState.value = res.data;
@@ -274,4 +278,30 @@
  };
 </script>

-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  .ns-form-title {
+    font-weight: bold;
+    user-select: text;
+    margin-bottom: 16px;
+  }
+  .title {
+    text-align: left;
+    height: 32px;
+    line-height: 32px;
+    font-weight: bold;
+    user-select: text;
+    position: relative;
+    padding-left: 9px;
+  }
+  .title::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    height: 13px;
+    width: 3px;
+    border-radius: 1px;
+    background-color: #2778ff;
+  }
+</style>
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
@@ -2,25 +2,37 @@
  <div class="totalContant">
    <div class="ns-form-title">
      <div class="title">
-        <span>查询</span>
+        <span>统计数据</span>
+      </div>
+    </div>
+    <div
+      style="
+        display: flex;
+        width: 100%;
+        height: 5%;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 1%;
+      ">
      <a-date-picker
        v-if="selectedTime"
-          style="margin-left: 5%"
        valueFormat="YYYY"
        v-model:value="selectYear"
        @change="changeYear"
        picker="year" />
      <a-date-picker
        v-else
-          style="margin-left: 5%"
        valueFormat="YYYY-MM"
        v-model:value="selectMonth"
        @change="changeMonth"
        picker="month" />
-      </div>
      <div class="operation">
-        <div class="month" :style="monthStyles" @click="changeToMonth"><span>月</span></div>
-        <div class="year" :style="yearStyles" @click="changeToYear"><span>年</span></div>
+        <div class="month" :style="monthStyles" @click="changeToMonth">
+          <span :style="monthText">本月</span>
+        </div>
+        <div class="year" :style="yearStyles" @click="changeToYear">
+          <span :style="yearText">本年</span>
+        </div>
      </div>
    </div>
    <div class="contant">
@@ -62,8 +74,10 @@
  const selectYear = ref<Dayjs>(dayjs(new Date().getFullYear().toString()));
  const selectMonth = ref<Dayjs>(dayjs().startOf('year').month(0));
  // 年/月切换
-  const monthStyles = ref('background: #f2f2f2');
+  const monthStyles = ref('background: transparent');
  const yearStyles = ref('background: #2778ff');
+  const monthText = ref('color: #2778ff');
+  const yearText = ref('color: #ffffff');
  const selectedTime = ref(true);
  const changeMonth = () => {
    queryParams.value.yearMonth = selectMonth.value;
@@ -71,7 +85,9 @@
  };
  const changeToMonth = () => {
    monthStyles.value = 'background: #2778ff';
-    yearStyles.value = 'background: #f2f2f2';
+    yearStyles.value = 'background: transparent';
+    monthText.value = 'color: #ffffff';
+    yearText.value = 'color: #2778ff';
    queryParams.value.yearAndMonth = 'month';
    queryParams.value.yearMonth = selectMonth.value.format('YYYY-DD');
    columns.value[2].title = '月份';
@@ -84,8 +100,10 @@
    getTableData();
  };
  const changeToYear = () => {
-    monthStyles.value = 'background: #f2f2f2';
+    monthStyles.value = 'background:transparent';
    yearStyles.value = 'background: #2778ff';
+    monthText.value = 'color: #2778ff';
+    yearText.value = 'color: #ffffff';
    queryParams.value.yearAndMonth = 'year';
    delete queryParams.value.yearMonth;
    // queryParams.value.year = selectYear.value;
@@ -218,6 +236,7 @@
  const columns = ref([
    {
      title: '序号',
+      width: 100,
      customRender: (text: any) => {
        return text.index + 1;
      },
@@ -301,32 +320,32 @@
      border-radius: 1px;
      background-color: #2778ff;
    }
+  }
  .operation {
    display: flex;
    margin-right: 10px;
    font-weight: 400;
-      height: 70%;
+    height: 90%;
    cursor: pointer;
    width: 10%;
+    border-radius: 4px;
+    border: 1px solid rgba(39, 120, 255, 1);
  }
  .month {
-      width: 70px;
+    width: 50%;
    display: flex;
    align-items: center;
    justify-content: center;
-      // background: #f2f2f2;
  }
  .year {
-      width: 70px;
+    width: 50%;
    display: flex;
    align-items: center;
    justify-content: center;
-      // background: #2778ff;
-    }
  }
  .contant {
    width: 100%;
-    height: calc(100% - 5vh);
+    height: calc(94% - 5vh);
    .chartsPart {
      width: 100%;
      height: 35%;
@@ -336,6 +355,7 @@
        width: 19%;
        height: 100%;
        background: rgba(39, 120, 255, 0.05);
+        border-radius: 8px;
      }
    }
    .tablePart {
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
@@ -88,7 +88,6 @@
            selectedRowKeys: selectedRowKeys,
            onChange: onSelectionChange,
          }"
-          :scroll="{ x: 1300, y: 400 }"
          :pagination="false">
          <template #bodyCell="{ column, text, record }">
            <template v-if="column.key === 'action'">
@@ -209,6 +208,7 @@
  import type { UnwrapRef } from 'vue';
  import { ref, defineEmits, reactive, toRaw } from 'vue';
  import { http } from '/nerv-lib/util/http';
+  import { message } from 'ant-design-vue';
  import {
    CaretUpOutlined,
    CaretDownOutlined,
@@ -402,7 +402,7 @@
    // 在这里可以执行需要在页面切换时执行的逻辑
    if (key === '1') {
    } else if (key === '2') {
-      if (selectedRowKeysSet.value) {
+      if (selectedRowKeysSet.value.length !== 0) {
        fetch(carbonPlanning.monthBenchmarkSetting, {
          type: props.type,
          referenceYear: selectedRowKeysSet.value[0],
@@ -413,6 +413,7 @@
          monthData.value = res.data;
        });
      } else {
+        message.warning('请先选择年基准值！');
        activeKey.value = '1';
      }
    }
@@ -420,6 +421,16 @@
  //开关
  const changeSwitch = (data: any) => {
    data.isAutoObtained = data.isAutoObtained === 0 ? 1 : 0;
+    if (data.isAutoObtained === 0) {
+      fetch(carbonPlanning.autoObtained, {
+        type: props.type,
+        itemizeId: props.parentId,
+        orgId: orgId.value,
+        yearMonth: data.yearMonth,
+      }).then((res) => {
+        data.referenceValue = res.data.referenceValue;
+      });
+    }
    monthData.value = [...monthData.value];
    console.log(monthData.value);
  };
@@ -473,11 +484,18 @@
      itemizeId: props.parentId,
    }).then((res) => {
      visible.value = false;
+      activeKey.value = '1';
      selectedRowKeysSet.value = [];
      getTableData();
    });
  };
  const onClose = () => {
+    activeKey.value = '1';
+    selectedRowKeysSet.value = [];
+    if (selectYear.value) {
+      selectYear.value = '';
+      queryData.value.referenceYear = selectYear.value;
+    }
    visible.value = false;
  };
  // echarts图
@@ -766,9 +784,12 @@
      }
      .model {
        width: 16%;
-        height: 90%;
+        height: 100%;
        background: #f7f9ff;
        padding: 12px;
+        border-radius: 12px;
+        background: linear-gradient(180deg, rgba(255, 255, 255, 1) 0%, rgba(222, 255, 246, 1) 100%);
+        border: 1px solid rgba(18, 174, 132, 1);
        .quantity {
          font-size: 12px;
          font-weight: 400;
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
@@ -4,9 +4,19 @@
      <div class="title">
        <span>统计数据</span>
        <a-button style="margin-left: 5%" type="primary" @click="addNode">新增节点</a-button>
+      </div>
+    </div>
+    <div
+      style="
+        display: flex;
+        width: 100%;
+        height: 5%;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 1%;
+      ">
      <a-date-picker
        v-if="selectedTime"
-          style="margin-left: 5%"
        v-model:value="selectYearValue"
        :disabled-date="disabledDate"
        valueFormat="YYYY"
@@ -14,15 +24,17 @@
        picker="year" />
      <a-date-picker
        v-else
-          style="margin-left: 5%"
        v-model:value="selectMonthValue"
        valueFormat="YYYY-MM"
        @change="changeMonth"
        picker="month" />
-      </div>
      <div class="operation">
-        <div class="month" :style="monthStyles" @click="changeToMonth"><span>月</span></div>
-        <div class="year" :style="yearStyles" @click="changeToYear"><span>年</span></div>
+        <div class="month" :style="monthStyles" @click="changeToMonth">
+          <span :style="monthText">本月</span>
+        </div>
+        <div class="year" :style="yearStyles" @click="changeToYear">
+          <span :style="yearText">本年</span>
+        </div>
      </div>
    </div>
    <div class="contant">
@@ -38,8 +50,7 @@
          :pagination="false"
          row-key="itemizeId"
          :onRow="onRow"
-          :customRow="customRow"
-          :scroll="{ x: 1300, y: 250 }">
+          :customRow="customRow">
          <template #bodyCell="{ column, text, record }">
            <template v-if="column.key === 'action'">
              <span>
@@ -61,6 +72,9 @@
  </div>
  <!-- 新增节点 -->
  <a-drawer :visible="visible" :width="500" @close="onClose" :footer-style="{ textAlign: 'right' }">
+    <div class="ns-form-title">
+      <div class="title">新增节点</div>
+    </div>
    <a-tree
      :expanded-keys="expandedKeys"
      :selectedKeys="selectedKeys"
@@ -124,12 +138,16 @@
  };

  // 年/月切换
-  const monthStyles = ref('background: #f2f2f2');
+  const monthStyles = ref('background: #transparent');
  const yearStyles = ref('background: #2778ff');
+  const monthText = ref('color: #2778ff');
+  const yearText = ref('color: #ffffff');
  const selectedTime = ref(true);
  const changeToMonth = () => {
    monthStyles.value = 'background: #2778ff';
-    yearStyles.value = 'background: #f2f2f2';
+    yearStyles.value = 'background: #transparent';
+    monthText.value = 'color: #ffffff';
+    yearText.value = 'color: #2778ff';
    columns.value[2].title = '月份';
    columns.value[2].dataIndex = 'yearMonth';
    selectedTime.value = false;
@@ -138,8 +156,10 @@
    getMonthPillarData();
  };
  const changeToYear = () => {
-    monthStyles.value = 'background: #f2f2f2';
+    monthStyles.value = 'background: #transparent';
    yearStyles.value = 'background: #2778ff';
+    monthText.value = 'color: #2778ff';
+    yearText.value = 'color: #ffffff';
    columns.value[2].title = '年份';
    columns.value[2].dataIndex = 'year';
    selectedTime.value = true;
@@ -574,7 +594,9 @@
      user-select: text;
      position: relative;
      padding-left: 9px;
-      width: 50%;
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
    }
    .title::before {
      content: '';
@@ -587,34 +609,35 @@
      border-radius: 1px;
      background-color: #2778ff;
    }
+  }
  .operation {
    display: flex;
    margin-right: 10px;
    font-weight: 400;
-      height: 70%;
+    height: 90%;
    cursor: pointer;
    width: 10%;
+    border-radius: 4px;
+    border: 1px solid rgba(39, 120, 255, 1);
  }
  .month {
-      width: 70px;
+    width: 50%;
    display: flex;
    align-items: center;
    justify-content: center;
-      // background: #f2f2f2;
  }
  .year {
-      width: 70px;
+    width: 50%;
    display: flex;
    align-items: center;
    justify-content: center;
-      // background: #2778ff;
-    }
  }
  .contant {
    width: 100%;
-    height: calc(100% - 5vh);
+    height: calc(94% - 5vh);
+    overflow-y: auto;
    .chartsPart {
-      width: 100%;
+      width: 99%;
      height: 40%;
      display: flex;
      justify-content: space-between;
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
@@ -9,13 +9,13 @@
    <a-tab-pane key="3" tab="用水量">
      <category ref="useWaterRef" :tabId="tabId" :energyType="energyType" />
    </a-tab-pane>
-    <a-tab-pane key="4" tab="供水量">
+    <a-tab-pane key="4" tab="用气量">
      <category ref="provideWaterRef" :tabId="tabId" :energyType="energyType" />
    </a-tab-pane>
-    <a-tab-pane key="5" tab="碳排">
+    <a-tab-pane key="5" tab="供热量">
      <category ref="carbonEmissionsRef" :tabId="tabId" :energyType="energyType" />
    </a-tab-pane>
-    <a-tab-pane key="6" tab="供热量">
+    <a-tab-pane key="6" tab="碳排量">
      <category ref="provideHotRef" :tabId="tabId" :energyType="energyType" />
    </a-tab-pane>
  </a-tabs>
@@ -51,47 +51,47 @@
        }
      });
    } else if (key === '2') {
-      tabId.value = 1;
-      energyType.value = 'ELECTRICITY_USAGE'
+      tabId.value = 4;
+      energyType.value = 'ELECTRICITY_USAGE';
      nextTick(() => {
        if (electricRef.value) {
-          electricRef.value.electricTotal = true
+          electricRef.value.electricTotal = true;
          electricRef.value.changeToYear(); // 调用子组件的方法
        }
      });
    } else if (key === '3') {
-      tabId.value = 2;
-      energyType.value = 'WATER_USAGE'
+      tabId.value = 5;
+      energyType.value = 'WATER_USAGE';
      nextTick(() => {
        if (useWaterRef.value) {
-          useWaterRef.value.electricTotal = true
+          useWaterRef.value.electricTotal = true;
          useWaterRef.value.changeToYear(); // 调用子组件的方法
        }
      });
    } else if (key === '4') {
-      tabId.value = 3;
-      energyType.value = 'gongshuiliang'
+      tabId.value = 6;
+      energyType.value = 'gongshuiliang';
      nextTick(() => {
        if (provideWaterRef.value) {
-          provideWaterRef.value.electricTotal = true
+          provideWaterRef.value.electricTotal = true;
          provideWaterRef.value.changeToYear(); // 调用子组件的方法
        }
      });
    } else if (key === '5') {
-      tabId.value = 5;
-      energyType.value = 'CARBON_EMISSIONS'
+      tabId.value = 7;
+      energyType.value = 'CARBON_EMISSIONS';
      nextTick(() => {
        if (carbonEmissionsRef.value) {
-          carbonEmissionsRef.value.electricTotal = true
+          carbonEmissionsRef.value.electricTotal = true;
          carbonEmissionsRef.value.changeToYear(); // 调用子组件的方法
        }
      });
    } else if (key === '6') {
-      tabId.value = 4;
-      energyType.value = 'HEAT_SUPPLY'
+      tabId.value = 8;
+      energyType.value = 'HEAT_SUPPLY';
      nextTick(() => {
        if (provideHotRef.value) {
-          provideHotRef.value.electricTotal = true
+          provideHotRef.value.electricTotal = true;
          provideHotRef.value.changeToYear(); // 调用子组件的方法
        }
      });
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
@@ -1,7 +1,12 @@
 <template>
  <div class="div-add">
    <button class="add" @click="addModal">添加</button>
-    <a-popconfirm title="是否提交以上修改？" ok-text="确定" cancel-text="取消" @confirm="sendTable">
+    <a-popconfirm
+      title="是否提交以上修改？"
+      placement="bottomLeft"
+      ok-text="确定"
+      cancel-text="取消"
+      @confirm="sendTable">
      <button class="add" style="margin-left: 20px">执行</button>
    </a-popconfirm>
  </div>
@@ -47,6 +52,7 @@
            title="此操作将移除该数据"
            ok-text="确定"
            cancel-text="取消"
+            placement="topRight"
            @confirm="deletePlan(row)">
            <div class="tabDelete">删除</div>
          </a-popconfirm>
@@ -55,7 +61,7 @@
    </tbody>
  </table>
  <div class="out-dialog" v-if="addVisible">
-    <div class="content" v-if="addVisible">
+    <div class="content">
      <div class="div-operation"></div>
      <span class="text-operation">计划库</span>
    </div>
@@ -132,7 +138,15 @@
  // 计划启用/禁用事件
  const togglePlan = (state: number) => {
    dataSource.value.forEach((item: any) => {
+      // 执行中 无法修改为待执行
+      if (state == 1) {
+        if (item.executeStatus.value != 2) {
          item.executeStatus.value = state;
+        }
+        // 任何状态都可以修改为 暂停
+      } else {
+        item.executeStatus.value = state;
+      }
    });
  };

@@ -155,19 +169,32 @@
  const deletePlan = (row: any) => {
    row.executeStatus.value = 0;
  };
-  // 重启表格中的计划（将当前任意状态，修改为待执行 = 1）
+  // 重启表格中的计划（将当前非 执行中 状态，修改为待执行 = 1）
  const startPlan = (row: any) => {
    if (row.executeStatus.value == 1) {
      return message.info('该数据已是待执行状态，无需再次修改');
    }
+    if (row.executeStatus.value == 2) {
+      return message.info('执行中的状态已被启用，无需修改');
+    }
    row.executeStatus.value = 1;
  };
  // 将对表格的修改统一发送
  const sendTable = () => {
-    http.post(airConditionControl.submitTableData, dataSource.value).then(() => {
+    http
+      .post(
+        airConditionControl.submitTableData +
+          `?projectId=${state.projectId}${state.siteId ? `&siteId=${state.siteId}` : ''}`,
+        dataSource.value,
+      )
+      .then((res) => {
+        if (res.retcode == 0) {
          message.success('操作成功');
          getTable();
          getLeftPlan();
+        } else {
+          message.info(res.msg);
+        }
      });
  };

@@ -225,7 +252,7 @@
      getLeftPlan();
    });
  };
-
+  // 穿梭框交互
  const filterOption = (inputValue: string, option: any) => {
    return option.description.indexOf(inputValue) > -1;
  };
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
@@ -11,7 +11,7 @@
    </thead>
    <tbody>
      <tr
-        :style="{ color: row.ctrlResult == 0 ? 'red' : 'white' }"
+        :style="{ color: row.ctrlResult == 1 ? 'red' : 'white' }"
        v-for="(row, index) in dataSource"
        :key="index"
        @click="handleRowClick(row.id, index)"
@@ -20,7 +20,7 @@
        <td>{{ row.startTime }}</td>
        <td>{{ row.operationContent }}</td>
        <td>{{ row.createUser }}</td>
-        <td>{{ row.ctrlResult ? '成功' : '失败' }}</td>
+        <td>{{ row.ctrlResult ? '失败' : '成功' }}</td>
      </tr>
    </tbody>
  </table>
@@ -163,6 +163,8 @@
  };
  // 刷新功能（右下角）
  const reset = () => {
+    trIndex.value = -1;
+    logModalVisible.value = false;
    pagination.value = {
      pageSize: 10,
      pageNum: 1,
@@ -172,13 +174,8 @@
  };
  // 点击日志行事件
  const handleRowClick = (id: any, index: any) => {
-    // 忽略无效点击
-    if (index === trIndex.value) {
-      return;
-    } else {
    trIndex.value = index;
    getLogDetail(id);
-    }
  };

  // 日志详情业务 ==================================================
@@ -200,7 +197,7 @@
  const cxList = ref([]);
 </script>
 <style lang="less" scoped>
-  @import './dialogStyle.less';
+  @import '../style/dialogStyle.less';

  // 右下角添加按钮
  .div-add {
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -56,14 +56,15 @@
            ref="tabs1Ref"
            @reset="reset"
            @reload="reload"
-            @changeArea="changeArea"
+            @reset-all="resetDrawer"
+            @change-area="changeArea"
            :treeData="treeData" />
        </a-tab-pane>
        <a-tab-pane key="2" tab="计划列表" force-render>
-          <tabs2 />
+          <tabs2 ref="tabs2Ref" @reset-all="resetDrawer" />
        </a-tab-pane>
        <a-tab-pane key="3" tab="日志">
-          <tabs3 />
+          <tabs3 ref="tabs3Ref" @reset-all="resetDrawer" />
        </a-tab-pane>
      </a-tabs>
    </a-drawer>
@@ -269,8 +270,29 @@
  const toggleDrawer = () => {
    visible.value = !visible.value;
  };
+  // 当其中一个tab产生了数据修改，可以调用该方法重置所有tab
+  const resetDrawer = () => {
+    // 设备点阵重置
+    getBulbs();
+    // tab1重置
+    reload();
+    tabs1Ref.value.refresh();
+    // tab2 tab3 可能未加载
+    try {
+      // tab2重置
+      tabs2Ref.value.reset();
+    } catch {}
+    try {
+      // tab3重置
+      tabs3Ref.value.reset();
+    } catch {}
+  };
  // 抽屉tab1组件的引用
  const tabs1Ref = ref();
+  // 抽屉tab2组件的引用
+  const tabs2Ref = ref();
+  // 抽屉tab3组件的引用
+  const tabs3Ref = ref();
 </script>
 <style lang="less" scoped>
  @import './index.less';
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
@@ -7,7 +7,9 @@
            <img src="/asset/image//bulbLogo/21962.png" alt="" />
            <span class="tag-text">{{ blub.regionName + ' > ' + blub.deviceGroupName }}</span></div
          >
-          <button class="right-button">{{ record.runStatus.label }}</button>
+          <button class="right-button">{{
+            record?.runStatus?.label ? record.runStatus.label : '--'
+          }}</button>
        </div>
        <div class="light-tag-box">
          <div class="tag-box-item">
@@ -36,25 +38,25 @@
    <div class="icon-box" :style="props.blub.styleText">
      <!-- 正常=0 -->
      <img
-        v-if="record.runStatus.value == 0"
+        v-if="record?.runStatus?.value == 0"
        class="icon-item"
        src="/asset/image/bulbLogo/on.png"
        alt="" />
      <!-- 故障=1 -->
      <img
-        v-if="record.runStatus.value == 1"
+        v-if="record?.runStatus?.value == 1"
        class="icon-item"
        src="/asset/image/bulbLogo/off.png"
        alt="" />
      <!-- 维修=2 -->
      <img
-        v-if="record.runStatus.value == 2"
+        v-if="record?.runStatus?.value == 2"
        class="icon-item"
        src="/asset/image/bulbLogo/repair.png"
        alt="" />
      <!-- 警告=3 -->
      <img
-        v-if="record.runStatus.value == 3"
+        v-if="record?.runStatus?.value == 3"
        class="icon-item"
        src="/asset/image/bulbLogo/alarm.png"
        alt="" />
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -265,12 +265,13 @@
 </template>

 <script setup lang="ts">
-  import { ref, computed, onMounted } from 'vue';
+  import { ref, computed, onMounted, watch } from 'vue';
  import { DownOutlined, UpOutlined, StopOutlined } from '@ant-design/icons-vue';
-  import { message } from 'ant-design-vue';
+  import { message, Modal } from 'ant-design-vue';
  // 请求
  import { http } from '/nerv-lib/util/http';
  import { lightingManage } from '/@/api/IlluminationInfo';
+  import { planManage } from '/@/api/planManage';
  // 全局变量
  import { items } from '/@/store/item';

@@ -299,12 +300,24 @@
      },
    },
  });
+
+  watch(
+    () => props.treeData,
+    (newValue) => {
+      // 重新为照明回路赋值
+      // buttons2.value = newValue[0].childList;
+    },
+    {
+      deep: true,
+    },
+  );
  /** 向上传递方法
   * @method changeArea 用于控制俯视图的选中状态
   * @method reset 用于重置按钮区
   * @method reload 用于刷新一次页面
+   * @method resetAll 刷新所有tab，对计划进行修改时，需刷新tab2与tab3
   */
-  const emit = defineEmits(['changeArea', 'reset', 'reload']);
+  const emit = defineEmits(['changeArea', 'reset', 'reload', 'resetAll']);

  // 照明区域业务 =======================================================================

@@ -666,22 +679,21 @@
      changeList.value.forEach((item: any) => {
        resetChangeList(item);
      });
-    }
-    changeList.value = [];
-    if (!reload) {
      lockList.value.forEach((item: any) => {
        resetLockList(item);
      });
-    }
-    lockList.value = [];
-    // 默认选择第一个楼层
+      // 默认选择第一个照明区域
      let data = props.treeData[0];
      // 默认选中
      data.selected = true;
      // 默认选中 1-1 分区 回路
      buttons2.value = data.childList;
      resetMode();
+    }
+    changeList.value = [];
+    lockList.value = [];
  };
+
  // 将已修改的禁用/启用状态改回
  const resetLockList = (item: any) => {
    props.treeData.find((v: any) => {
@@ -729,6 +741,55 @@
    if (!changeList.value.length && !lockList.value.length) {
      return message.info('未产生任何修改');
    }
+    http
+      .get(planManage.getRunningPlan, {
+        deviceType: 1,
+        projectId: state.projectId,
+        siteId: state.siteId,
+      })
+      .then((res) => {
+        // 如果有计划正在执行
+        if (res.data && res.data.length) {
+          // 此处框架本身存在问题，弹出层在本地环境无法关闭，暂时使用浏览器自带的confirm方法
+          // Modal.confirm({
+          //   title: '提示信息',
+          //   content: '有计划正在执行，点击"确定"将暂停当前计划',
+          //   onOk() {
+          //     return new Promise((resolve, reject) => {
+          //     });
+          //   },
+          //   onCancel() {  },
+          // });
+
+          let flag = window.confirm('有计划正在执行，点击"确定"将暂停当前计划');
+          if (flag) {
+            // 如果点击了确定，将先终止所有进行中的计划
+            http
+              .post(lightingManage.submitChangeList, {
+                projectId: state.projectId,
+                siteId: state.siteId,
+                lockList: [],
+                sceneList: [],
+              })
+              .then((res) => {
+                console.log(res, '成功');
+                // 如果重置成功，则获取修改前后对比数据
+                if (res.retcode == 0) {
+                  sendChangeList();
+                  // 未成功提示
+                } else {
+                  message.error('关闭进行中的任务操作失败，请重新尝试');
+                }
+              });
+          }
+          // 没有计划正在执行，则直接请求
+        } else {
+          sendChangeList();
+        }
+      });
+  };
+  // 提交控制场景 与 禁用/启用 修改
+  const sendChangeList = () => {
    http
      .post(lightingManage.getChangeList, {
        sceneList: changeList.value,
@@ -737,11 +798,11 @@
        siteId: state.siteId,
      })
      .then((res) => {
-        if (res.msg === 'success') {
+        if (res.retcode == 0) {
          diffList.value = res.data;
          executeVisible.value = true;
        } else {
-          message.warning('获取修改内容失败');
+          message.error('获取修改内容失败');
        }
      })
      .catch(() => {});
@@ -792,7 +853,7 @@
      .then((res) => {
        let data = res.data;
        // 修改请求发送了，但操作时产生了失败结果
-        if (data.retcode != 0) {
+        if (res.retcode != 0) {
          // 直接提示并跳出
          return message.warning(data.msg);
        }
@@ -803,8 +864,8 @@
        } else {
          message.info(`${data.successList.length}条修改成功，${data.failList.length}条修改失败`);
        }
-        emit('reload');
        refresh(true);
+        emit('resetAll');
      })
      .catch(() => {});
  };
@@ -829,8 +890,6 @@
    changeLine,
    // 重置当前选择
    refresh,
-    resetLockList,
-    resetChangeList,
  });
 </script>
 <style lang="less" scoped>
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
@@ -1,7 +1,12 @@
 <template>
  <div class="div-add">
    <button class="add" @click="addModal">添加</button>
-    <a-popconfirm title="是否提交以上修改？" ok-text="确定" cancel-text="取消" @confirm="sendTable">
+    <a-popconfirm
+      title="是否提交以上修改？"
+      placement="bottomLeft"
+      ok-text="确定"
+      cancel-text="取消"
+      @confirm="sendTable">
      <button class="add" style="margin-left: 20px">执行</button>
    </a-popconfirm>
  </div>
@@ -47,6 +52,7 @@
            title="此操作将移除该数据"
            ok-text="确定"
            cancel-text="取消"
+            placement="topRight"
            @confirm="deletePlan(row)">
            <div class="tabDelete">删除</div>
          </a-popconfirm>
@@ -55,7 +61,7 @@
    </tbody>
  </table>
  <div class="out-dialog" v-if="addVisible">
-    <div class="content" v-if="addVisible">
+    <div class="content">
      <div class="div-operation"></div>
      <span class="text-operation">计划库</span>
    </div>
@@ -93,18 +99,22 @@
  // 初始化 ===========================================================

  onMounted(() => {
+    // 获得枚举
    getStateEnum();
-    // 计划表格
-    getTable();
-    // 穿梭框原始数据
-    getLeftPlan();
+    // 获得穿梭框 与 表格数据
+    reset();
  });
  // 全局变量
  const state = items();
+  // 获得任务状态枚举
  const getStateEnum = async () => {
    let enumData = await getEnum({ params: { enumType: 'PlanExecuteStatus' } });
    stateList.value = enumData.data;
  };
+  /**
+   * @method resetAll 刷新3个tab中的全部数据（修改计划，会影响tab1数据信息，生成tab3日志）
+   */
+  const emit = defineEmits(['resetAll']);

  // tab页部分 ========================================================

@@ -132,7 +142,15 @@
  // 计划启用/禁用事件
  const togglePlan = (state: number) => {
    dataSource.value.forEach((item: any) => {
+      // 执行中 无法修改为待执行
+      if (state == 1) {
+        if (item.executeStatus.value != 2) {
          item.executeStatus.value = state;
+        }
+        // 任何状态都可以修改为 暂停
+      } else {
+        item.executeStatus.value = state;
+      }
    });
  };

@@ -160,6 +178,9 @@
    if (row.executeStatus.value == 1) {
      return message.info('该数据已是待执行状态，无需再次修改');
    }
+    if (row.executeStatus.value == 2) {
+      return message.info('执行中的状态已被启用，无需修改');
+    }
    row.executeStatus.value = 1;
  };
  // 将对表格的修改统一发送
@@ -173,14 +194,21 @@
      .then((res) => {
        if (res.retcode == 0) {
          message.success('操作成功');
-          getTable();
-          getLeftPlan();
+          // 刷新数据
+          emit('resetAll');
        } else {
          message.info(res.msg);
        }
      });
  };

+  const reset = () => {
+    // 计划表格
+    getTable();
+    // 穿梭框原始数据
+    getLeftPlan();
+  };
+
  // tab页弹窗部分 ====================================================

  // 添加弹窗控制变量
@@ -204,7 +232,7 @@
        deviceType: 1,
      })
      .then((res) => {
-        let arr = [];
+        let arr: Array<Object> = [];
        res.data.forEach((item: any) => {
          arr.push({
            key: item.id,
@@ -231,14 +259,18 @@
    http.post(planManage.submitTransData, targetKeys.value).then(() => {
      message.success('添加成功');
      // 如果发送成功，则刷新表格
-      getTable();
-      getLeftPlan();
+      reset();
    });
  };

  const filterOption = (inputValue: string, option: any) => {
    return option.description.indexOf(inputValue) > -1;
  };
+
+  // 向外暴露方法
+  defineExpose({
+    reset,
+  });
 </script>
 <style lang="less" scoped>
  @import '../style/dialogStyle.less';
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
@@ -11,7 +11,7 @@
    </thead>
    <tbody>
      <tr
-        :style="{ color: row.ctrlResult == 0 ? 'red' : 'white' }"
+        :style="{ color: row.ctrlResult == 1 ? 'red' : 'white' }"
        v-for="(row, index) in dataSource"
        :key="index"
        @click="handleRowClick(row.id, index)"
@@ -20,7 +20,7 @@
        <td>{{ row.startTime }}</td>
        <td>{{ row.operationContent }}</td>
        <td>{{ row.createUser }}</td>
-        <td>{{ row.ctrlResult ? '成功' : '失败' }}</td>
+        <td>{{ row.ctrlResult ? '失败' : '成功' }}</td>
      </tr>
    </tbody>
  </table>
@@ -31,6 +31,7 @@
    show-size-changer
    :total="pagination.total"
    @change="getTable(true)" />
+  <div style="width: 100%; height: 40px"></div>

  <div class="out-dialog" :class="{ showDialog: logModalVisible }" v-if="logModalVisible">
    <div class="content">
@@ -54,9 +55,17 @@
            <div class="btn-item">
              <div class="left">控制模式</div>
              <div class="right">
-                <span>手动</span>
+                <span>{{
+                  item.autoStatusBefore.label.indexOf('模式') != -1
+                    ? item.autoStatusBefore.label.replace('模式', '')
+                    : item.autoStatusBefore.label
+                }}</span>
                <img src="/asset/image/bulbLogo/22406.png" alt="" />
-                <span>自动</span></div
+                <span>{{
+                  item.autoStatusAfter.label.indexOf('模式') != -1
+                    ? item.autoStatusAfter.label.replace('模式', '')
+                    : item.autoStatusAfter.label
+                }}</span></div
              >
            </div>
            <div class="btn-item">
@@ -163,6 +172,8 @@
  };
  // 刷新功能（右下角）
  const reset = () => {
+    trIndex.value = -1;
+    logModalVisible.value = false;
    pagination.value = {
      pageSize: 10,
      pageNum: 1,
@@ -172,13 +183,8 @@
  };
  // 点击日志行事件
  const handleRowClick = (id: any, index: any) => {
-    // 忽略无效点击
-    if (index === trIndex.value) {
-      return;
-    } else {
    trIndex.value = index;
    getLogDetail(id);
-    }
  };

  // 日志详情业务 ==================================================
@@ -197,7 +203,13 @@
      }
    });
  };
+  // 日志详情
  const cxList = ref([]);
+
+  // 向外暴露方法
+  defineExpose({
+    reset,
+  });
 </script>
 <style lang="less" scoped>
  @import '../style/dialogStyle.less';
--- a/hx-ai-intelligent/src/view/equipmentControl/style/color.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/style/color.less
@@ -1,3 +1,4 @@
+// 颜色变量
 :root {
  // 电梯 
  // 正常
--- a/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less
@@ -1,3 +1,4 @@
+// 设备群控 > 抽屉 > 控制面板 & 日志 的附加弹窗
 .out-dialog {
  position: fixed;
  right: 496px;
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
@@ -137,6 +137,7 @@
              title="此操作将会撤销修改"
              ok-text="确定"
              cancel-text="取消"
+              placement="bottomRight"
              @confirm="delBtn(item)"
              @cancel="changeCancel">
              <button class="cxbtn">撤销</button>
@@ -146,9 +147,9 @@
            <div class="btn-item">
              <div class="left">控制模式</div>
              <div class="right">
-                <span>手动</span>
+                <span>{{ item.stateBefore.autoStatus.label.replace('模式', '') }}</span>
                <img src="/asset/image/bulbLogo/22406.png" alt="" />
-                <span>自动</span></div
+                <span>{{ item.stateAfter.autoStatus.label.replace('模式', '') }}</span></div
              >
            </div>
            <div class="btn-item">
@@ -230,12 +231,13 @@
 </template>

 <script setup lang="ts">
-  import { ref, computed, onMounted } from 'vue';
+  import { ref, computed, onMounted, watch } from 'vue';
  import { DownOutlined, UpOutlined, StopOutlined } from '@ant-design/icons-vue';
-  import { message } from 'ant-design-vue';
+  import { message, Modal } from 'ant-design-vue';
  // 请求
  import { http } from '/nerv-lib/util/http';
  import { ventilating } from '/@/api/ventilatingSystem';
+  import { planManage } from '/@/api/planManage';
  // 全局变量
  import { items } from '/@/store/item';

@@ -247,12 +249,15 @@
    if (props.type == '排风扇') {
      url.getList = ventilating.getChangeList1;
      url.sendList = ventilating.sendChangeList1;
+      url.deviceType = 3;
    } else if (props.type == '风幕机') {
      url.getList = ventilating.getChangeList2;
      url.sendList = ventilating.sendChangeList2;
+      url.deviceType = 4;
    } else {
      url.getList = ventilating.getChangeList3;
      url.sendList = ventilating.sendChangeList3;
+      url.deviceType = 5;
    }
  });
  // 分区初始化，以 1-1 作为默认回路
@@ -266,6 +271,7 @@
  const url = {
    getList: '',
    sendList: '',
+    deviceType: 0,
  };

  // 与父组件的交互  ===================================================================
@@ -282,12 +288,24 @@
      type: String,
    },
  });
+
+  watch(
+    () => props.treeData,
+    (newValue) => {
+      // 重新为照明回路赋值
+      // buttons2.value = newValue[0].childList;
+    },
+    {
+      deep: true,
+    },
+  );
  /** 向上传递方法
   * @method changeArea 用于控制俯视图的选中状态
   * @method reset 用于重置按钮区
   * @method reload 用于刷新一次页面
+   * @method resetAll 刷新所有tab，对计划进行修改时，需刷新tab2与tab3
   */
-  const emit = defineEmits(['reset', 'reload']);
+  const emit = defineEmits(['reset', 'reload', 'resetAll']);

  // 照明回路业务 ======================================================================

@@ -613,14 +631,9 @@
      changeList.value.forEach((item: any) => {
        resetChangeList(item);
      });
-    }
-    changeList.value = [];
-    if (!reload) {
      lockList.value.forEach((item: any) => {
        resetLockList(item);
      });
-    }
-    lockList.value = [];
      // 默认选择第一个楼层
      let data = props.treeData[0];
      // 默认选中
@@ -628,6 +641,9 @@
      // 默认选中 1-1 分区 回路
      buttons2.value = data.childList;
      resetMode();
+    }
+    changeList.value = [];
+    lockList.value = [];
  };
  // 将已修改的禁用/启用状态改回
  const resetLockList = (item: any) => {
@@ -676,6 +692,55 @@
    if (!changeList.value.length && !lockList.value.length) {
      return message.info('未产生任何修改');
    }
+    http
+      .get(planManage.getRunningPlan, {
+        deviceType: url.deviceType,
+        projectId: state.projectId,
+        siteId: state.siteId,
+      })
+      .then((res) => {
+        // 如果有计划正在执行
+        if (res.data && res.data.length) {
+          // 此处框架本身存在问题，弹出层在本地环境无法关闭，暂时使用浏览器自带的confirm方法
+          // Modal.confirm({
+          //   title: '提示信息',
+          //   content: '有计划正在执行，点击"确定"将暂停当前计划',
+          //   onOk() {
+          //     return new Promise((resolve, reject) => {
+          //     });
+          //   },
+          //   onCancel() {  },
+          // });
+
+          let flag = window.confirm('有计划正在执行，点击"确定"将暂停当前计划');
+          if (flag) {
+            // 如果点击了确定，将先终止所有进行中的计划
+            http
+              .post(url.getList, {
+                projectId: state.projectId,
+                siteId: state.siteId,
+                lockList: [],
+                sceneList: [],
+              })
+              .then((res) => {
+                console.log(res, '成功');
+                // 如果重置成功，则获取修改前后对比数据
+                if (res.retcode == 0) {
+                  sendChangeList();
+                  // 未成功提示
+                } else {
+                  message.error('关闭进行中的任务操作失败，请重新尝试');
+                }
+              });
+          }
+          // 没有计划正在执行，则直接请求
+        } else {
+          sendChangeList();
+        }
+      });
+  };
+  // 提交控制场景 与 禁用/启用 修改
+  const sendChangeList = () => {
    http
      .post(url.getList, {
        sceneList: changeList.value,
@@ -684,11 +749,11 @@
        siteId: state.siteId,
      })
      .then((res) => {
-        if (res.msg === 'success') {
+        if (res.retcode == 0) {
          diffList.value = res.data;
          executeVisible.value = true;
        } else {
-          message.warning('获取修改内容失败');
+          message.error('获取修改内容失败');
        }
      })
      .catch(() => {});
@@ -736,9 +801,22 @@
        projectId: state.projectId,
        siteId: state.siteId,
      })
-      .then(() => {
-        emit('reload');
+      .then((res) => {
+        let data = res.data;
+        // 修改请求发送了，但操作时产生了失败结果
+        if (res.retcode != 0) {
+          // 直接提示并跳出
+          return message.warning(data.msg);
+        }
+        // 所有修改均生效
+        if (data.allSucceed) {
+          message.success('修改完成');
+          // allSucceed不为true，则至少有一条数据修改失败
+        } else {
+          message.info(`${data.successList.length}条修改成功，${data.failList.length}条修改失败`);
+        }
        refresh(true);
+        emit('resetAll');
      })
      .catch(() => {});
  };
@@ -759,6 +837,8 @@
  defineExpose({
    // 回路切换
    changeLine,
+    // 重置当前选择
+    refresh,
  });
 </script>
 <style lang="less" scoped>
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue
@@ -11,7 +11,7 @@
    </thead>
    <tbody>
      <tr
-        :style="{ color: row.ctrlResult == 0 ? 'red' : 'white' }"
+        :style="{ color: row.ctrlResult == 1 ? 'red' : 'white' }"
        v-for="(row, index) in dataSource"
        :key="index"
        @click="handleRowClick(row.id, index)"
@@ -20,7 +20,7 @@
        <td>{{ row.startTime }}</td>
        <td>{{ row.operationContent }}</td>
        <td>{{ row.createUser }}</td>
-        <td>{{ row.ctrlResult ? '成功' : '失败' }}</td>
+        <td>{{ row.ctrlResult ? '失败' : '成功' }}</td>
      </tr>
    </tbody>
  </table>
@@ -31,6 +31,7 @@
    show-size-changer
    :total="pagination.total"
    @change="getTable(true)" />
+  <div style="width: 100%; height: 40px"></div>

  <div class="out-dialog" :class="{ showDialog: logModalVisible }" v-if="logModalVisible">
    <div class="content">
@@ -54,9 +55,17 @@
            <div class="btn-item">
              <div class="left">控制模式</div>
              <div class="right">
-                <span>手动</span>
+                <span>{{
+                  item.autoStatusBefore.label.indexOf('模式') != -1
+                    ? item.autoStatusBefore.label.replace('模式', '')
+                    : item.autoStatusBefore.label
+                }}</span>
                <img src="/asset/image/bulbLogo/22406.png" alt="" />
-                <span>自动</span></div
+                <span>{{
+                  item.autoStatusAfter.label.indexOf('模式') != -1
+                    ? item.autoStatusAfter.label.replace('模式', '')
+                    : item.autoStatusAfter.label
+                }}</span></div
              >
            </div>
            <div class="btn-item">
@@ -193,6 +202,8 @@
  };
  // 刷新功能（右下角）
  const reset = () => {
+    trIndex.value = -1;
+    logModalVisible.value = false;
    // state.setLoading(true);
    pagination.value = {
      pageSize: 10,
@@ -203,13 +214,8 @@
  };
  // 点击日志行事件
  const handleRowClick = (id: any, index: any) => {
-    // 忽略无效点击
-    if (index === trIndex.value) {
-      return;
-    } else {
    trIndex.value = index;
    getLogDetail(id);
-    }
  };

  // 日志详情业务 ==================================================
@@ -229,6 +235,11 @@
    });
  };
  const cxList = ref([]);
+
+  // 向外暴露方法
+  defineExpose({
+    reset,
+  });
 </script>
 <style lang="less" scoped>
  @import '../../style/dialogStyle.less';
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue
@@ -52,6 +52,7 @@
            title="此操作将移除该数据"
            ok-text="确定"
            cancel-text="取消"
+            placement="topRight"
            @confirm="deletePlan(row)">
            <div class="tabDelete">删除</div>
          </a-popconfirm>
@@ -60,7 +61,7 @@
    </tbody>
  </table>
  <div class="out-dialog" v-if="addVisible">
-    <div class="content" v-if="addVisible">
+    <div class="content">
      <div class="div-operation"></div>
      <span class="text-operation">计划库</span>
    </div>
@@ -126,6 +127,11 @@
    }
  });

+  /**
+   * @method resetAll 刷新3个tab中的全部数据（修改计划，会影响tab1数据信息，生成tab3日志）
+   */
+  const emit = defineEmits(['resetAll']);
+
  // tab页部分 ========================================================

  // 设置枚举的颜色 与 文本
@@ -150,7 +156,15 @@
  // 计划启用/禁用事件
  const togglePlan = (state: number) => {
    dataSource.value.forEach((item: any) => {
+      // 执行中 无法修改为待执行
+      if (state == 1) {
+        if (item.executeStatus.value != 2) {
          item.executeStatus.value = state;
+        }
+        // 任何状态都可以修改为 暂停
+      } else {
+        item.executeStatus.value = state;
+      }
    });
  };

@@ -178,6 +192,9 @@
    if (row.executeStatus.value == 1) {
      return message.info('该数据已是待执行状态，无需再次修改');
    }
+    if (row.executeStatus.value == 2) {
+      return message.info('执行中的状态已被启用，无需修改');
+    }
    row.executeStatus.value = 1;
  };
  // 将对表格的修改统一发送
@@ -187,13 +204,24 @@
        url + `?projectId=${state.projectId}${state.siteId ? `&siteId=${state.siteId}` : ''}`,
        dataSource.value,
      )
-      .then(() => {
+      .then((res) => {
+        if (res.retcode == 0) {
          message.success('操作成功');
-        getTable();
-        getLeftPlan();
+          // 刷新数据
+          emit('resetAll');
+        } else {
+          message.info(res.msg);
+        }
      });
  };

+  const reset = () => {
+    // 计划表格
+    getTable();
+    // 穿梭框原始数据
+    getLeftPlan();
+  };
+
  // tab页弹窗部分 ====================================================

  // 添加弹窗控制变量
@@ -244,14 +272,18 @@
    http.post(planManage.submitTransData, targetKeys.value).then(() => {
      message.success('添加成功');
      // 如果发送成功，则刷新表格
-      getTable();
-      getLeftPlan();
+      reset();
    });
  };

  const filterOption = (inputValue: string, option: any) => {
    return option.description.indexOf(inputValue) > -1;
  };
+
+  // 向外暴露方法
+  defineExpose({
+    reset,
+  });
 </script>
 <style lang="less" scoped>
  @import '../../style/dialogStyle.less';
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
@@ -137,13 +137,17 @@
      </div>
      <a-tabs v-model:activeKey="activeKey">
        <a-tab-pane key="1" tab="控制面板">
-          <fanControl :treeData="treeData" :type="`排风扇`" />
+          <fanControl
+            ref="tabs1Ref"
+            @reset-all="resetDrawer"
+            :treeData="treeData"
+            :type="`排风扇`" />
        </a-tab-pane>
        <a-tab-pane key="2" tab="计划列表" force-render>
-          <fanPlant :status="stateList" :type="3" />
+          <fanPlant ref="tabs2Ref" @reset-all="resetDrawer" :status="stateList" :type="3" />
        </a-tab-pane>
        <a-tab-pane key="3" tab="日志">
-          <fanLog :type="3" />
+          <fanLog ref="tabs3Ref" @reset-all="resetDrawer" :type="3" />
        </a-tab-pane>
      </a-tabs>
    </a-drawer>
@@ -194,13 +198,17 @@
      </div>
      <a-tabs v-model:activeKey="activeKey">
        <a-tab-pane key="1" tab="控制面板">
-          <fanControl :treeData="treeData" :type="`风幕机`" />
+          <fanControl
+            ref="tabs1Ref"
+            @reset-all="resetDrawer"
+            :treeData="treeData"
+            :type="`风幕机`" />
        </a-tab-pane>
        <a-tab-pane key="2" tab="计划列表" force-render>
-          <fanPlant :status="stateList" :type="4" />
+          <fanPlant ref="tabs2Ref" @reset-all="resetDrawer" :status="stateList" :type="4" />
        </a-tab-pane>
        <a-tab-pane key="3" tab="日志">
-          <fanLog :type="4" />
+          <fanLog ref="tabs3Ref" @reset-all="resetDrawer" :type="4" />
        </a-tab-pane>
      </a-tabs>
    </a-drawer>
@@ -250,13 +258,17 @@
      </div>
      <a-tabs v-model:activeKey="activeKey">
        <a-tab-pane key="1" tab="控制面板">
-          <fanControl :treeData="treeData" :type="`电动窗`" />
+          <fanControl
+            ref="tabs1Ref"
+            @reset-all="resetDrawer"
+            :treeData="treeData"
+            :type="`电动窗`" />
        </a-tab-pane>
        <a-tab-pane key="2" tab="计划列表" force-render>
-          <fanPlant :status="stateList" :type="5" />
+          <fanPlant ref="tabs2Ref" @reset-all="resetDrawer" :status="stateList" :type="5" />
        </a-tab-pane>
        <a-tab-pane key="3" tab="日志">
-          <fanLog :type="5" />
+          <fanLog ref="tabs3Ref" @reset-all="resetDrawer" :type="5" />
        </a-tab-pane>
      </a-tabs>
    </a-drawer>
@@ -351,6 +363,15 @@
  const toggleDrawer = () => {
    visible.value = !visible.value;
  };
+  // 当前设备的请求URL
+  let url = '';
+  // 刷新当前的树形结构数据
+  const reload = () => {
+    http.get(url, { projectId: state.projectId, siteId: state.siteId }).then((res) => {
+      const data = res.data;
+      treeData.value = data[0].childList;
+    });
+  };

  // 抽屉中tab1 - 控制面板 =================================================================

@@ -359,7 +380,6 @@
  const getTree = async (type: number, index: number) => {
    // 切换时默认选择tab1
    activeKey.value = '1';
-    let url;
    if (type == 1) {
      url = ventilating.getTree1;
    } else if (type == 2) {
@@ -489,93 +509,33 @@
    },
  ]);
  // 排风扇
-  const fanData = ref([
-    // {
-    //   title: '排风扇',
-    //   styleText: { left: '43.2%', bottom: '77.8%' },
-    //   type: 'fan',
-    //   lineType: '1',
-    // },
-    // {
-    //   title: '排风扇',
-    //   styleText: { left: '50%', bottom: '77.8%' },
-    //   type: 'fan',
-    //   lineType: '2',
-    // },
-    // {
-    //   title: '排风扇',
-    //   styleText: { left: '41.2%', bottom: '27.8%' },
-    //   type: 'fan',
-    //   lineType: '1',
-    // },
-    // {
-    //   title: '排风扇',
-    //   styleText: { left: '51.2%', bottom: '27.8%' },
-    //   type: 'fan',
-    //   lineType: '2',
-    // },
-  ]);
+  const fanData = ref([]);
  // 风幕机
-  const airCurtainData = ref([
-    // {
-    //   title: '风幕机',
-    //   styleText: { left: '38%', bottom: '57.8%' },
-    //   type: 'airCurtain',
-    // },
-    // {
-    //   title: '风幕机',
-    //   styleText: { left: '58.5%', bottom: '57.3%' },
-    //   type: 'airCurtain',
-    // },
-    // {
-    //   title: '风幕机',
-    //   styleText: { left: '64.2%', bottom: '22.8%' },
-    //   type: 'airCurtain',
-    // },
-  ]);
+  const airCurtainData = ref([]);
  // 电动窗
-  const windowData = ref([
-    // {
-    //   title: '电动窗1',
-    //   styleText: { left: '32%', bottom: '28%' },
-    //   type: 'window',
-    // },
-    // {
-    //   title: '电动窗2',
-    //   styleText: { left: '33.5%', bottom: '42.8%' },
-    //   type: 'window',
-    // },
-    // {
-    //   title: '电动窗3',
-    //   styleText: { left: '35%', bottom: '57.8%' },
-    //   type: 'window',
-    // },
-    // {
-    //   title: '电动窗4',
-    //   styleText: { left: '36.5%', bottom: '72.8%' },
-    //   type: 'window',
-    // },
-    // {
-    //   title: '电动窗5',
-    //   styleText: { left: '66%', bottom: '28%' },
-    //   type: 'window',
-    // },
-    // {
-    //   title: '电动窗6',
-    //   styleText: { left: '64%', bottom: '42.8%' },
-    //   type: 'window',
-    // },
-    // {
-    //   title: '电动窗7',
-    //   styleText: { left: '62%', bottom: '57.8%' },
-    //   type: 'window',
-    // },
-    // {
-    //   title: '电动窗8',
-    //   styleText: { left: '60%', bottom: '72.8%' },
-    //   type: 'window',
-    // },
-  ]);
+  const windowData = ref([]);
+
+  // 当其中一个tab产生了数据修改，可以调用该方法重置所有tab
+  const resetDrawer = () => {
+    // tab1重置
+    reload();
+    tabs1Ref.value.refresh();
+    // tab2 tab3 可能未加载
+    try {
+      // tab2重置
+      tabs2Ref.value.reset();
+    } catch {}
+    try {
+      // tab3重置
+      tabs3Ref.value.reset();
+    } catch {}
+  };
+  // 抽屉tab1组件的引用
+  const tabs1Ref = ref();
+  // 抽屉tab2组件的引用
+  const tabs2Ref = ref();
+  // 抽屉tab3组件的引用
+  const tabs3Ref = ref();
  onMounted(() => {
    // 获得枚举
    getStateEnum();