1029

src/views/storagemodule/namedentity/characterentry.vue

@@ -2,7 +2,7 @@
   <div class="box">
 		<div class="metaDataTop">
 			<em>人物</em>
-			<span>刷新</span>
+			<span @click="refPage">刷新</span>
 		</div>
 		<div class="searchBox">
 			<el-input placeholder="搜索数字记忆资源库" v-model="inputVal" class="input-with-select">
@@ -46,6 +46,7 @@
 					</li>
 				</ul>
 			</div>
+			<pagination v-if="totalNum>0" :total="totalNum" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
 			<div class="noDataPic" style="text-align:center;" v-if="totalNum === 0">
 				<img src="../../../assets/img/noData_pic.png" alt="">
 			</div>
@@ -115,8 +116,10 @@ import {
 	showNamedEntityAPI,
 	finallyAddNamedEntityAPI
 } from '@/api/storagemodule'
+import pagination from '@/components/pagination/pagination'
 export default {
 	name: 'characterentry',
+	components:{pagination},
 	data() {
 		return {
 			dialogFormVisible: false,
@@ -135,7 +138,7 @@ export default {
 				state: 1,
 				keyword: null,//搜索的时候传
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 30,
 				orderBy: null
 			},
 			createdate:'',//创建时间的筛选的
@@ -147,6 +150,14 @@ export default {
 		this.getNamedEntityListAPI()
 	},
 	methods: {
+		pagesizeFun(val){
+			this.paramsFrom.pageSize = val;
+      this.getNamedEntityListAPI()
+		},
+		currentPageFun(val){
+			this.paramsFrom.pageNum = val;
+      this.getNamedEntityListAPI()
+		},
 		getNamedEntityListAPI() {
 			namedEntityListAPI(this.paramsFrom)
 			.then(res => {
@@ -214,6 +225,24 @@ export default {
 					this.$message.error('新增实体未入库')
 				}
 			})
+		},
+		resetSearch() {
+			this.paramsFrom = {
+				state: 1,
+				keyword: null,//搜索的时候传
+				pageNum: 1,
+				pageSize: 30,
+				orderBy: null
+			};
+			this.createdate = '';//创建时间的筛选的
+			this.getNamedEntityListAPI();
+		},
+		refPage() {
+			this.loading = true;
+			this.resetSearch();
+			setTimeout(()=>{
+				this.loading=false;
+			},1000)
 		}
 	}
 }
@@ -243,6 +272,7 @@ export default {
 		background:url(../../../assets/img/sx.png) no-repeat;
 		background-size:12px 12px;
 		background-position:37px 2px;
+		cursor:pointer;
 	}
 }
 .searchBox {

src/views/storagemodule/namedentity/localtion.vue

@@ -2,7 +2,7 @@
   <div class="box">
 		<div class="metaDataTop">
 			<em>地理位置</em>
-			<span>刷新</span>
+			<span @click="refPage">刷新</span>
 		</div>
 		<div class="searchBox">
 			<el-input placeholder="搜索数字记忆资源库" v-model="inputVal" class="input-with-select">
@@ -46,6 +46,7 @@
 					</li>
 				</ul>
 			</div>
+			<pagination v-if="totalNum>0" :total="totalNum" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
 			<div class="noDataPic" style="text-align:center;" v-if="totalNum === 0">
 				<img src="../../../assets/img/noData_pic.png" alt="">
 			</div>
@@ -94,6 +95,7 @@
 
 <script>
 import BaiduMap from 'vue-baidu-map/components/map/Map.vue'
+import pagination from '@/components/pagination/pagination'
 import {
 	namedEntityListAPI,
 	addNamedEntityAPI,
@@ -103,7 +105,8 @@ import {
 export default {
 	name: 'location',
 	components: {
-    BaiduMap
+		BaiduMap,
+		pagination
   },
 	data() {
 		return {
@@ -129,7 +132,7 @@ export default {
 				state: 3,
 				keyword: null,
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 30,
 				orderBy: null,
 			},
 			createdate:'',//创建时间的筛选的
@@ -141,6 +144,14 @@ export default {
 		this.getNamedEntityListAPI()
 	},
 	methods: {
+		pagesizeFun(val){
+			this.paramsFrom.pageSize = val;
+      this.getNamedEntityListAPI()
+		},
+		currentPageFun(val){
+			this.paramsFrom.pageNum = val;
+      this.getNamedEntityListAPI()
+		},
 		getNamedEntityListAPI() {
 			namedEntityListAPI(this.paramsFrom)
 			.then(res => {
@@ -212,6 +223,24 @@ export default {
 					this.$message.error('新增实体未入库')
 				}
 			})
+		},
+		resetSearch() {
+			this.paramsFrom = {
+				state: 3,
+				keyword: null,
+				pageNum: 1,
+				pageSize: 30,
+				orderBy: null,
+			};
+			this.createdate = '';//创建时间的筛选的
+			this.getNamedEntityListAPI();
+		},
+		refPage() {
+			this.loading = true;
+			this.resetSearch();
+			setTimeout(()=>{
+				this.loading=false;
+			},1000)
 		}
 	}
 }
@@ -241,6 +270,7 @@ export default {
 		background:url(../../../assets/img/sx.png) no-repeat;
 		background-size:12px 12px;
 		background-position:37px 2px;
+		cursor:pointer;
 	}
 }
 .searchBox {

src/views/storagemodule/namedentity/organ.vue

@@ -46,6 +46,7 @@
 					</li>
 				</ul>
 			</div>
+			<pagination v-if="totalNum>0" :total="totalNum" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
 			<div class="noDataPic" style="text-align:center;" v-if="totalNum === 0">
 				<img src="../../../assets/img/noData_pic.png" alt="">
 			</div>
@@ -100,8 +101,10 @@ import {
 	showNamedEntityAPI,
 	finallyAddOrganNamedEntityAPI
 } from '@/api/storagemodule'
+import pagination from '@/components/pagination/pagination'
 export default {
 	name: 'characterentry',
+	components:{pagination},
 	data() {
 		return {
 			dialogFormVisible: false,
@@ -119,7 +122,7 @@ export default {
 				state: 2,
 				keyword: null,
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 30,
 				orderBy: null,
 			},
 			createdate:'',//创建时间的筛选的
@@ -131,6 +134,14 @@ export default {
 		this.getNamedEntityListAPI()
 	},
 	methods: {
+		pagesizeFun(val){
+			this.paramsFrom.pageSize = val;
+      this.getNamedEntityListAPI()
+		},
+		currentPageFun(val){
+			this.paramsFrom.pageNum = val;
+      this.getNamedEntityListAPI()
+		},
 		getNamedEntityListAPI() {
 			namedEntityListAPI(this.paramsFrom)
 			.then(res => {
@@ -191,6 +202,24 @@ export default {
 					this.$message.error('新增实体未入库')
 				}
 			})
+		},
+		resetSearch() {
+			this.paramsFrom = {
+				state: 2,
+				keyword: null,
+				pageNum: 1,
+				pageSize: 30,
+				orderBy: null,
+			};
+			this.createdate = '';//创建时间的筛选的
+			this.getNamedEntityListAPI();
+		},
+		refPage() {
+			this.loading = true;
+			this.resetSearch();
+			setTimeout(()=>{
+				this.loading=false;
+			},1000)
 		}
 	}
 }
@@ -220,6 +249,7 @@ export default {
 		background:url(../../../assets/img/sx.png) no-repeat;
 		background-size:12px 12px;
 		background-position:37px 2px;
+		cursor:pointer;
 	}
 }
 .searchBox {

src/views/storagemodule/namedentity/timer.vue

@@ -2,7 +2,7 @@
   <div class="box">
 		<div class="metaDataTop">
 			<em>时间</em>
-			<span>刷新</span>
+			<span @click="refPage">刷新</span>
 		</div>
 		<div class="searchBox">
 			<el-input placeholder="搜索数字记忆资源库" v-model="inputVal" class="input-with-select">
@@ -124,7 +124,7 @@ export default {
 				state: 4,
 				keyword: null,
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 30,
 				orderBy: null,
 			},
 			createdate:'',//创建时间的筛选的
@@ -186,6 +186,24 @@ export default {
 					this.$message.error('新增实体未入库')
 				}
 			})
+		},
+		resetSearch() {
+			this.paramsFrom = {
+				state: 4,
+				keyword: null,
+				pageNum: 1,
+				pageSize: 30,
+				orderBy: null,
+			};
+			this.createdate = '';//创建时间的筛选的
+			this.getNamedEntityListAPI();
+		},
+		refPage() {
+			this.loading = true;
+			this.resetSearch();
+			setTimeout(()=>{
+				this.loading=false;
+			},1000)
 		}
 	}
 }
@@ -215,6 +233,7 @@ export default {
 		background:url(../../../assets/img/sx.png) no-repeat;
 		background-size:12px 12px;
 		background-position:37px 2px;
+		cursor:pointer;
 	}
 }
 .searchBox {

src/views/submission/infoview/addnewphoto.vue

@@ -89,6 +89,7 @@
 					</div>
 				</div>
 			</div>
+			<pagination v-if="photoTotalNum>0" :total="photoTotalNum" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
 		</div>
 	</div>
 </template>
@@ -96,8 +97,10 @@
 <script>
 import { uploadUrl, uploadPath, requestPath } from "@/utils/global";
 import { getItemDetailByIdAPI, resourceCommitAPI, myAtlasDeleteItemAPI } from '@/api/resourcecommit'
+import pagination from '@/components/pagination/pagination'
 export default {
 	name: 'photolook',
+	components:{pagination},
 	data() {
 		return {
 			domain: process.env.BASE_API,
@@ -106,6 +109,11 @@ export default {
 			uploadPath: uploadPath,
 			atlasInfo: {},
 			photoInfo: [],
+			photoTotalNum: null,
+			paramsFrom: {
+				pageSize:30,
+				pageNum: 1
+			},
 			formData: {
 				albumId: this.$route.query.oid,
 				fileName: null,
@@ -121,6 +129,14 @@ export default {
 		this.getItemDetailById();
 	},
 	methods: {
+		pagesizeFun(val){
+			this.paramsFrom.pageSize = val;
+      this.getNamedEntityListAPI()
+		},
+		currentPageFun(val){
+			this.paramsFrom.pageNum = val;
+      this.getNamedEntityListAPI()
+		},
 		// 上传附件有关
     beforeUpload(file) {
 			console.log(file)
@@ -166,6 +182,7 @@ export default {
 					this.atlasInfo = res.data.data;
 					this.photoInfo = res.data.data.imgList;
 					this.formData.albumId = res.data.data.id
+					this.photoTotalNum = res.data.data.imgList.length;
 					this.photoInfo.map((item, index) => {
 						this.$set(item, 'statusVal', null)
 						if (item.status === 0) {
@@ -251,6 +268,7 @@ export default {
 .atlasBasicInfo {
 	width:100%;
 	margin-top:20px;
+	margin-bottom:20px;
 	section {
 		width:100%;
 		border-bottom:1px solid rgb(152, 164, 184);

src/views/submission/infoview/allresource.vue

@@ -81,6 +81,7 @@ import { myCommitResListAPI, deleteMyCommitResItemAPI } from '@/api/resourcecomm
 import pagination from '@/components/pagination/pagination'
 import { operationMsg, confirm } from '@/utils/publicFunctions'
 import { uploadUrl, uploadPath, requestPath } from "@/utils/global.js";
+import Cookies from 'js-cookie'
 export default {
 	name: 'allresource',
 	components:{pagination},
@@ -194,6 +195,23 @@ export default {
         }
 			})
 		},
+		resetSearch() {
+			this.searchForm = {
+				formation: null,
+				size: null,
+				status: null,
+				resourceType: '',
+				status: '',
+				orderBy: null,
+				createTime: null,
+				pageNum: 1,
+				pageSize: 30
+			};
+			this.formation='';
+			this.createTime='desc';
+			this.size ='';
+			this.getList()
+		},
 		refPage(){
 			this.loading=true;
 			this.resetSearch();

src/views/submission/infoview/atlas.vue

@@ -34,14 +34,17 @@
 				</ul>
 			</section>
 		</div>
+		<pagination v-if="atlasTotalNum>0" :total="atlasTotalNum" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
 	</div>
 </template>
 
 <script>
 import { myAtlasListAPI, myAtlasInfoAPI, myAtlasDeleteItemAPI } from '@/api/resourcecommit'
 import { uploadUrl } from "@/utils/global";
+import pagination from '@/components/pagination/pagination'
 export default {
 	name: 'atlas',
+	components:{pagination},
 	data() {
 		return {
 			uploadUrl: uploadUrl,
@@ -62,6 +65,14 @@ export default {
 		this.getMyAtlasInfo();
 	},
 	methods: {
+		pagesizeFun(val){
+			this.paramsFrom.pageSize = val;
+      this.getNamedEntityListAPI()
+		},
+		currentPageFun(val){
+			this.paramsFrom.pageNum = val;
+      this.getNamedEntityListAPI()
+		},
 		addAtlas() {
 			this.$router.push('addatlas')
 		},

src/views/submission/infoview/browsebycategory.vue

@@ -3,7 +3,7 @@
 		<div v-loading='loading'>
 			<div class="sip_Top clearfix">
 				<span class="fl">资源分类管理</span>
-				<a><i class="el-icon-refresh fr" @click="refPage"></i></a>
+				<a>刷新<i class="el-icon-refresh fr" @click="refPage"></i></a>
 			</div>
 			<div class="resource_content">
 				<div class="tree_wrap" v-loading='loadTreeVisible'>
@@ -417,8 +417,26 @@ export default {
 				this.loadTreeVisible=false;
 			},1000)
 		},
+		resetSearch() {
+			this.searchForm = {
+				diyTypeCode:'',
+				status:'',//默认丰富化的
+				resourceType:'',
+				orderBy:"",
+				beginTime:'',
+				endTime:'',
+				pageNum:1,
+				pageSize:30,
+				createrId:''
+			};
+			this.formation = '';//形成时间的筛选的
+			this.size = '';
+			this.createTime = 'desc';
+			this.getList();
+		},
 		refPage(){
 			this.loading=true;
+			this.resetSearch();
 			setTimeout(()=>{
 				this.loading=false;
 			},1000)

src/views/submission/infoview/mycommit.vue

@@ -203,9 +203,27 @@ export default {
         }
 			})
 		},
+		resetSearch() {
+			this.searchForm = {
+				formation: null,
+				size: null,
+				status: null,
+				resourceType: '',
+				status: '',
+				orderBy: null,
+				createTime: null,
+				modifierId: Cookies.get('userId'),
+				pageNum: 1,
+				pageSize: 30
+			};
+			this.formation='';
+			this.createTime='desc';
+			this.size ='';
+			this.getList()
+		},
 		refPage(){
 			this.loading=true;
-			//this.resetSearch();
+			this.resetSearch();
 			setTimeout(()=>{
 				this.loading=false;
 			},1000)

src/views/submission/infoview/myedit.vue

@@ -201,6 +201,24 @@ export default {
         }
 			})
 		},
+		resetSearch() {
+			this.searchForm = {
+				formation: null,
+				size: null,
+				status: null,
+				resourceType: '',
+				status: '',
+				orderBy: null,
+				createTime: null,
+				modifierId: Cookies.get('userId'),
+				pageNum: 1,
+				pageSize: 30
+			};
+			this.formation='';
+			this.createTime='desc';
+			this.size ='';
+			this.getList()
+		},
 		refPage(){
 			this.loading=true;
 			this.resetSearch();

src/views/submission/infoview/photolook.vue

@@ -57,7 +57,7 @@
 				</el-carousel> -->
 				<div class="swiper-box" style="height: 500px; padding-top:20px;">
 					<!-- swiper1 -->
-					<swiper :options="swiperOptionTop" class="gallery-top" ref="swiperTop" @click="callback($event)">
+					<swiper :options="swiperOptionTop" class="gallery-top" ref="swiperTop">
 						<swiper-slide class="slide-1" v-for="(item, key) in photoInfo" :key="key" :style="{backgroundImage: 'url('+`${uploadUrl}?fileName=${item.fileName}`+')', backgroundRepeat: 'no-repeat', backgroundPosition: '50%', backgroundSize: 'contain'}">
 							<!-- <img :src="`${uploadUrl}?fileName=${item.fileName}`" alt=""> -->
 						</swiper-slide>
@@ -80,7 +80,7 @@
 					<h2 class="titleWithIcon">
 						<i class="el-icon-info"></i>照片信息
 					</h2>
-					<el-button type="primary" icon="el-icon-edit" size="mini" @click="goEditPhotoResource(item)">编辑信息</el-button>
+					<el-button type="primary" icon="el-icon-edit" size="mini" @click="goEditPhotoResource">编辑信息</el-button>
 				</section>
 				<table v-for="(item, key) in photoInfo" :key="key" v-if="key === activeIndex">
 					<tr>
@@ -169,6 +169,7 @@ export default {
 			uploadUrl: uploadUrl,
 			atlasInfo: {},
 			photoInfo: [],
+			photoItemId: null,
 			activeIndex: 0,
 			swiperOptionTop: {
         spaceBetween: 10,
@@ -185,6 +186,7 @@ export default {
 						let flag = this.photoInfo[this.activeIndex];
 						console.log(flag,"不知道是什么")
 						console.log(this.uploadUrl, "LL")
+						this.photoItemId = flag.id
 						this.exifImgPath = this.uploadUrl + '?fileName=' + flag.fileName;
 						console.log(this.exifImgPath)
 						var _this = this;
@@ -209,6 +211,15 @@ export default {
             const swiperThumbs = this.$refs.swiperThumbs.swiper
             this.activeIndex = swiperThumbs.activeIndex;
 						console.log(this.activeIndex,"当前索引");
+						let flag = this.photoInfo[this.activeIndex];
+						console.log(flag,"不知道是什么")
+						console.log(this.uploadUrl, "LL")
+						this.photoItemId = flag.id
+						this.exifImgPath = this.uploadUrl + '?fileName=' + flag.fileName;
+						console.log(this.exifImgPath)
+						var _this = this;
+						var res = _this.EXIF.getAllTags(this.exifImgPath);
+						console.log(res,"22222222222222");
           }
         }
       }
@@ -239,6 +250,7 @@ export default {
 				if (res.data.code === 0) {
 					this.atlasInfo = res.data.data;
 					this.photoInfo = res.data.data.imgList;
+					this.photoItemId = res.data.data.imgList[0].id
 				} else {
 					this.$message.error('获取详情错误')
 				}
@@ -254,9 +266,14 @@ export default {
 				swiperThumbs.controller.control = swiperTop
 			})
 		},
-		goEditPhotoResource(item) {
+		goEditPhotoResource() {
 			this.$router.push({
-				path: 'editphotoresource'
+				path: 'editphotoresource',
+				query: {
+					id: this.photoItemId,
+					oid: this.$route.query.oid,
+					activeIndexOne: this.activeIndex
+				}
 			})
 		}
 		// uploadFile (event) {//exif获取照片信息