1101

src/views/storagemodule/namedentity/character.scss

@@ -44,3 +44,10 @@
 		text-align:center;
 	}
 }
+.searchBox {
+	.el-input-group__append {
+		background:#409EFF; 
+		color:#fff; 
+		border:none;
+	}
+}

src/views/storagemodule/namedentity/character.vue

 <template>
   <div class="box">
 		<div class="metaDataTop">
-			<em v-if="this.$route.query.entityType === '1'">人物实体</em>
-			<em v-if="this.$route.query.entityType === '2'">地理位置实体</em>
-			<em v-if="this.$route.query.entityType === '3'">组织机构实体</em>
+			<em v-if="this.$route.query.entityType == 1">人物实体</em>
+			<em v-if="this.$route.query.entityType == 3">地理位置实体</em>
+			<em v-if="this.$route.query.entityType == 2">组织机构实体</em>
 			<span>刷新</span>
 		</div>
 		<div class="contentBox">
 			<div class="contentBoxLeft">
-				<h2 id="moduleId0">>人物信息</h2>
+				<h2 id="moduleId0">>实体信息</h2>
 				<dl>
 					<dt>
 						<img :src="characterDetailData.img" alt="">
@@ -16,7 +16,9 @@
 					<dd>
 						<ul>
 							<li>{{ characterDetailData.name }}</li>
-							<li>{{ characterDetailData.occupation }}  |  {{ characterDetailData.dateofbirth }}-{{ characterDetailData.elapsedtime }}  |  {{ characterDetailData.nationality }}</li>
+							<li v-if="this.$route.query.entityType == 1">{{ characterDetailData.occupation }}  |  {{ characterDetailData.dateofbirth }}-{{ characterDetailData.elapsedtime }}  |  {{ characterDetailData.nationality }}</li>
+							<li v-else-if="this.$route.query.entityType == 3">{{ characterDetailData.detailedaddress }}</li>
+							<li v-else>{{ characterDetailData.type }}  |  {{ characterDetailData.foundertime }}  |  {{ characterDetailData.abbreviation }}</li>
 							<li>{{ characterDetailData.description }}</li>
 						</ul>
 					</dd>
@@ -54,7 +56,7 @@
 						<td></td>
 					</tr>
 				</table>
-				<table class="basicInfo" v-if="this.$route.query.entityType == 2">
+				<table class="basicInfo" v-if="this.$route.query.entityType == 3">
 					<tr>
 						<td>名称：</td>
 						<td>{{ characterDetailData.name }}</td>
@@ -74,7 +76,7 @@
 						<td></td>
 					</tr>
 				</table>
-				<table class="basicInfo" v-if="this.$route.query.entityType == 3">
+				<table class="basicInfo" v-if="this.$route.query.entityType == 2">
 					<tr>
 						<td>名称：</td>
 						<td>{{ characterDetailData.name }}</td>
@@ -168,16 +170,16 @@
 				</table>
 				<div class="echartsBox" id="moduleId4 moduleId5">
 					<section class="left">
-						<h2 v-if="this.$route.query.entityType === '1'">>人物关系</h2>
-						<h2 v-else-if="this.$route.query.entityType === '2'">>地点实体关系</h2>
+						<h2 v-if="this.$route.query.entityType == 1">>人物关系</h2>
+						<h2 v-else-if="this.$route.query.entityType == 3">>地点实体关系</h2>
 						<h2 v-else>>组织机构实体关系</h2>
 						<div>
 							<div id="relationChart" style="width:100%; height:100%;"></div>
 						</div>
 					</section>
 					<section class="right">
-						<h2 v-if="this.$route.query.entityType === '1'">>人物关键词</h2>
-						<h2 v-else-if="this.$route.query.entityType === '2'">>地点关键词</h2>
+						<h2 v-if="this.$route.query.entityType == 1">>人物关键词</h2>
+						<h2 v-else-if="this.$route.query.entityType == 3">>地点关键词</h2>
 						<h2 v-else>>组织机构关键词</h2>
 						<div>
 							<div id="myChart"></div>
