1031

src/store/getters.js

@@ -56,6 +56,7 @@ const getters = {
     list_detailsSerKeys: state => state.pageTemp.list_detailsSerKeys,
     book_detailsSerKeys: state => state.pageTemp.book_detailsSerKeys,
     getNation: state => state.pageTemp.getNation,
+    photoId: state => state.photo.photoId,
 
 }
 export default getters
\ No newline at end of file

src/store/index.js

@@ -6,6 +6,7 @@ import permission from './modules/permission'
 import tagsView from './modules/tagsView'
 import user from './modules/user'
 import pageTemp from './modules/pageTemp'
+import photo from './modules/photo'
 
 import getters from './getters'
 
@@ -18,7 +19,8 @@ const store = new Vuex.Store({
     permission,
     tagsView,
     user,
-    pageTemp
+    pageTemp,
+    photo
   },
   getters
 })

src/store/modules/photo.js

+const photo = {
+    state: {
+        photoId: null
+    },
+    mutations: {
+        SET_PHOTO_ID: (state, value) => {
+            state.photoId = value;
+        }
+    },
+    actions: {
+        set_photo_id: ({commit}, value) => {
+            commit('SET_PHOTO_ID', value)
+        }
+    }
+}
+
+export default photo
\ No newline at end of file

src/views/submission/infoview/addnewphoto.vue

@@ -84,7 +84,7 @@
 						</dl>
 						<div>
 							<el-button type="info" icon="el-icon-delete" size="mini" @click="deleteItem(item, key)">删除</el-button>
-							<el-button type="primary" icon="el-icon-edit" size="mini" style="margin-left:9px;">编辑</el-button>
+							<el-button type="primary" icon="el-icon-edit" size="mini" style="margin-left:9px;" @click="editThisItem(item, key)">编辑</el-button>
 						</div>
 					</div>
 				</div>
@@ -98,6 +98,7 @@
 import { uploadUrl, uploadPath, requestPath } from "@/utils/global";
 import { getItemDetailByIdAPI, resourceCommitAPI, myAtlasDeleteItemAPI } from '@/api/resourcecommit'
 import pagination from '@/components/pagination/pagination'
+import store from '@/store'
 export default {
 	name: 'photolook',
 	components:{pagination},
@@ -230,6 +231,14 @@ export default {
 			setTimeout(() => {
 				this.loading = false;
 			}, 1000)
+		},
+		editThisItem(item, key) {
+			// console.log(item, "*****(((((")
+			// store.dispatch('set_photo_id', item.id)
+			// this.$router.push({
+			// 	path: 'editphotoresource',
+			// 	activeIndexOne: key
+			// })
 		}
 	}
 }

src/views/submission/infoview/editphotoresource.vue

@@ -63,6 +63,7 @@
 					<el-form-item label="资源分类：">
 						<div class="block">
 							<el-cascader
+								change-on-select
 								v-model="optionResourceDiyTypeShow"
 								style="width:100%;"
 								ref="myCascader"
@@ -117,6 +118,7 @@ import linkentity from '../linkentity'
 import { uploadUrl, uploadPath, requestPath } from "@/utils/global";
 import { resourceCommitAPI, resourceDiyTypeAPI, resourceLabelListAPI, editItemAPI, saveEditAPI, getItemDetailByIdAPI  } from "@/api/resourcecommit";
 import { convertTree } from '@/utils/format'
