修改批量

src/views/draw/metadata/contrast.vue

 <template>
   <div class="metadata_contrast app-container">
+		<div class=" clearfix">
+			<a><span class="refBtn fr" style="margin: 17px 0px 23px;" @click="$router.go(-1)"><i class="el-icon-back" ></i>	返回</span>	</a>
+		</div>
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<div style="width:100%;"  class="pdf_wrap" v-loading="loading">
@@ -46,9 +49,11 @@ export default {
 		}
 	},
 	mounted() {
-		this.file=this.$route.query.file;
-		this.pdf=this.$route.query.pdf;
+		this.file=JSON.parse(this.$route.query.file);
+		this.pdf=JSON.parse(this.$route.query.pdf);
+		console.log(this.file,this.pdf,'00000000000')
 		this.file.fileName=`${this.domain}${requestPath.file}?fileName=${this.file.fileName}&isOnLine=true`;
+		this.pdf.fileName=`${this.domain}${requestPath.file}?fileName=${this.pdf.fileName}&isOnLine=true`;
 	},
 	methods: {
 		refPage(){

src/views/draw/metadata/detail.vue

@@ -228,7 +228,7 @@
 													<img class="tag_img" v-if="item.userImg" :src="`${uploadUrl}?fileName=${item.userImg}`" alt="头像" >
 													<img class="tag_img" v-else :src="`${uploadUrl}?fileName=${item.userImg}`" alt="头像">
 													<div class="opt_wrap">
-														<el-button type="primary" plain size="mini" @click="contrastTo(item.fileName,item.name)"><i class="iconfont icon-projectguanlianbijiao"></i>	关联比较</el-button>
+														<el-button type="primary" plain size="mini" @click="contrastTo(item.pdfName,item.name)"><i class="iconfont icon-projectguanlianbijiao"></i>	关联比较</el-button>
 														<el-button type="success" plain size="mini" icon="el-icon-search" @click="linkSip">查看</el-button>
 													</div>
 												</div>
@@ -265,7 +265,7 @@
 				</el-form>
 				<span slot="footer" class="dialog-footer">
 					<el-button @click="entityVisible = false">取 消</el-button>
-					<el-button type="primary" @click="entitySubmit">确 定</el-button>
+					<el-button type="primary" @click="entitySubmit" v-loading="submitLoad">确 定</el-button>
 				</span>
 			</el-dialog>
 			<!-- 命名实体确认 -->
@@ -325,7 +325,7 @@
 				<span slot="footer" class="dialog-footer">
 					<el-button @click="personLinkVisible = false">取 消</el-button>
 					<!-- <el-button type="primary" @click="personLinkVisible = false">更换义项</el-button> -->
-					<el-button type="primary" @click="importPerson">确认实体</el-button>
+					<el-button type="primary" @click="importPerson" v-loading="submitLoad">确认实体</el-button>
 				</span>
 			</el-dialog>
 			<!-- 地理位置实体确认 -->
@@ -574,6 +574,7 @@ export default {
 			positionLinkVisible:false,
 			organizationLinkVisible:false,
 			timerLinkVisible:false,
+			submitLoad:false,
 			backForm:{
 				state:1,
 				keyword:''
@@ -756,6 +757,7 @@ export default {
 		entitySubmit(){	
 			this.$refs['entityForm'].validate((valid) => {
 				if (valid) {
+					this.submitLoad=true;
 					addEntityAPI(this.entityForm).then(res=>{
 						if(res.data.code===0){
 							let tab={
@@ -765,8 +767,10 @@ export default {
 							this.backForm.state=this.entityForm.state;//显示哪个弹框
 							this.lookBack(this.entityForm.keyword);
 							this.entityVisible=false;
+							this.submitLoad=false;
 						}else{
 							this.$message.error('新增实体失败')
+							this.submitLoad=false;
 						}
 					})
 				} else {
@@ -896,6 +900,7 @@ export default {
 		importPerson(){
 			this.$refs['personForm'].validate((valid) => {
 				if(valid){
+					  this.submitLoad=true;
 						this.personForm.keyword=this.backForm.keyword;
 						importPersonAPI(this.personForm).then(res=>{
 							if(res.data.code == 0){
@@ -906,8 +911,10 @@ export default {
 								}
 								this.handleInnerClick(tab,event)
 								this.personLinkVisible = false;
+								this.submitLoad=false;
 							}else{
 								this.$message.error('确认实体失败');
+								this.submitLoad=false;
 							}
 						})
 				}else{
@@ -1010,15 +1017,17 @@ export default {
 				this.getTimer()
 			}
 		},
-		contrastTo(fileName,name){
+		contrastTo(pdfName,name){
+			let file={
+				fileName:pdfName,
+				name:name,
+			}
+			let pdf={
+				fileName:this.pdf.pdfName,
+				name:this.pdf.name
+			}
 			this.$router.push({path:"/draw/metadata_contrast",query:{
-					file:{
-						fileName:fileName,
-						name:name,
-					},pdf:{
-						fileName:this.pdf.fileName,
-						name:this.pdf.name
-					}
+					file:JSON.stringify(file),pdf:JSON.stringify(pdf)
 				}
 			})
 		},

src/views/draw/metadata/index.scss

@@ -158,7 +158,7 @@
             .tag{
                 margin: 0 20px;
                 color:#F56C6C;
-                
+
             }
             .tag_img{
                 width: 28px;
@@ -406,6 +406,10 @@
     .ref_btn{
         cursor: pointer;
     }
+    .refBtn{
+        font-size:14px;
+        color:#868BA3;
+    }
     .pdf_wrap{
         background-color: #fff;
         padding: 20px;

src/views/draw/sip/index.vue

@@ -312,7 +312,7 @@ export default {
 		},
 		batchUpdate(){
 			let data={
-				ids:this.allIds,
+				ids:this.multipleSelection,
 				status: 3,//通过交接
 				remark:this.pdf.remark
 			}
@@ -338,7 +338,7 @@ export default {
 		},
 		batchRefuse(){
 			let data={
-				ids:this.allIds,
+				ids:this.multipleSelection,
 				status: 4,//通过交接
 				remark:this.pdf.remark
 			}

src/views/draw/sip/msg_packet.vue

@@ -114,7 +114,7 @@
 							<el-steps :active="activeStatus" finish-status="success" align-center>
 								<el-step title="待录入" v-if="pdf.status==0"></el-step>
 								<el-step title="待挂接" v-if="pdf.status==2"></el-step>
-								<el-step title="审交接中"></el-step>
+								<el-step title="审核交接中"></el-step>
 								<el-step title="已交接" v-if="pdf.status!=4"></el-step>
 								<el-step title="已入库" v-if='pdf.status!=4'></el-step>
 								<el-step title="拒绝交接" v-if="pdf.status==4"></el-step>