1

src/views/board.vue

@@ -331,28 +331,6 @@
             order: '5',
           }"
         >
-          <!-- <div :style="{ width: 'calc(33.33% - 8px)', margin: '0', alignItems: 'center', color: '#fff', flex: 'none', display: 'flex' }">
-            <div :style="{ color: '#3f83f8', width: '100px', textAlign: 'right' }">归属县旗</div>
-            <el-select
-              class="comp-select"
-              :style="{
-                border: '1px solid #3f83f8',
-                padding: '0 10px',
-                margin: '0 0 0 10px',
-                color: '#3f83f8',
-                background: 'none',
-                width: 'calc(100% - 100px)',
-                lineHeight: '30px',
-                height: '30px',
-              }"
-              v-model="ycForm.compId"
-              placeholder="归属县旗"
-              @change="getYcSubList"
-              clearable
-            >
-              <el-option v-for="item in ycCompList" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </div> -->
           <div :style="{ width: 'calc(30.33% - 8px)', margin: '0', alignItems: 'center', color: '#fff', flex: 'none', display: 'flex' }">
             <div :style="{ color: '#3f83f8', width: '100px', textAlign: 'right' }">变电站</div>
             <el-select
@@ -458,13 +436,15 @@
           >
             立即预测
           </div>
+          <div v-if="ycObj" style="display: flex; gap: 10px; color: #fff; border: 1px solid #3f83f8; padding: 5px; border-radius: 5px">
+            <div><span>用户数:</span>{{ ycObj?.predictedTotalUserCount || 0 }}</div>
+            <div><span>电采暖用户数:</span>{{ ycObj?.predictedHeatingUserCount || 0 }}</div>
+            <div><span>基础负荷:</span>{{ ycObj?.predictedBaseLoad || 0 }}</div>
+            <div><span>电采暖负荷:</span>{{ ycObj?.predictedHeatingLoad || 0 }}</div>
+          </div>
         </div>
       </div>
-      <div v-if="ycObj">
-        <div><span>电采暖用户数:</span>{{ ycObj?.elecHeatingUserNum || 0 }}</div>
-        <div><span>基础负荷:</span>{{ ycObj?.baseLoad || 0 }}</div>
-        <div><span>电采暖负荷:</span>{{ ycObj?.elecHeatingLoad || 0 }}</div>
-      </div>
+
       <div :style="{ width: '28%', padding: '0', flexWrap: 'wrap', flexDirection: 'column', display: 'flex', gap: '10px' }">
         <div class="echarts3">
           <div
@@ -3375,6 +3355,7 @@ export default {
           this.ycObj = data.data;
           this.$message.success(data.msg);
         } else {
+          this.ycObj = null;
           this.$message.error(data.msg);
         }
       });