+import store from '@/store'
 export default {
 	name: 'editphotoresource',
 	components: {
@@ -173,19 +175,28 @@ export default {
 						const swiperOne = this.$refs.swiperOne.swiper
 						this.activeIndex = swiperOne.realIndex;
 						console.log(this.activeIndex,"当前索引");
+						this.$nextTick(()=>this.$refs.formOne.clearValidate())
+						this.$nextTick(()=>this.$refs.formTwo.clearValidate())
+						this.$nextTick(()=>this.$refs.formThree.clearValidate())
 						let flag = this.photoList[this.activeIndex];
 						console.log(flag,"不知道是什么");
 						this.formData = flag;
+						store.dispatch('set_photo_id', this.formData.id)
+						this.getLookContent();
 						if (this.formData.longitude) {
 							this.location = '经度：' + this.formData.longitude + ',' + '维度：' + this.formData.latitude + ',' + this.formData.address;
 						}
+						this.optionResourceDiyTypeShow = [];
 						if (this.formData.diyType) {
 							this.formData.diyType.map((item, index) => {
 								this.$set(item, 'value', item.dtId);
 								this.$set(item, 'label', item.typeName)
 								this.optionResourceDiyTypeShow.push(item.value)
 							})
+						} else {
+							this.optionResourceDiyTypeShow = [];
 						}
+						this.resourceLabel = [];
 						this.formData.label.map((item, index) => {
 							this.$set(item, 'value', item.labelId);
 							this.resourceLabel.push(item.value)
@@ -205,16 +216,19 @@ export default {
 			// timeVal: '',
 			rulesOne: {
 				name: [
-					{ required: true, message: '请输入题名', trigger: 'blur' }
+					{ required: true, message: '请输入题名', trigger: 'blur' },
+					{ required: true, message: '请输入题名', trigger: 'change' }
 				],
 				keyword: [
-					{ required: true, message: '请输入关键词', trigger: 'blur' }
+					{ required: true, message: '请输入关键词', trigger: 'blur' },
+					{ required: true, message: '请输入关键词', trigger: 'change' }
 				],
 				formationTime: [
 					{ required: true, message: '请选择拍摄时间', trigger: 'change' }
 				],
 				responsibility: [
-					{ required: true, message: '请输入责任者', trigger: 'blur' }
+					{ required: true, message: '请输入责任者', trigger: 'blur' },
+					{ required: true, message: '请输入责任者', trigger: 'change' }
 				],
 				label: [
 					{ required: true, message: '请选择资源标签', trigger: 'change' }
@@ -280,6 +294,7 @@ export default {
 		this.resourceLabelListAPI();
 		this.getLookContent();
 		this.getItemDetailById();
+		console.log(store.getters.photoId, "555666")
 	},
 	methods: {
 		showMark() {
@@ -366,16 +381,24 @@ export default {
 			})
 		},
 		getLookContent() {//查看
-			if (this.$route.query.id) {
+			if (store.getters.photoId) {
 				this.isShowSavaBtn = true;
-				editItemAPI(this.$route.query.id)
+				editItemAPI(store.getters.photoId)
 				.then(res => {
 					console.log(res, 'OPOPOPO');
 					if (res.data.code === 0) {
 						this.formData = res.data.data;
+						this.$nextTick(()=>this.$refs.formOne.clearValidate())
+						this.$nextTick(()=>this.$refs.formTwo.clearValidate())
+						this.$nextTick(()=>this.$refs.formThree.clearValidate())
+						this.location = '';
 						if (res.data.data.longitude) {
 							this.location = '经度：' + res.data.data.longitude + ',' + '维度：' + res.data.data.latitude + ',' + res.data.data.address;
+						} else {
+							this.location = '';
 						}
+						this.resourceLabel = [];
+						this.optionResourceDiyTypeShow = [];
 						res.data.data.label.map((item, index) => {
 							this.$set(item, 'value', item.labelId);
 							this.resourceLabel.push(item.value)
@@ -401,13 +424,30 @@ export default {
 			})
 		},
 		saveEdit() {//保存编辑
-			saveEditAPI(this.formData)
-			.then(res => {
-				if (res.data.code === 0) {
-					this.$message.success('保存变更成功')
-				}
+			const formOne = new Promise((resolve, reject) => {
+				this.$refs.formOne.validate(valid => {
+					if (valid) resolve();
+				})
 			})
-		}
+			const formTwo = new Promise((resolve, reject) => {
+				this.$refs.formTwo.validate(valid => {
+					if (valid) resolve();
+				})
+			})
+			const formThree = new Promise((resolve, reject) => {
+				this.$refs.formThree.validate(valid => {
+					if (valid) resolve();
+				})
+			})
+			Promise.all([formOne, formTwo, formThree]).then(() => {
+				saveEditAPI(this.formData)
+				.then(res => {
+					if (res.data.code === 0) {
+						this.$message.success('保存变更成功')
+					}
+				})
+			})
+		},
 	}
 }
 </script>

src/views/submission/infoview/photolook.vue

@@ -157,6 +157,7 @@ import { getItemDetailByIdAPI } from '@/api/resourcecommit'
 import { uploadUrl } from "@/utils/global";
 import 'swiper/dist/css/swiper.css'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
+import store from '@/store'
 export default {
 	name: 'photolook',
 	components: {
@@ -268,11 +269,13 @@ export default {
 			})
 		},
 		goEditPhotoResource() {
+			console.log(this.photoItemId, ".....")
+			store.dispatch('set_photo_id', this.photoItemId)
 			this.$router.push({
 				path: 'editphotoresource',
 				query: {
-					id: this.photoItemId,
-					oid: this.$route.query.oid,
+					//id: this.photoItemId,//轮播中当前active的id,为了后续操作使用vuex代替
+					oid: this.$route.query.oid,//图册id
 					activeIndexOne: this.activeIndex
 				}
 			})

src/views/submission/resourcecommit/index.vue

@@ -437,22 +437,22 @@ export default {
 			})
 		},
 		commitResource() {// 提交资源
-			const formOne = new Promise((resolve,reject)=>{
+			const formOne = new Promise((resolve,reject) => {
 				this.$refs['formOne'].validate(valid=>{
 					if(valid) resolve()
 				})
 			});
-			const formTwo = new Promise((resolve,reject)=>{
-				this.$refs['formTwo'].validate(valid=>{
+			const formTwo = new Promise((resolve,reject) => {
+				this.$refs['formTwo'].validate(valid => {
 					if(valid) resolve()
 				})
 			});
-			const formThree = new Promise((resolve,reject)=>{
-				this.$refs['formThree'].validate(valid=>{
+			const formThree = new Promise((resolve,reject) => {
+				this.$refs['formThree'].validate(valid => {
 					if(valid) resolve()
 				})
 			});
-			Promise.all([formOne, formTwo, formThree]).then(()=>{
+			Promise.all([formOne, formTwo, formThree]).then(() => {
 				resourceCommitAPI(this.formData)
 				.then(res => {
 					console.log(res, '%%%%%%%%%%%%%^')