Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/layouts/default/header/components/weatherBroadcast.vue

@@ -7,7 +7,7 @@
     </a-badge> -->
       <div style="display: flex; flex-direction: row" class="btn-header">
         <img :src="parseWeatherData(weatherObj.text)" class="weather-icon" />
-        <span class="unit">{{ weatherObj.pressure }}&nbsp;hPa</span>
+        <span class="unit">{{ weatherObj.pressure }}hPa</span>
         <FileSearchOutlined style="font-size: 18px; color: #fff; line-height: 50px" />
       </div>
     </div>

src/views/vent/performance/fileDetail/index.vue

@@ -107,7 +107,7 @@
           <JDictSelectTag v-model:value="formState.fileType" placeholder="请选择文件类型" dictCode="file_type" style="width: 260px" />
         </a-form-item>
         <a-form-item label="文件上传">
-          <a-upload :before-upload="beforeUpload" @remove="handleRemove" :multiple="false" :file-list="fileList">
+          <a-upload :custom-request="() => {}" :before-upload="beforeUpload" @remove="handleRemove" :multiple="false" :file-list="fileList">
             <a-button type="primary" preIcon="ant-design:cloud-upload-outlined">选择文件</a-button>
           </a-upload>
         </a-form-item>
@@ -309,12 +309,14 @@
       formData.append('isApprove', formState.isApprove);
       formData.append('fileType', formState.fileType);
       formData.append('filePerm', formState.filePerm);
-      uploadApi(formData).then(({ code, message }) => {
-        if (code !== 200) {
-          createMessage.error(message);
+      uploadApi(formData).then((result) => {
+        // 上传成功后result是字符串，失败则是对象，意味着只要存在code就是失败了
+        if (result.code) {
+          createMessage.error(result.message);
         } else {
           alive.value = new Date().getTime();
           visible.value = false;
+          createMessage.success(result);
         }
       });
     }