1127

src/components/pagination/pagination.vue

@@ -16,7 +16,7 @@
 //<pagination @pagesize="pagesizeFun" :total="total" @currentPage="currentPageFun"></pagination>
 export default {
   name: "pagination",
-  props: ["total","pageNum","pageSize", 'pageSizes'],
+  props: ["total","pageNum", "pageSize", 'pageSizes'],
   data() {
     return {
       listQuery: {

src/views/submission/infoview/addnewphoto.vue

 <template>
-  <div class="photoLookBox">
+  <div class="photoLookBox" v-loading="loading">
 		<div class="metaDataTop">
 			<em>上传新照片</em>
 			<span class="refBtn" @click="refPage">刷新 <i class="el-icon-refresh fr"></i></span>
@@ -88,7 +88,7 @@
 					</div>
 				</div>
 			</div>
-			<pagination v-if="photoTotalNum>0" :total="photoTotalNum" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
+			<!-- <pagination v-if="photoTotalNum>0" :total="photoTotalNum" :page-size="paramsFrom.pageSize" :page-sizes="[6, 12, 18, 24, 30]" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination> -->
 		</div>
 	</div>
 </template>
@@ -104,6 +104,7 @@ export default {
 	components:{pagination},
 	data() {
 		return {
+			loading: false,
 			domain: process.env.BASE_API,
       requestPath: requestPath,
 			uploadUrl: uploadUrl,
@@ -112,7 +113,7 @@ export default {
 			photoInfo: [],
 			photoTotalNum: null,
 			paramsFrom: {
-				pageSize:30,
+				pageSize: 6,
 				pageNum: 1
 			},
 			formData: {
@@ -132,11 +133,11 @@ export default {
 	methods: {
 		pagesizeFun(val){
 			this.paramsFrom.pageSize = val;
-      this.getNamedEntityListAPI()
+      this.getItemDetailById()
 		},
 		currentPageFun(val){
 			this.paramsFrom.pageNum = val;
-      this.getNamedEntityListAPI()
+      this.getItemDetailById()
 		},
 		// 上传附件有关
     beforeUpload(file) {
@@ -229,7 +230,6 @@ export default {
 			this.loading = true;
 			this.initialSlide = 0;
 			this.getItemDetailById();
-			this.lunbo();
 			setTimeout(() => {
 				this.loading = false;
 			}, 1000)

src/views/submission/infoview/atlas.vue

 <template>
-  <div class="atlasBox">
+  <div class="atlasBox" v-loading="loading">
 		<div class="metaDataTop">
 			<em>资源提交</em>
 			<span class="refBtn" @click="refPage">刷新 <i class="el-icon-refresh fr"></i></span>
@@ -34,7 +34,7 @@
 				</ul>
 			</section>
 		</div>
-		<pagination v-if="atlasTotalNum>0" :total="atlasTotalNum" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
+		<pagination v-if="atlasTotalNum>0" :total="atlasTotalNum" :page-size="dataForm.pageSize" :page-sizes="[10, 20, 30, 40, 50]" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
 	</div>
 </template>
 
@@ -48,10 +48,11 @@ export default {
 	components:{pagination},
 	data() {
 		return {
+			loading: false,
 			uploadUrl: uploadUrl,
 			dataForm: {
 				pageNum: 1,
-				pageSize: 30,
+				pageSize: 10,
 				orderBy: null
 			},
 			myAtlasListData: [],
@@ -67,12 +68,12 @@ export default {
 	},
 	methods: {
 		pagesizeFun(val){
-			this.paramsFrom.pageSize = val;
-      this.getNamedEntityListAPI()
+			this.dataForm.pageSize = val;
+      this.getMyAtlasList()
 		},
 		currentPageFun(val){
-			this.paramsFrom.pageNum = val;
-      this.getNamedEntityListAPI()
+			this.dataForm.pageNum = val;
+      this.getMyAtlasList()
 		},
 		addAtlas() {
 			this.$router.push('addatlas')
@@ -192,7 +193,7 @@ export default {
 	section {
 		margin:0 3.75% 40px 0;
 		width:17%;
-		&:nth-of-type(5) {
+		&:nth-of-type(5n) {
 			margin-right:0;
 		}
 	}

src/views/submission/metadatamange/metadataplan.vue

@@ -145,7 +145,6 @@ export default {
       })
     },
     lookDetail(item) {
-      console.log(item, '()(((99')
       this.$router.push({
         path: 'metadataplan_details',
         query: {