Merge branch 'qll' into dev

src/views/dataManagement/search.vue

@@ -91,10 +91,8 @@
 									<p>关键词：<span class="keyword_tag">{{item.keyword}}</span></p>
 								</div>
 								<!-- <img class="tag" :src="item.userImg" alt="头像" > -->
-								<img class="tag_img" :src="`${uploadUrl}?fileName=${item.userImg}`" v-if="item.userImg" alt="头像" :title="item.createrName" >
-								<img class="tag_img" src="../../assets/img/default.png" v-else alt="默认头像" :title="item.createrName">
-								<!-- <img class="tag_img" :src="`${uploadUrl}?fileName=${item.modifierImg}`" v-if="item.modifierImg" alt="头像" title="最后修改者头像">
-								<img class="tag_img" src="../../assets/img/default.png" v-else alt="默认头像"> -->
+								<img class="tag_img" :src="`${uploadUrl}?fileName=${item.userImg}`" v-if="item.userImg" alt="头像" :title="item.createrName" @click="changeUserimg(item.createrId)">
+								<img class="tag_img" src="../../assets/img/default.png" v-else alt="默认头像" :title="item.createrName" @click="changeUserimg(item.createrId)">
 								<div class="opt_wrap">
 									<el-button type="primary" size="mini" plain icon="el-icon-view" class="look_btn" @click="richTo(item.id)">查看</el-button>
 								</div>