@@ -462,7 +464,7 @@ export default {
 			contentBoxRightData: [
 				{
 					id: 1,
-					name: '人物信息'
+					name: '实体信息'
 				},
 				{
 					id: 2,
@@ -478,11 +480,11 @@ export default {
 				},
 				{
 					id: 5,
-					name: '人物关系'
+					name: '实体关系'
 				},
 				{
 					id: 6,
-					name: '人物关键词'
+					name: '实体关键词'
 				},
 				{
 					id: 7,
@@ -539,7 +541,7 @@ export default {
 						_this.peopleName = res.data.data.keyword;
 					}
 				})
-			} else if (this.$route.query.entityType == 2) {
+			} else if (this.$route.query.entityType == 3) {
 				localtionDetailAPI(this.$route.query.id)
 				.then(res => {
 					if (res.data.code === 0) {
@@ -547,7 +549,7 @@ export default {
 						_this.peopleName = res.data.data.keyword;
 					}
 				})
-			} else if (this.$route.query.entityType == 3) {
+			} else if (this.$route.query.entityType == 2) {
 				organDetailAPI(this.$route.query.id)
 				.then(res => {
 					if (res.data.code === 0) {

src/views/storagemodule/namedentity/characterentry.vue

@@ -2,16 +2,11 @@
   <div class="box">
 		<div class="metaDataTop">
 			<em>人物</em>
-			<span @click="refPage">刷新 <i class="el-icon-refresh " ></i></span>
+			<span @click="refPage">刷新 <i class="el-icon-refresh"></i></span>
 		</div>
 		<div class="searchBox">
 			<el-input placeholder="搜索数字记忆资源库" v-model="inputVal" class="input-with-select">
-				<el-select v-model="selectVal" slot="prepend" placeholder="关键字">
-					<el-option label="餐厅名" value="1"></el-option>
-					<el-option label="订单号" value="2"></el-option>
-					<el-option label="用户电话" value="3"></el-option>
-				</el-select>
-				<el-button slot="append" icon="el-icon-search" style="background:#409EFF; color:#fff; border-top-left-radius:0; border-bottom-left-radius:0;">检索</el-button>
+				<el-button slot="append" icon="el-icon-search" style="border-top-left-radius:0; border-bottom-left-radius:0;">检索</el-button>
 			</el-input>
 		</div>
 		<div class="screeningConditionsLeft">
@@ -572,3 +567,7 @@ export default {
 	}
 }
 </style>
+
+<style lang="scss">
+@import 'character.scss'
+</style>

src/views/storagemodule/namedentity/localtion.vue

@@ -228,7 +228,7 @@ export default {
 				path: 'character',
 				query: {
 					id: item.id,
-					entityType: 2,
+					entityType: 3,
 				}
 			})
 		},

src/views/storagemodule/namedentity/organ.vue

@@ -254,7 +254,7 @@ export default {
 				path: 'character',
 				query: {
 					id: item.id,
-					entityType: 3,
+					entityType: 2,
 				}
 			})
 		},

src/views/submission/infoview/addnewphoto.vue

@@ -49,7 +49,6 @@
 						<el-upload
 							:action="`${uploadUrl}/${uploadPath}/info`"
 							:show-file-list="false"
-							:limit="1"
 							:on-success="handleSuccess"
 							:before-upload="beforeUpload"
 							class="upload-demo"
@@ -233,12 +232,14 @@ export default {
 			}, 1000)
 		},
 		editThisItem(item, key) {
-			// console.log(item, "*****(((((")
-			// store.dispatch('set_photo_id', item.id)
-			// this.$router.push({
-			// 	path: 'editphotoresource',
-			// 	activeIndexOne: key
-			// })
+			store.dispatch('set_photo_id', item.id);
+			this.$router.push({
+				path: 'editphotoresource',
+				query: {
+					oid: this.$route.query.oid,//图册id
+					activeIndexOne: key
+				}
+			})
 		}
 	}
 }

src/views/submission/infoview/allresource.vue

@@ -298,7 +298,8 @@ export default {
 			this.$router.push({
 				path: '/submission/resourcecommit',
 				query: {
-					oid: item.id
+					oid: item.id,
+					flag: 'look'
 				}
 			})
 		},

src/views/submission/infoview/editphotoresource.vue

 <template>
   <div class="editPhotoResourceBox app-container">
 		<div class="resourceCommitTop">
-			<em>提交文本资源</em>
+			<em>编辑照片资源</em>
 		</div>
 		<div class="formBox">
 			<div class="formLeft">

src/views/submission/infoview/mycommit.vue

@@ -292,7 +292,7 @@ export default {
 			this.$router.push({
 				path: '/submission/resourcecommit',
 				query: {
-					oid: item.id
+					oid: item.id,
 				}
 			})
 		},
@@ -300,7 +300,8 @@ export default {
 			this.$router.push({
 				path: '/submission/resourcecommit',
 				query: {
-					oid: item.id
+					oid: item.id,
+					flag: 'look'
 				}
 			})
 		}

src/views/submission/infoview/myedit.vue

@@ -300,7 +300,8 @@ export default {
 			this.$router.push({
 				path: '/submission/resourcecommit',
 				query: {
-					oid: item.id
+					oid: item.id,
+					flag: 'look'
 				}
 			})
 		}

src/views/submission/infoview/photolook.vue

@@ -190,10 +190,18 @@ export default {
 						console.log(this.uploadUrl, "LL")
 						this.photoItemId = flag.id
 						this.exifImgPath = this.uploadUrl + '?fileName=' + flag.fileName;
+						const imageObj = new Image();
+						if (this.exifImgPath) {
+							imageObj.src = this.exifImgPath;
+							console.log(imageObj, 'ILIL')
 							console.log(this.exifImgPath)
 							var _this = this;
-						var res = _this.EXIF.getAllTags(this.exifImgPath);
-						console.log(res,"22222222222222");
+							this.EXIF.getData([imageObj], function () {
+								console.log(_this.EXIF.getAllTags(this), "::::") // 此处打印的为选中图片的数据
+							})
+							// var res = _this.EXIF.getAllTags(imageObj);
+							// console.log(res,"22222222222222");
+						}
           }
         }
       },
@@ -218,10 +226,18 @@ export default {
 						console.log(this.uploadUrl, "LL")
 						this.photoItemId = flag.id
 						this.exifImgPath = this.uploadUrl + '?fileName=' + flag.fileName;
+						const imageObj = new Image();
+						if (this.exifImgPath) {
+							imageObj.src = this.exifImgPath;
+							console.log(imageObj, 'ILIL')
 							console.log(this.exifImgPath)
 							var _this = this;
-						var res = _this.EXIF.getAllTags(this.exifImgPath);
-						console.log(res,"22222222222222");
+							this.EXIF.getData(imageObj, function () {
+								console.log(_this.EXIF.getAllTags(this)) // 此处打印的为选中图片的数据
+							})
+							// var res = _this.EXIF.getAllTags(imageObj);
+							// console.log(res,"22222222222222");
+						}
           }
         }
       }

src/views/submission/resourcecommit/index.scss

@@ -24,7 +24,7 @@
         color:#409EFF;
         background:#e6f1fe;
     }
-    .el-form-item__error {
-        top:80%;
-    }
+    // .el-form-item__error {
+    //     top:80%;
+    // }
 }