能源消耗完善

src/views/AlarmPage/AlarmStatusPage.vue

@@ -509,6 +509,24 @@ function getImgUrl(scope, item) {
 console.log("AlarmInfo.value:::", AlarmInfo.value);
 
 // 报警参数设置
+// 是否显示该按钮
+//报警弹窗
+const userId = ref();
+const roleIds = ref();
+//获取用户信息
+function getuser() {
+  var user = store.getters.getUserInfo();
+  console.log("user================>", user);
+  console.log("user.enterpriseId================>", user.enterpriseId);
+  if (user) {
+    enterpriseId.value = user.enterpriseId;
+    userId.value = user.userId;
+    roleIds.value = user.roleId;
+  }
+}
+
+console.log("userId=========>", userId.value);
+console.log("roleIds=========>", roleIds.value);
 let cnNames_before = ref([])
 let cnNames_after = ref([])
 console.log("---------------------AlarmInfo.value:", AlarmInfo.value);
@@ -593,6 +611,7 @@ const rules = reactive({
 
 
 
+
 let newType = ref(0)
 watchEffect(() => {
   console.log("监听：：：：", type.value);

src/views/SchedulingPage/ConfigBoilerPage.vue

@@ -282,6 +282,9 @@ function getSupplys() {
           let c = [];
           center.supplyList.forEach((supply) => {
             let chi = [];
+            // if(supplyId === "b354f45b-23e5-42be-a210-0fb92394f457") {
+
+            // }
             supply.transferList.forEach((unit) => {
               options.push({ value: unit.unitId, label: unit.unitName });
             });
@@ -292,7 +295,7 @@ function getSupplys() {
       }
     });
   }
-  // console.log("遍历的options:", options);
+  console.log("遍历的options===========>:", options);
 }
 onMounted(() => {
   getListData();

src/views/SchedulingPage/EnergyManagePage.vue

@@ -298,12 +298,25 @@ onMounted(() => {
         </th>
       </tr>
     </table>
+
+
     <el-table :data="tableData" style="width: 100%;font-size: 12px;color: #181818;"
       :header-cell-style="{ color: '#225475', backgroundColor: '#B8CFEE', 'text-align': 'center', height: '40px', padding: '0px', border: '1px solid #99bbe8' }"
       :cell-style="{ 'text-align': 'center', padding: '0px' }" :row-style="{ height: '30px', padding: '0px' }" border
-      stripe>
-      <el-table-column v-for="item in tableLabel" :key="item.prop" :width="item.width ? item.width : 150"
-        :prop="item.prop" :label="item.label" />
+      stripe max-height="633">
+      <el-table-column prop="allowPagingId" label="序号" />
+      <el-table-column prop="supplyName" label="名称" />
+      <el-table-column prop="energyType" property="energyType" label="能源类型">
+        <template #default="scope">
+          <span v-if="scope.row.energyType == '0'">非节能</span>
+          <span v-if="scope.row.energyType == '1'">一步节能</span>
+          <span v-if="scope.row.energyType == '2'">二步节能</span>
+          <span v-if="scope.row.energyType == '3'">三步节能</span>
+          <span v-if="scope.row.energyType == '4'">四步节能</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="record" label="用度" />
+      <el-table-column prop="recordDate" label="用度日期" />
       <el-table-column fixed="right" label="操作" min-width="140">
         <template #default="scope">
           <el-button link type="primary" size="small" @click="handleEdit(scope.row)">
@@ -441,6 +454,12 @@ table td {
   padding: 5px 10px;
 }
 
+// 固定表头
+.el-table__body-wrapper.is-scrolling-none {
+  overflow-y: auto;
+  max-height: calc(100vh - 457px); //table-固定头部的高度
+}
+
 
 .dialog-footer {
   text-align: center;
@@ -450,14 +469,11 @@ table td {
 
 .el-table__header th {
   height: 50px;
-  /* 调整表头的高度 */
   line-height: 50px;
-  /* 使文本垂直居中 */
 }
 
 .el-table__header th .cell {
   font-size: 14px;
-  /* 调整字体大小 */
 }
 
 //鼠标所在行的颜色