@@ -274,7 +272,6 @@ export default {
 		getList(){
 			getListAPI(this.searchForm).then(res=>{
 				if (res.data.code === 0) {
-					console.log(res.data.data.resList,"IOIOIO")
 					this.list=res.data.data.resList||[];
 					this.totalCount=res.data.data.totalCount||0;
         } else {
@@ -362,9 +359,12 @@ export default {
 			this.getList();
 			this.searchUserVisible=false;
 		},
+		changeUserimg(createrId){
+			this.searchForm.createrId=createrId;
+			this.getList();
+		},
 		userFilter(value){
 			this.getUserList(value);
-			console.log(value,'9999')
 		},
 		inoputSearch(){
 			this.searchForm.name='';

src/views/draw/atlas/index.vue

@@ -52,8 +52,8 @@
 							</div>
 							<span class="status_tag" style="margin-right: 40px;">待交接</span>
 							<!-- <img class="tag" :src="item.userImg" alt="用户头像"> -->
-							<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" v-if="item.userImg" alt="头像" :title="item.createrName">
-          		<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认头像" :title="item.createrName">
+							<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" v-if="item.userImg" alt="头像" :title="item.createrName" @click="changeUserimg(item.createrId)">
+          		<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认头像" :title="item.createrName" @click="changeUserimg(item.createrId)">
 							<div class="opt_wrap">
 								<el-button type="primary" size="mini" icon="el-icon-circle-check-outline" @click="alertUpdate(item)">交接</el-button>
 								<el-button type="danger"  icon="el-icon-circle-close-outline" size="mini" @click="alertRefus(item)">驳回</el-button>
@@ -291,6 +291,10 @@ export default {
 			this.getList();
 			this.searchUserVisible=false;
 		},
+		changeUserimg(createrId){
+			this.searchForm.createrId=createrId;
+			this.getList();
+		},
 		userFilter(value){
 			this.getUserList(value);
 		},

src/views/draw/atlas_rich/index.vue

@@ -47,8 +47,8 @@
 							<p class="text">{{item.description}}</p>
 						</div>
 						<span class="tag">待丰富化</span>
-						<img class="tag userPhoto" :src="`${uploadUrl}?fileName=${item.userImg}`" alt="头像" v-if="item.userImg" :title="item.createrName">
-						<img class="tag userPhoto" src="../../../assets/img/default.png" alt="头像" v-else :title="item.createrName">
+						<img class="tag userPhoto" :src="`${uploadUrl}?fileName=${item.userImg}`" alt="头像" v-if="item.userImg" :title="item.createrName" @click="changeUserimg(item.createrId)">
+						<img class="tag userPhoto" src="../../../assets/img/default.png" alt="头像" v-else :title="item.createrName" @click="changeUserimg(item.createrId)">
 						<div class="opt_wrap">
 							<el-button type="primary" size="mini" plain icon="el-icon-view" class="look_btn" @click="richTo(item.id)">查看</el-button>
 						</div>
@@ -294,9 +294,12 @@ export default {
 			this.getList();
 			this.searchUserVisible=false;
 		},
+		changeUserimg(createrId){
+			this.searchForm.createrId=createrId;
+			this.getList();
+		},
 		userFilter(value){
 			this.getUserList(value);
-			console.log(value,'9999')
 		},
 		changeAlbumType(){
 			this.getList();

src/views/draw/metadata/index.vue

@@ -44,9 +44,9 @@
 							<p class="text">{{item.description}}</p>
 						</div>
 						<span class="tag">待丰富化</span>
-						<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" v-if="item.userImg" alt="头像" :title="item.createrName">
+						<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" v-if="item.userImg" alt="头像" :title="item.createrName" @click="changeUserimg(item.createrId)">
 						<!-- <img class="tag_img" :src="item.userImg" v-if="item.userImg" alt="头像"> -->
-          	<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认头像" :title="item.createrName">
+          	<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认头像" :title="item.createrName" @click="changeUserimg(item.createrId)">
 						<div class="opt_wrap">
 							<el-button type="primary" size="mini" plain icon="el-icon-view" class="look_btn" @click="richTo(item)">查看</el-button>
 						</div>
@@ -277,6 +277,10 @@ export default {
 			this.getList();
 			this.searchUserVisible=false;
 		},
+		changeUserimg(createrId){
+			this.searchForm.createrId=createrId;
+			this.getList();
+		},
 		userFilter(value){
 			this.getUserList(value);
 			console.log(value,'9999')

src/views/draw/sip/index.vue

@@ -52,10 +52,10 @@
 							<el-tag type="warning" effect="dark"  style="margin-right: 40px;">待交接</el-tag> -->
 							<span class="album_tag" style="margin-right: 40px;" v-if="item.albumId">图册</span>
 							<span class="status_tag" style="margin-right: 40px;">待交接</span>
-							<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" v-if="item.userImg" alt="头像" :title="`上传者：${item.createrName}`">
-							<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认头像" :title="`上传者：${item.createrName}`">
-							<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.modifierImg}&isOnLine=true`" v-if="item.modifierImg" alt="头像" :title="`最后编辑：${item.modifierName}`">
-          		<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认修改人头像" :title="`最后编辑：${item.modifierName}`">
+							<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" v-if="item.userImg" alt="头像" :title="`上传者：${item.createrName}`" @click="changeUserimg(item.createrId)">
+							<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认头像" :title="`上传者：${item.createrName}`" @click="changeUserimg(item.createrId)">
+							<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.modifierImg}&isOnLine=true`" v-if="item.modifierImg" alt="头像" :title="`最后编辑：${item.modifierName}`" @click="changeUserimg(item.modifierId)">
+          		<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认修改人头像" :title="`最后编辑：${item.modifierName}`" @click="changeUserimg(item.modifierId)">
 							<div class="opt_wrap">
 								<el-button type="primary" size="mini" icon="el-icon-circle-check-outline" @click="alertUpdate(item)">交接</el-button>
 								<el-button type="danger"  icon="el-icon-circle-close-outline" size="mini" @click="alertRefuse(item)">驳回</el-button>
@@ -286,6 +286,10 @@ export default {
 			this.getList();
 			this.searchUserVisible=false;
 		},
+		changeUserimg(createrId){
+			this.searchForm.createrId=createrId;
+			this.getList();
+		},
 		userFilter(value){
 			this.getUserList(value);
 		},