1127

src/views/submission/infoview/addatlas.vue

@@ -26,7 +26,7 @@
 			<div class="threeBtn">
 				<el-button type="info" icon="el-icon-close" @click="$router.back(-1)">取消</el-button>
 				<el-button type="primary" icon="el-icon-upload" @click="uploadAtlas" v-if="!this.$route.query.id">上传</el-button>
-				<el-button type="primary" icon="el-icon-upload" v-if="this.$route.query.id" @click="saveInfo()">保存</el-button>
+				<el-button type="primary" icon="el-icon-upload" v-if="this.$route.query.id" @click="saveInfo">保存</el-button>
 			</div>
 		</div>
 	</div>
@@ -116,7 +116,7 @@ export default {
 					if (res.data.code === 0) {
 						this.dataForm.description = res.data.data.description;
 						this.dataForm.name = res.data.data.name;
-						this.dataForm.type = res.data.data.type_zh;
+						this.dataForm.type = res.data.data.type;
 					} else {
 						this.$message.error('获取详情错误')
 					}
@@ -124,6 +124,7 @@ export default {
 			}
 		},
 		saveInfo() {
+			console.log(this.dataForm.type)
 			updataAtlasInfoByIdAPI(this.dataForm)
 			.then(res => {
 				if (res.data.code === 0) {

src/views/submission/infoview/photolook.vue

@@ -249,14 +249,16 @@ export default {
 				this.EXIF.getData(imageObj, function () {
 					console.log(_this.EXIF.getAllTags(this), "::::") // 此处打印的为选中图片的数据
 					_this.photoDetailInfo = _this.EXIF.getAllTags(this);
-					console.log(_this.photoDetailInfo,"老子最帅")
 					console.log(_this.photoDetailInfo.PixelXDimension,)
 				})
 			}, 500)
 		},
 		editPhotoBasicInfo() {
 			this.$router.push({
-				path: 'addatlas'
+				path: 'addatlas',
+				query: {
+					id: this.$route.query.oid
+				}
 			})
 		},
 		upLoadNewPhoto() {
@@ -276,6 +278,10 @@ export default {
 					this.photoInfo = res.data.data.imgList;
 					if (res.data.data.imgList.length != 0) {
 						this.photoItemId = res.data.data.imgList[0].id
+						this.exifImgPath = this.uploadUrl + '?fileName=' + res.data.data.imgList[0].fileName;
+						if (this.exifImgPath) {
+							this.getPhotoInfo();
+						}
 					}
 				} else {
 					this.$message.error('获取详情错误')
@@ -291,16 +297,19 @@ export default {
 			})
 		},
 		goEditPhotoResource() {
-			console.log(this.photoItemId, ".....")
-			store.dispatch('set_photo_id', this.photoItemId)
-			this.$router.push({
-				path: 'editphotoresource',
-				query: {
-					//id: this.photoItemId,//轮播中当前active的id,为了后续操作使用vuex代替
-					oid: this.$route.query.oid,//图册id
-					activeIndexOne: this.activeIndex
-				}
-			})
+			if (this.photoItemId) {
+				store.dispatch('set_photo_id', this.photoItemId)
+				this.$router.push({
+					path: 'editphotoresource',
+					query: {
+						//id: this.photoItemId,//轮播中当前active的id,为了后续操作使用vuex代替
+						oid: this.$route.query.oid,//图册id
+						activeIndexOne: this.activeIndex
+					}
+				})
+			} else {
+				this.$message.warning('请先上传图片')
+			}
 		},
 		refPage() {
 			this.loading = true;