Merge branch 'wtf' into dev

src/views/storagemodule/namedentity/character.vue

@@ -853,7 +853,6 @@ export default {
 				localtionDetailAPI(this.entityId)
 				.then(res => {
 					if (res.data.code === 0) {
-						console.log(res.data.data, '12311rr')
 						_this.characterDetailData = res.data.data;
 						_this.filedJosnArr = JSON.parse(res.data.data.fieldJson) || [];
 						_this.peopleName = res.data.data.keyword;
@@ -880,6 +879,7 @@ export default {
 				timerDetailAPI(this.entityId)
 				.then(res => {
 					if (res.data.code === 0) {
+						console.log(res.data.data, '123123123123')
 						_this.characterDetailData = res.data.data;
 						_this.peopleName = res.data.data.keyword;
 						_this.relateResListState = 4;

src/views/storagemodule/namedentity/localtion.vue

@@ -51,7 +51,7 @@
 			</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/pic_ops.png" alt="">
+			<img src="../../../assets/img/noData_pic.png" alt="">
 			</div>
 		</div>
 		<el-dialog title="新增命名实体（地理位置）" :visible.sync="dialogFormVisible">

src/views/storagemodule/namedentity/timer.vue

@@ -5,7 +5,7 @@
 			<span @click="refPage">刷新 <i class="el-icon-refresh " ></i></span>
 		</div>
 		<div class="searchBox">
-			<el-input placeholder="搜索数字记忆资源库" v-model="paramsFrom.keyword" class="input-with-select" @keyup.enter.native="searchByKeyword">
+			<el-input placeholder="按朝代搜索" v-model="paramsFrom.keyword" class="input-with-select" @keyup.enter.native="searchByKeyword">
 				<el-button slot="append" icon="el-icon-search" style="border-top-left-radius:0; border-bottom-left-radius:0;" @click="searchByKeyword">检索</el-button>
 			</el-input>
 		</div>
@@ -330,7 +330,7 @@ export default {
 				}
 			})
 		},
-		finallyAddNamedEntity() {
+		finallyAddNamedEntity() {     
 			this.$refs.dataForm.validate(valid => {
 				if (valid) {
 					this.dialogFormVisible1 = false