Merge branch 'feature/zs-export' into 'testing/shield-upload'

导入屏蔽人员

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!382

src/utils/education/educationApi.js

@@ -52,7 +52,7 @@ export const uploadShieldExcel = (data, projectId) => {
         headers: {        
             token: localStorage.getItem('storageToken'),
         },
-        url: getBaseUrl('black/setPeopleBlackStatus/batch/' + projectId),
+        url: getBaseUrl('aggregate/black/setPeopleBlackStatus/batch/' + projectId),
         method: 'post',
         data: data,
         description: '上传excel文件',

src/views/education/item-shield.vue

@@ -329,6 +329,9 @@ export default {
             this.isLoading = false;
             this.$message.error('导入失败');
           }
+        } else {
+          this.isLoading = false;
+          this.$message.error(res.message);
         }
       }).catch(error => {
         this.isLoading = false;