Merge branch 'qll' into dev

src/api/dataManagement/index.js

@@ -23,6 +23,13 @@ export function getTypeAPI(params) { //查看资源类型
         params
     })
 }
+export function getMapAPI(params) { //查看资源分布，地图
+    return request({
+        url: `${requestPath.resource}/resource/geography/resource`,
+        method: 'get',
+        params
+    })
+}
 
 
 

src/views/dataManagement/chart.vue

@@ -41,7 +41,7 @@ anhui,beijing,fujian,xianggang,taiwan
 } from "@/utils/importMap";
 import { CityInfo } from '@/mock/city-data'
 import { debounce } from '@/utils'
-import { getSurveyAPI,getStatusAPI,getTypeAPI} from '@/api/dataManagement/index'
+import { getSurveyAPI,getStatusAPI,getTypeAPI,getMapAPI} from '@/api/dataManagement/index'
 var surveyOption = {
     backgroundColor: "#fff",
     "title": {
@@ -510,21 +510,44 @@ var mapOption = {
           top: 'bottom',
           text: ['高', '低'],
           calculable: true,
-          seriesIndex:'1',
+          seriesIndex:'0',
           show:false,
           inRange: {
-            //color: ['#01524c', '#02726c'] // 蓝绿
             color:["#01689C",'#01689C']
           }
       },
       series: [{
-        name: '',
+            name: '散点',
+            type: 'scatter',
+            coordinateSystem: 'geo',
+            data: [],
+            symbolSize: function(val) {
+                return 6;
+            },
+            label: {
+                normal: {
+                    //color: 'yellow',
+                    formatter: '{b}',
+                    position: 'center',
+                    align:"center",
+                    show: true
+                },
+                emphasis: {
+                    show: true
+                }
+            },
+            itemStyle: {
+                normal: {
+                    color: 'yellow'
+                }
+            }
+        },{
+        name: '气泡',
         type: 'scatter',
         coordinateSystem: 'geo',
         symbol: 'pin',
         data:[
-            {name: "天安门",value:[116.403694,39.914271, 258]},
-            {name: "四惠桥",value:[116.49568,39.914271,333]}
+            
         ],
         symbolSize: function(val) {
             // var a = (maxSize4Pin - minSize4Pin) / (max - min);
@@ -533,47 +556,23 @@ var mapOption = {
             // return a * val[2] + b;
             return 35;
         },
-        // label: {
-        //     normal: {
-        //         show: true,
-        //         formatter: function(params) {
-        //             return params.data.value[2]
-        //         },
-        //         textStyle: {
-        //             color: '#fff',
-        //             fontSize: 9,
-        //         }
-        //     }
-        // },
-        label: {
+        label:{
             normal: {
-            color: '#04BFFC',
-                //formatter: '{b}',
+                show: true,
                 formatter:function(params){
-                return '{white|'+params.value[2]+'}\n'+'{name|'+params.name+'}'
+                    return params.value[2]
                 },
-                rich: {
-                    'white': {
-                        color:"#fff",
-                        height:18,
-                        align:'center',
-                    },
-                    'name':{
-                       color:"yellow",
-                       height:20,
-                       align:'right'
-                    }
-                },
-                position: 'center',
-                show: true
-            }
+                textStyle: {
+                    color: '#fff',
+                    fontSize: 9,
+                }
+            },
         },
         itemStyle: {
             normal: {
-                color: 'red', //标志颜色
+                color: '#F62157', //标志颜色
             }
         },
-        
         zlevel: 1
     }]
   };
@@ -682,7 +681,21 @@ export default {
     getMap(proName='北京市'){
        mapOption.geo.map=proName;
        echarts.registerMap(proName, cityMap[proName]);
-       this.mapChart.setOption(mapOption,true) 
+       mapOption.title.text= proName+"资源分布情况";
+       let params={
+           name:proName
+       }
+       getMapAPI(params).then(res=>{
+           if(res.data.code==0){
+                let resData=res.data.data||[];
+                mapOption.series[0].data=resData;
+                mapOption.series[1].data=resData;
+                this.mapChart.setOption(mapOption,true) 
+            }else{
+                this.$message.error('获取资源状态失败')
+            }
+       })
+       
     },
     changePro(){
         this.getMap(this.province)

src/views/draw/atlas/index.vue

@@ -414,6 +414,7 @@ export default {
 		refPage(){
 			this.loading=true;
 			this.resetSearch();
+			this.bus.$emit("resetSearch",'');
 			setTimeout(()=>{
 				this.loading=false;
 			},1000)

src/views/draw/atlas_rich/index.vue

@@ -244,6 +244,7 @@ export default {
 		refPage(){
 			this.loading=true;
 			this.resetSearch();
+			this.bus.$emit("resetSearch",'');
 			setTimeout(()=>{
 				this.loading=false;
 			},1000)

src/views/draw/metadata/detail.vue

@@ -26,7 +26,7 @@
 							<img :src="pdf.fileName" alt="" class="pic_show">
 						</div>
 						<!-- 图册 -->
-						<div style="width:80%;margin:0 auto;height:800px;text-align:center" v-if="resourceType==5">
+						<div style="width:80%;margin:0 auto;height:800px;text-align:center" v-else-if="resourceType==5">
 							
 						</div>
 						<div style="width:80%;margin:0 auto;height:800px" v-else>

src/views/draw/metadata/index.vue

@@ -227,6 +227,7 @@ export default {
 		refPage(){
 			this.loading=true;
 			this.resetSearch();
+			this.bus.$emit("resetSearch",'');
 			setTimeout(()=>{
 				this.loading=false;
 			},1000)

src/views/draw/sip/index.vue

@@ -317,11 +317,12 @@ export default {
 				remark:this.pdf.remark
 			}
 			batchUpdateStatusAPI(data).then(res => {
-				operationMsg.apply(this, [
-					res.data.code,
-					`批量提交${this.multipleSelection.length}项`
-				]);			
-				//this.getList();
+				if(res.data.code==0){
+					this.$message.success(`批量提交${this.multipleSelection.length}项`);					
+					this.getList();
+				}else{
+					this.$message.error('提交失败')
+				}
 				this.passVisible=false;
 			});  
 		},
@@ -342,12 +343,13 @@ export default {
 				remark:this.pdf.remark
 			}
 			batchUpdateStatusAPI(data).then(res => {
-				operationMsg.apply(this, [
-					res.data.code,
-					`批量提交${this.multipleSelection.length}项`
-				]);
+				if(res.data.code==0){
+					this.$message.success(`批量提交${this.multipleSelection.length}项`);					
+					this.getList();
+				}else{
+					this.$message.error('提交失败')
+				}
 				this.passVisible=false;
-				this.getList();
 			});  
 		},
 		alertUpdate(item){
@@ -364,12 +366,11 @@ export default {
 		singleUpdate(){
 			this.dataUpdate.remark=this.pdf.remark;
 			batchUpdateStatusAPI(this.dataUpdate).then(res => {
-				operationMsg.apply(this, [
-					res.data.code,
-					`提交`
-				]);
 				if(res.data.code==0){
+					this.$message.success('提交成功');					
 					this.getList();
+				}else{
+					this.$message.error('提交失败')
 				}
 				this.passVisible=false;
 			});
@@ -393,12 +394,13 @@ export default {
 					remark:this.pdf.remark
 				}
 				batchUpdateStatusAPI(data).then(res => {
-					operationMsg.apply(this, [
-						res.data.code,
-						`提交`
-					]);
+					if(res.data.code==0){
+						this.$message.success('提交成功');					
+						this.getList();
+					}else{
+						this.$message.error('提交失败')
+					}
 					this.passVisible=false;
-					this.getList();
 				});
 		},
 		handleCheckAllChange(val) {
@@ -416,6 +418,7 @@ export default {
 		refPage(){
 			this.loading=true;
 			this.resetSearch();
+			this.bus.$emit("resetSearch",'');
 			setTimeout(()=>{
 				this.loading=false;
 			},1000)

src/views/draw/sip/msg_packet.vue

@@ -19,8 +19,8 @@
 								</span>
 								<span v-else>
 									<img src="~@/assets/img/pdf.png" alt="pdf" class="pdf_icon">
-									<el-button type="primary" icon="el-icon-refresh" size="mini">重新转码</el-button>
-									<el-button type="primary" icon="el-icon-document" size="mini">目录转译</el-button>
+									<!-- <el-button type="primary" icon="el-icon-refresh" size="mini">重新转码</el-button>
+									<el-button type="primary" icon="el-icon-document" size="mini">目录转译</el-button> -->
 								</span>
 							</p>
 						</div>
@@ -104,9 +104,9 @@
 							</div>
 						</div>
 						<div class="status-btn" v-if="pdf.status==1">
-							<el-button type="danger"  icon="el-icon-close">拒绝</el-button>
+							<el-button type="danger"  icon="el-icon-close" @click="refuse">拒绝</el-button>
 							<el-button type="success" icon="el-icon-check" @click="passVisible=true">通过</el-button>
-							<el-button type="warning" icon="el-icon-edit">编辑</el-button>
+							<el-button type="warning" icon="el-icon-edit" @click="linkToEdit">编辑</el-button>
 						</div>
 						<div class="step_wrap">
 							<!-- //0待录入，2待挂接，1待交接，3通过交接（待丰富化），4拒绝交接 ,5已入库 -->
@@ -129,6 +129,7 @@
 				:visible.sync="passVisible"
 				width="800px"
 				class=""
+				@close="closePass"
 				>
 			<el-form ref="form" :model="pdf" label-width="80px">
 				<el-form-item label="题名：">
@@ -201,6 +202,8 @@ export default {
 				if(res.data.code===0){
 					let {fileName}=res.data.data;
 					this.pdf=res.data.data;
+					//回显，置空备注
+					this.pdf.remark='';
 					this.activeStatus=this.pdf.status;
 					this.fileName=fileName;
 					this.pdf.fileName=`${this.domain}${requestPath.file}?fileName=${fileName}&isOnLine=true`;
@@ -232,6 +235,30 @@ export default {
 		linkPic(){
 			this.$router.push({path:'/submission/infoview/photolook',query:{oid:this.pdf.albumId}})
 		},
+		refuse(){
+			confirm.apply(this,['确定要拒绝交接吗？']).then(() => {
+				let data={
+						ids:[this.id],
+						status: 4,//拒绝交接
+						remark:this.pdf.remark
+					}
+					batchUpdateStatusAPI(data).then(res => {
+						if(res.data.code==0){
+							this.$message.success('提交成功');					
+							this.getDetail();
+						}else{
+							this.$message.error('提交失败')
+						}			
+					});
+			})
+		},
+		linkToEdit(){
+			//console.log(this.pdf.albumId,'this.pdf.albumId')
+			this.$router.push({path:'/submission/resourcecommit',query:{oid:this.id}})
+		},
+		closePass(){
+			this.pdf.remark='';
+		},
 		handleClick(){
 
 		},

src/views/layout/components/AppMain.vue

@@ -50,6 +50,7 @@ export default {
     }else{
       this.showSearch=false;
     }
+    this.resetInput();
   },
   watch: {
     $route(to,from){
@@ -74,14 +75,6 @@ export default {
     }
   },
   methods:{
-    // valueChange(value) {
-    //   console.log(value,'value')
-    //   if (value.length < 30) {
-    //     this.$store.dispatch("SetSearchValue", value).then(res => {});
-    //   }else{
-    //     return
-    //   }
-    // },
     search(){
       let meta=this.$route.meta;
       if(this.$route.name=="atlasRich"||this.$route.name=="atlas"){
@@ -90,10 +83,16 @@ export default {
         this.bus.$emit("searchList",this.value);
       }
       //console.log(this.$store.state.pageTemp,'11111111111')
+    },
+    resetInput(){
+      this.bus.$off('resetSearch').$on('resetSearch', content => { 
+        this.value='';
+        console.log('清空了，哈哈哈')
+      });
     }
   },
   beforeDestroy () {
-    
+    this.bus.$off('resetSearch');
   }
 }
 </script>