fix: 变电站负荷

src/views/modules/load-data/components/add-or-update.vue

@@ -3,11 +3,52 @@
   <el-dialog
     title="明细"
     :visible.sync="open"
-    width="1000px"
     append-to-body
+    width="700px"
     destroy-on-close
   >
-    <el-form ref="ruleForm" :model="ruleForm" label-width="120px">
+    <el-descriptions labelStyle="width: 160px;" title="" column="2" border>
+      <el-descriptions-item label="变电站名称">{{
+        ruleForm.subNm
+      }}</el-descriptions-item>
+      <el-descriptions-item label="归属县旗">{{
+        ruleForm.compNm
+      }}</el-descriptions-item>
+      <el-descriptions-item label="电压等级">{{
+        ruleForm.voltageLevel
+      }}</el-descriptions-item>
+      <el-descriptions-item label="主变台数">{{
+        ruleForm.mainNum
+      }}</el-descriptions-item>
+      <el-descriptions-item label="主变容量(MVA)">{{
+        ruleForm.mainCapacity
+      }}</el-descriptions-item>
+      <el-descriptions-item label="采集日期">{{
+        ruleForm.dataDate
+      }}</el-descriptions-item>
+      <el-descriptions-item label="当日温度(℃)">{{
+        ruleForm.temperature
+      }}</el-descriptions-item>
+      <el-descriptions-item label="最大负荷(MW)">{{
+        ruleForm.peakLoad
+      }}</el-descriptions-item>
+      <el-descriptions-item label="基础负荷(MW)">{{
+        ruleForm.baseLoad
+      }}</el-descriptions-item>
+      <el-descriptions-item label="电采暖负荷(MW)">{{
+        ruleForm.electricHeatingLoad
+      }}</el-descriptions-item>
+      <el-descriptions-item label="用户数">{{
+        ruleForm.usersNum
+      }}</el-descriptions-item>
+      <el-descriptions-item label="平房区用户数">{{
+        ruleForm.pingfangUsers
+      }}</el-descriptions-item>
+       <el-descriptions-item span="2" label="平房区已接入电采暖容量(MWA)">{{
+        ruleForm.pingfangElectricHeatingCapacity
+      }}</el-descriptions-item>
+    </el-descriptions>
+    <el-form ref="ruleForm" :model="ruleForm" label-width="120px" v-if="false">
       <el-row>
         <el-col :span="12">
           <el-form-item label="变电站名称" prop="subNm">

src/views/modules/load-data/components/stationLoadList.vue

@@ -366,7 +366,7 @@
     <!-- 添加/修改页面  将父组件的search方法传递给子组件-->
     <add-or-update :parent="this" ref="addOrUpdate"></add-or-update>
     <!-- 上传文件弹窗 -->
-    <upload-modal ref="uploadModal"></upload-modal>
+    <upload-modal :parent="this" ref="uploadModal"></upload-modal>
   </div>
 </template>
 

src/views/modules/load-data/components/uploadModal.vue

@@ -37,24 +37,15 @@
           :on-exceed="handleExceed"
           :before-upload="beforeUpload"
           :file-list="fileList"
+          :auto-upload="false"
+          accept=".xls,.xlsx"
         >
-          <el-button slot="trigger" size="small" type="primary"
-            >点击上传</el-button
+          <el-button style="width: 200px;" slot="trigger" size="small" type=""
+            >点击选择</el-button
           >
-          <!-- <div class="el-upload__text">
-            <el-button
-              type="primary"
-              size="small"
-              >点击选择</el-button
-            >
-            
-          </div> -->
         </el-upload>
       </el-form-item>
     </el-form>
-
-    <!-- 点击确定上传文件 -->
-
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="onSubmit" :loading="loading"
@@ -72,7 +63,7 @@ export default {
   data() {
     return {
       loading: false,
-      fileList: [], //深拷贝，判断重名及第一步时的文件信息展示f
+      fileList: [], 
       form: {
         compNm: "",
         fileInfo: undefined,
@@ -81,6 +72,7 @@ export default {
       compList: [],
     };
   },
+  props: ["parent"],
   methods: {
     // 获取公司列表
     async getCompList() {
@@ -130,14 +122,12 @@ export default {
     },
     // 处理文件选择操作
     handleFileChange(file, fileList) {
-      console.log(file, "file");
       this.form.fileInfo = file;
     },
     // 处理文件上传操作
     handleFileUpload() {
-      console.log(this.form.fileInfo, "sss");
       const formData = new FormData();
-      formData.append("file", this.form.fileInfo);
+      formData.append("file", this.form.fileInfo.raw);
       formData.append("compNm", this.form.compNm);
       this.loading = true;
       // 调用后端服务器的接口
@@ -150,9 +140,16 @@ export default {
         data: formData,
       })
         .then((resp) => {
-          this.$message.success("文件上传成功");
-          this.$refs.upload.clearFiles();
-          this.cancel();
+          if (resp.data.code === 0) {
+            this.$message.success("文件上传成功");
+            this.$refs.upload.clearFiles();
+            // 上传成功后，刷新数据列表
+            this.parent.search();
+            this.cancel();
+          } else {
+            this.$message.error(resp.data.msg);
+            this.$refs.upload.clearFiles();
+          }
         })
         .catch((e) => {
           this.$message.error(e.message);
@@ -165,14 +162,11 @@ export default {
     // 提交表单
     onSubmit() {
       this.$refs.ruleForm.validate((valid) => {
-        if (valid) {
-          if (this.form.fileInfo) {
-            this.handleFileUpload();
-          } else {
-            this.$message.error("请选择文件");
-          }
+        if (!valid) return;
+        if (this.form.fileInfo) {
+          this.handleFileUpload();
         } else {
-          this.$message.error("请选择归属县旗");
+          this.$message.error("请选择文件");
         }
       });
     },