Merge branch 'qll' of http://192.168.2.120/quanlili/knowledgeServiceAdmin into wtf

src/styles/element-ui.scss

@@ -203,12 +203,13 @@
   .user_list_dialog{   
       display: flex;
       .header_pic{
-          width: 75px;
-          height: 75px;
-          img{
-              width: 100%;
-              height: 100%; 
-          }
+        width: 74px;
+        height: 74px;
+        img{
+            width: 60px;
+            height: 60px; 
+            margin-top:7px;
+        }
       }
       .content_right{
           flex: 1;

src/views/dataManagement/index.scss

@@ -195,11 +195,12 @@
     .user_list_dialog{   
         display: flex;
         .header_pic{
-            width: 75px;
-            height: 75px;
+            width: 74px;
+            height: 74px;
             img{
-                width: 100%;
-                height: 100%; 
+                width: 60px;
+                height: 60px; 
+                margin-top:7px;
             }
         }
         .content_right{

src/views/dataManagement/search.vue

@@ -123,7 +123,10 @@
 					:label="item.name"
 					:value="item.userId">
 					<div class="user_list_dialog">
-						<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
+						<dt class="header_pic">
+							<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
+							<img src="~@/assets/img/default.png" alt="默认头像" v-else>
+						</dt>
 						<dd class="content_right">
 							<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
 							<div>{{ item.email }}</div>
@@ -248,7 +251,7 @@ export default {
 			dateTime:'',
 			formation:'',//形成时间的筛选的
 			size:'',
-			createTime:'',
+			createTime:'desc',
 			list:[],
 			totalCount:0,
 		}
@@ -302,7 +305,7 @@ export default {
 				pageSize:this.searchForm.pageSize
 			};
 			this.formation='';
-			this.createTime='';
+			this.createTime='desc';
 			this.size ='';
 			this.getList()
 		},

src/views/draw/atlas/index.vue

@@ -83,7 +83,10 @@
 					:label="item.name"
 					:value="item.userId">
 					<div class="user_list_dialog">
-						<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
+						<dt class="header_pic">
+							<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
+							<img src="~@/assets/img/default.png" alt="默认头像" v-else>
+						</dt>
 						<dd class="content_right">
 							<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
 							<div>{{ item.email }}</div>
@@ -163,7 +166,8 @@ export default {
 	data () {
 		return {
 			domain: process.env.BASE_API,
-      requestPath: requestPath,
+			requestPath: requestPath,
+			uploadUrl:uploadUrl,
 			loading:false,
 			checkAll: false,
 			searchUserVisible:false,

src/views/draw/atlas_rich/index.vue

@@ -74,7 +74,10 @@
 					:label="item.name"
 					:value="item.userId">
 					<div class="user_list_dialog">
-						<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
+						<dt class="header_pic">
+							<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
+							<img src="~@/assets/img/default.png" alt="默认头像" v-else>
+						</dt>
 						<dd class="content_right">
 							<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
 							<div>{{ item.email }}</div>

src/views/draw/metadata/detail.vue

@@ -352,7 +352,7 @@
 								<el-input v-model="positionForm.latitude" disabled></el-input>
 								<div class="tip">请在下面地图上单击，拾取经纬度</div>
 							</el-form-item>
-							<baidu-map class="bm-position" :center="backForm.keyword" @ready="handleMap">
+							<baidu-map class="bm-position" :center="city" @ready="handleMap">
 								<bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
 								<bm-marker :position="{'lng': positionForm.longitude, 'lat': positionForm.latitude}" :dragging="true" @dragging="remove">
 								</bm-marker>
@@ -505,7 +505,7 @@ export default {
 			loading:false,
 			domain: process.env.BASE_API,
 			requestPath: requestPath,
-			//packet:{lng: 116.404, lat: 39.915},
+			packet:{lng: 116.404, lat: 39.915},
 			entityVisible:false,
 			personLinkVisible:false,
 			positionLinkVisible:false,
@@ -723,7 +723,8 @@ export default {
 			}	else if(this.backForm.state==4){
 				this.timerLinkVisible=true;
 			}
-			this.backForm.keyword=keyword;			
+			this.backForm.keyword=keyword;		
+			this.city=keyword;//地图的显示中心	
 			this.backDetial()
 		},
 		resetEntity(){
@@ -791,6 +792,11 @@ export default {
 					}else if(this.backForm.state==3){
 						if(res.data.data){
 							this.positionForm=res.data.data;
+							if(!this.positionForm.longitude){
+								this.city="北京";//地图的显示中心
+							}
+						}else{
+							this.city="北京";//地图的显示中心
 						}
 					}else if(this.backForm.state==2){
 						this.organizationForm=res.data.data||{};

src/views/draw/metadata/index.vue

@@ -72,7 +72,10 @@
 					:label="item.name"
 					:value="item.userId">
 					<div class="user_list_dialog">
-						<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
+						<dt class="header_pic">
+							<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
+							<img src="~@/assets/img/default.png" alt="默认头像" v-else>
+						</dt>
 						<dd class="content_right">
 							<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
 							<div>{{ item.email }}</div>
@@ -121,7 +124,8 @@ export default {
 	data () {
 		return {
 			domain: process.env.BASE_API,
-      requestPath: requestPath,
+			requestPath: requestPath,
+			uploadUrl:uploadUrl,
 			searchUserVisible:false,
 			searchTimerVisible:false,
 			loading:false,

src/views/draw/sip/index.vue

@@ -85,7 +85,10 @@
 					:label="item.name"
 					:value="item.userId">
 					<div class="user_list_dialog">
-						<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
+						<dt class="header_pic">
+							<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
+							<img src="~@/assets/img/default.png" alt="默认头像" v-else>
+						</dt>
 						<dd class="content_right">
 							<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
 							<div>{{ item.email }}</div>
@@ -167,7 +170,8 @@ export default {
 	data () {
 		return {
 			domain: process.env.BASE_API,
-      requestPath: requestPath,
+			requestPath: requestPath,
+			uploadUrl:uploadUrl,
 			loading:false,
 			checkAll: false,
 			searchUserVisible:false,

src/views/submission/infoview/allresource.vue

@@ -147,7 +147,7 @@ export default {
 			dateTime:'',
 			formation:'',//形成时间的筛选的
 			size:'',
-			createTime:'',
+			createTime:'desc',
 			list:[],
 			totalCount:0,
 		}

src/views/submission/infoview/browsebycategory.vue

@@ -217,7 +217,7 @@ export default {
 			},
 			formation:'',//形成时间的筛选的
 			size:'',
-			createTime:'',
+			createTime:'desc',
 			list:[],
 			totalCount:0,
 			diytypeList:[],

src/views/submission/infoview/mycommit.vue

@@ -155,7 +155,7 @@ export default {
 			dateTime:'',
 			formation:'',//形成时间的筛选的
 			size:'',
-			createTime:'',
+			createTime:'desc',
 			list:[],
 			totalCount:0,
 		}
@@ -205,7 +205,7 @@ export default {
 		},
 		refPage(){
 			this.loading=true;
-			this.resetSearch();
+			//this.resetSearch();
 			setTimeout(()=>{
 				this.loading=false;
 			},1000)

src/views/submission/infoview/myedit.vue

@@ -153,7 +153,7 @@ export default {
 			dateTime:'',
 			formation:'',//形成时间的筛选的
 			size:'',
-			createTime:'',
+			createTime:'desc',
 			list:[],
 			totalCount:0,
 		}