解决大文件上传带来的git冲突

src/components/SearchBar/index.vue

@@ -174,13 +174,9 @@ export default {
 };
 </script>
 
-<<<<<<< HEAD
 <style lang="scss" scoped>
 
 ::v-deep .el-form-item{
   margin-bottom: 0;
 }
-=======
-<style>
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
 </style>
\ No newline at end of file

src/styles/index.scss

@@ -63,7 +63,3 @@ div:focus {
 .app-container {
   padding: 40px;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee

src/utils/index.js

@@ -220,7 +220,6 @@ export function formatNum(num) {
     }
 }
 
-<<<<<<< HEAD
 
 // 格式化文件大小
 export function renderSize(value) {
@@ -235,5 +234,3 @@ export function renderSize(value) {
   size = size.toFixed(2);//保留的小数位数
   return size + unitArr[index];
 }
-=======
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee

src/views/display/index.vue

@@ -2,18 +2,13 @@
   <div class="app-container">
     <div class="top-bar">
       <SearchBar :config="searchConfig" @search="search" @reset="reset" />
-<<<<<<< HEAD
       <!-- <el-button
-=======
-      <el-button
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
         type="primary"
         @click.native="handleOperation({ type: 'add' })"
         icon="el-icon-plus"
       >
         发布</el-button
       >
-<<<<<<< HEAD
     </div> -->
       <!-- <el-button type="primary" @click.native="handleCopy">复制</el-button> -->
     </div>
@@ -63,10 +58,6 @@
         </el-upload>
       </div>
     </div>
-=======
-      <!-- <el-button type="primary" @click.native="handleCopy">复制</el-button> -->
-    </div>
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
     <TablePage
       :data="list.records"
       :tableTitle="tableTitle"
@@ -144,7 +135,6 @@
       @handleCopySelect="handleCopySelect"
       :list="list"
     /> -->
-<<<<<<< HEAD
     <ImportRecordDialog
       :visible="importRecordVisible"
       @reload="loadData"
@@ -158,8 +148,6 @@
       @handleCancel="handleMultiUploadCancel"
     />
 
-=======
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
     <el-image-viewer
       v-if="imgViewerVisible"
       :on-close="closeImgViewer"
@@ -180,7 +168,6 @@ import {
 } from "@/api/display";
 import InfoEditDialog from "./components/InfoEditDialog";
 import PreviewDialog from "./components/PreviewDialog";
-<<<<<<< HEAD
 import ImportRecordDialog from "./components/ImportRecordDialog";
 // import CopyDialog from "./components/CopyDialog";
 import SearchBar from "@/components/SearchBar";
@@ -189,12 +176,6 @@ import { mapGetters } from "vuex";
 import { themeTypeCode } from "./contants";
 import { getToken } from "@/utils/auth";
 import { importZip } from "@/utils/file";
-=======
-import CopyDialog from "./components/CopyDialog";
-import SearchBar from "@/components/SearchBar";
-import { mapGetters } from "vuex";
-import { themeTypeCode } from "./contants";
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
 export default {
   components: {
     TablePage,
@@ -202,13 +183,9 @@ export default {
     InfoEditDialog,
     PreviewDialog,
     SearchBar,
-<<<<<<< HEAD
     // CopyDialog,
     ImportRecordDialog,
     UploadListDialog,
-=======
-    CopyDialog,
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
     "el-image-viewer": () =>
       import("element-ui/packages/image/src/image-viewer"),
   },
@@ -275,7 +252,6 @@ export default {
       displayTypes: {},
       curPreviewObj: {}, //当前预览的对象
       currentPageIds: [], //当前的id数组，用于给详情页切换用
-<<<<<<< HEAD
       importZipUrl: process.env.VUE_APP_BASE_API + "/bizImport/importZip",
       headers: {
         authorization: getToken(),
@@ -286,8 +262,6 @@ export default {
       uploadCount: 0, //处于上传中的文件数量，当等于fileList的时候就关闭弹窗，请求完毕一个就++
       cancelUploadArr: [], //保存每个文件上传接口对应的取消请求的函数[fn,fn,fn...]
       isUpLoading: false,
-=======
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
     };
   },
   computed: {
@@ -316,7 +290,6 @@ export default {
     await this.$store.dispatch("dict/getDictList", ["displayType"]);
     this.loadData();
   },
-<<<<<<< HEAD
 
   //watch部分
   watch: {
@@ -335,8 +308,6 @@ export default {
       }
     },
   },
-=======
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
   methods: {
     async search(form) {
       var params = {
@@ -399,7 +370,6 @@ export default {
             this.$message.success("删除成功！");
           }
           break;
-<<<<<<< HEAD
         case "multiAdd":
           // debugger
           // this.multiUploadVisible = true;
@@ -515,11 +485,6 @@ export default {
       this.filesList = [];
     },
 
-=======
-      }
-    },
-
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
     async reloadDisplay(exhibitionId) {
       this.$refs.InfoEditDialog.submitLoading = true;
       this.$refs.InfoEditDialog.loadingText = "加载中...";
@@ -607,7 +572,6 @@ export default {
     themeTypeCode(code) {
       return themeTypeCode[code];
     },
-<<<<<<< HEAD
 
     // // 文件个数超出
     // handleExceed() {
@@ -680,8 +644,6 @@ export default {
     handleCancelAllUpLoad() {
       this.cancelUploadArr.forEach((cancelCallBack) => cancelCallBack()); //批量取消上传
     },
-=======
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
   },
 };
 </script>
@@ -690,7 +652,6 @@ export default {
 .top-bar {
   display: flex;
   justify-content: space-between;
-<<<<<<< HEAD
   flex-direction: column;
   height: 68px;
 }
@@ -709,9 +670,5 @@ export default {
   .upload-button {
     margin: 0 10px;
   }
-=======
-  align-items: center;
-  margin-bottom: 10px;
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
 }
 </style>
\ No newline at end of file

src/views/literature/index.vue

@@ -224,26 +224,16 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-<<<<<<< HEAD
     margin-bottom: 20px;
-=======
-    margin-bottom: 10px;
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
   }
 
   .pagination {
     margin: 16px;
   }
 
-<<<<<<< HEAD
   // .el-button {
   //   margin-bottom: 22px;
   // }
-=======
-  .el-button {
-    margin-bottom: 22px;
-  }
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
 
   ::v-deep .el-card__header {
     padding: 10px 20px;

src/views/log/index.vue

@@ -243,11 +243,8 @@ export default {
 .pagination {
   margin: 16px;
 }
-<<<<<<< HEAD
 
 ::v-deep .el-form-item{
   margin-bottom: 20px;
 }
-=======
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
 </style>
\ No newline at end of file

src/views/museum/index.vue

@@ -356,11 +356,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-<<<<<<< HEAD
   margin-bottom: 20px;
-=======
-  margin-bottom: 10px;
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
 }
 .pagination {
   margin: 16px;

src/views/product/index.vue

@@ -301,11 +301,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-<<<<<<< HEAD
   margin-bottom: 20px;
-=======
-  margin-bottom: 10px;
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
 }
 .pagination {
   margin: 16px;

src/views/user/index.vue

@@ -267,11 +267,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: flex-end;
-<<<<<<< HEAD
   margin-bottom: 20px;
-=======
-  margin-bottom: 10px;
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
 }
 
 .pagination {

src/views/virtual/index.vue

@@ -295,11 +295,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-<<<<<<< HEAD
   margin-bottom: 20px;
-=======
-  margin-bottom: 10px;
->>>>>>> f07b1c1b191bef418ce077a9c7b4d53fd7b72cee
 }
 .pagination {
   margin: 16px;