Merge branch 'dev' of http://192.168.2.120/quanlili/knowledgeServiceAdmin into dev

src/router/index.js

@@ -135,15 +135,6 @@ export const asyncRouterMap = [{
                 routerIds: ['2401']
             }
         },{
-            path: 'sip_metadata',
-            component: _import('submission/sip/index'),
-            name: 'sipMetadata',
-            meta: {
-                title: '待审核资源',
-                routerIds: ['2408'],
-                search:true
-            }
-        },{
             path: 'resourcecommit',
             component: _import('submission/resourcecommit/index'),
             name: 'resourcecommit',
@@ -172,6 +163,15 @@ export const asyncRouterMap = [{
                     search:true
                 },
             },{
+                path: 'sip_metadata',
+                component: _import('submission/sip/index'),
+                name: 'sipMetadata',
+                meta: {
+                    title: '待审核资源',
+                    routerIds: ['2408'],
+                    search:true
+                }
+            },{
                 path: 'myedit',
                 component: _import('submission/infoview/myedit'),
                 name: 'myedit',

src/views/dataManagement/index.scss

@@ -3,7 +3,7 @@
     padding:37px 28px 20px;
     .metaDataTop {
         width:100%;
-        border-bottom:1px solid #EBEEF1;
+        // border-bottom:1px solid #EBEEF1;
         padding-bottom:23px;
         em {
             color:#3F4560;
@@ -47,6 +47,7 @@
         font-size:14px;
         background:#F9FAFC;
         border-bottom:1px solid #DCE1E9;
+        border-top:1px solid #DCE1E9;
         display: flex;
 		justify-content: space-between;
         .screeningConditionsLeft {

src/views/draw/atlas_rich/index.scss

@@ -7,7 +7,7 @@
     }
     .metaDataTop {
         width:100%;
-        border-bottom:1px solid #EBEEF1;
+        // border-bottom:1px solid #EBEEF1;
         padding-bottom:23px;
         em {
             color:#3F4560;
@@ -34,6 +34,7 @@
         font-size:14px;
         background:#F9FAFC;
         border-bottom:1px solid #DCE1E9;
+        border-top:1px solid #DCE1E9;
         .screeningConditionsLeft {
             float:left;
             padding-left: 26px;

src/views/draw/metadata/index.scss

@@ -84,6 +84,7 @@
     .pdf_wrap{
         .pic_show{
             max-width: 100%;
+            max-height: 100%;
             height: auto;
         }
         .pdf_tit{
@@ -279,7 +280,7 @@
     }
     .metaDataTop {
         width:100%;
-        border-bottom:1px solid #EBEEF1;
+        // border-bottom:1px solid #EBEEF1;
         padding-bottom:23px;
         em {
             color:#3F4560;
@@ -306,6 +307,7 @@
         font-size:14px;
         background:#F9FAFC;
         border-bottom:1px solid #DCE1E9;
+        border-top:1px solid #DCE1E9;
         .screeningConditionsLeft {
             float:left;
             padding-left: 26px;

src/views/draw/sip/index.scss

@@ -230,6 +230,7 @@
     .pdf_wrap{
         .pic_show{
             max-width: 100%;
+            max-height: 100%;
         }
         .pdf_tit{
             color: #3F4560;
@@ -253,7 +254,7 @@
         margin-left:24px;
         // overflow: hidden;
         position: relative;
-        padding: 0 28px 15px;
+        padding: 0 22px 15px;
         background-color: #fff;
         &.upClass{
             width: 68px;
@@ -276,7 +277,7 @@
             overflow: hidden;
         }
         .side_content{
-            width: 388px;
+            width: 400px;
         }
         .title_wrap{
             padding: 0px;
@@ -300,11 +301,14 @@
                 font-weight: bold;
             }
             .tag_label{
+                display: inline-block;
                 background-color:#7e899b;
                 border-radius: 4px;
                 padding: 4px 8px;
                 color: #fff;
                 margin-right: 4px;
+                white-space: nowrap;
+                margin-bottom: 4px;
             }
             .cont{
                 flex: 1;

src/views/draw/sip/msg_packet.vue

@@ -135,14 +135,16 @@
 							<el-button type="warning" icon="el-icon-edit" @click="linkToEdit">编辑</el-button>
 						</div>
 						<div class="step_wrap">
-							<!-- //0待录入，2待挂接，1待交接（审核交接中），3通过交接（已交接），4拒绝交接 ,5已入库 -->
+							<!-- //0待录入，2待挂接，6待提交，1待交接（审核交接中），3通过交接（已交接），4拒绝交接 ,5已入库 ，7提交失败-->
 							<el-steps :active="activeStatus" finish-status="success" align-center>
 								<el-step title="待录入" v-if="pdf.status!=2"></el-step>
 								<el-step title="待挂接" v-if="pdf.status==2"></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="待提交"></el-step>
+								<el-step title="审核交接中" v-if="pdf.status!=7"></el-step>
+								<el-step title="已交接" v-if="pdf.status!=4&&pdf.status!=7"></el-step>
+								<el-step title="已入库" v-if='pdf.status!=4&&pdf.status!=7'></el-step>
 								<el-step title="拒绝交接" v-if="pdf.status==4"></el-step>
+								<el-step title="提交失败" v-if="pdf.status==7"></el-step>
 							</el-steps>
 							<!-- <el-steps :active="activeStatus" finish-status="success">
 								<el-step title="步骤 1"></el-step>
@@ -236,11 +238,20 @@ export default {
 				this.activeStatus=1;
 			}
 			if(newV==1){
-				this.activeStatus=2;
+				this.activeStatus=3;
 			}
 			if(newV==2){
 				this.activeStatus=1;
 			}
+			if(newV==3){
+				this.activeStatus=4;
+			}
+			if(newV==6){
+				this.activeStatus=2;
+			}
+			if(newV==7){
+				this.activeStatus=3;
+			}
 		}
 	},
 	methods: {

src/views/index_show/index.scss

@@ -263,7 +263,7 @@
     padding:37px 28px 20px;
     .metaDataTop {
         width:100%;
-        border-bottom:1px solid #EBEEF1;
+        // border-bottom:1px solid #EBEEF1;
         padding-bottom:24px;
         em {
             color:#3F4560;
@@ -306,6 +306,7 @@
         font-size:14px;
         background:#F9FAFC;
         border-bottom:1px solid #DCE1E9;
+        border-top:1px solid #DCE1E9;
         .screeningConditionsLeft {
             float:left;
             padding-left: 26px;
@@ -486,7 +487,7 @@
     padding: 37px 28px 0;
     .metaDataTop {
         width:100%;
-        border-bottom:1px solid #EBEEF1;
+        // border-bottom:1px solid #EBEEF1;
         padding-bottom:24px;
         em {
             color:#3F4560;

src/views/storagemodule/storageinfomanger/resourcelook.vue

@@ -32,15 +32,18 @@
 					</div> -->
 				</div>
 				<div class="right">
+					<div style="padding:10px 0;">
+						<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in statusOptions" :key="item.value" @click="changeStatus(item)">
+								{{item.label}}
+							</span>
+					</div>
 					<div class="sipConditions">
 						<div class="screeningConditionsLeft">
 							<label for="">排列：</label>
 							<span @click="formationSort" class="btn" :class="[formation?'active':'']">形成时间<i :class="[formation=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 							<span @click="sizeSort" class="btn" :class="[size?'active':'']">资源大小<i :class="[size=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 							<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
-							<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in statusOptions" :key="item.value" @click="changeStatus(item)">
-								{{item.label}}
-							</span>
+							
 						</div>
 						<div class="screeningConditionsRight">
 							<el-select v-model="searchForm.resourceType" placeholder="请选择" @change="changeResourceType" style="width:140px">
@@ -170,6 +173,9 @@ export default {
 				value: '0',
 				label: '待录入',
 				text: '待录入'
+			},{
+				value: '6',
+				label: '待提交',
 			}, {
 				value: '1',
 				label: '待交接',
@@ -190,6 +196,12 @@ export default {
 				value: '5',
 				label: '已入库',
 				text: '已入库'
+			},{
+				value: '7',
+				label: '提交失败',
+			},{
+				value: '',
+				label: '全部',
 			}],
 			parentName:'',
 			diyTypeForm:{

src/views/submission/atlas/index.scss

@@ -8,7 +8,7 @@
         display: inline-block;
         line-height: 1;
         white-space: nowrap;
-        background-color: rgb(255, 168, 125)
+        background-color: #FF7588
     }
     .check_all{
         padding:20px 20px 0;

src/views/submission/atlas/index.vue

@@ -10,8 +10,8 @@
 					<el-button type="success" plain size="mini" @click="alertBatchUpdate">批量提交</el-button>
 					<el-button type="success" plain size="mini" @click="alertBatchBack">批量驳回</el-button>
 					<el-button type="success" plain size="mini" @click="searchTimerVisible=true">通过时间筛选</el-button>
-					<el-button type="success" plain size="mini" @click="searchUserVisible=true" v-if="!searchForm.createrId">筛选用户提交</el-button>
-					<em class="empty" v-else @click="clearUaer">清空用户筛选</em>
+					<!-- <el-button type="success" plain size="mini" @click="searchUserVisible=true" v-if="!searchForm.createrId">筛选用户提交</!--> 
+					<!-- <em class="empty" v-else @click="clearUaer">清空用户筛选</!--> 
 					<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 				</div>
 				<div class="screeningConditionsRight">
@@ -50,12 +50,12 @@
 									清太祖爱新觉罗·努尔哈赤（1559年2月21日—1626年9月30日），清朝的奠基者，后金开国之君，通满语和汉语，喜读《三国演义》。二十五岁时起兵统一女真各部，明神宗万历四十四年...
 								</p> -->
 							</div>
-							<span class="status_tag" style="margin-right: 40px;">待交接</span>
+							<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" @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="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>
 								<el-button type="success" size="mini" icon="el-icon-view" @click="lookTo(item.id)">查看</el-button>
 							</div>
@@ -126,7 +126,7 @@
 		</el-dialog>
 		<!-- 资源交接弹框 -->
 		<el-dialog
-				title="资源交接"
+				:title="updateTit"
 				:visible.sync="passVisible"
 				width="800px"
 				class=""
@@ -148,21 +148,23 @@
 			</el-form>
 			<span slot="footer" class="dialog-footer">
 				<el-button @click="passVisible = false">取消</el-button>
-				<el-button type="primary" @click="singleUpdate" v-if='!batchUpdateVisible&&dataUpdate.status==3'>确定</el-button>
-				<el-button type="primary" @click="batchUpdate" v-if='batchUpdateVisible&&dataUpdate.status==3'>确定</el-button>
-				<el-button type="primary" @click="batchBack" v-if='batchUpdateVisible&&dataUpdate.status==4'>确定</el-button>
-				<el-button type="primary" @click="refuse" v-if="!batchUpdateVisible&&dataUpdate.status==4">确定</el-button>
+				<el-button type="primary" @click="singleUpdate" v-if='!batchUpdateVisible&&dataUpdate.status==1'>确定</el-button>
+				<el-button type="primary" @click="batchUpdate" v-if='batchUpdateVisible&&dataUpdate.status==1'>确定</el-button>
+				<el-button type="primary" @click="batchBack" v-if='batchUpdateVisible&&dataUpdate.status==7'>确定</el-button>
+				<el-button type="primary" @click="refuse" v-if="!batchUpdateVisible&&dataUpdate.status==7">确定</el-button>
 			</span>
 		</el-dialog>
 	</div>
 </template>
 
 <script>
+import Cookies from 'js-cookie'
 import { getListAPI ,batchUpdateStatusAPI} from '@/api/atlas/index'
 import { getUserListAPI} from '@/api/commonResource'
 import pagination from '@/components/pagination/pagination'
 import { operationMsg, confirm } from '@/utils/publicFunctions'
 import { uploadUrl, uploadPath, requestPath } from "@/utils/global.js"
+
 export default {
 	name: 'atlasMetadata',
 	components:{pagination},
@@ -183,7 +185,7 @@ export default {
 			userList:[],
 			userListOption:[],
 			userValue:'',
-			updateTit:"资源交接",
+			updateTit:"资源提交",
 			albumOptions:[
 				{
 					value:'',
@@ -227,15 +229,15 @@ export default {
 				endTime:'',
 				pageNum:1,
 				pageSize:30,
-				status:1,//默认待交接的
-				createrId:'',
+				status:6,//默认待交接的
+				createrId:Cookies.get('userId'),
 				content:''
 			},
 			pdf:{},
 			dataUpdate:{
 				ids:[],
 				remark:'',
-				status: 3//通过交接
+				status: 1//通过交接
 			},
 			dateTime:'',
 			createTime:'desc',
@@ -330,10 +332,10 @@ export default {
 		},
 		alertBatchUpdate(){
 				if (this.multipleSelection.length > 0) {
-					this.updateTit='批量交接'
+					this.updateTit='批量提交'
 					this.batchUpdateVisible=true;
 					this.passVisible=true;
-					this.dataUpdate.status=3;
+					this.dataUpdate.status=1;
 				}else{
 					this.$message.warning("请先选择需要提交的内容");
 				}	
@@ -341,7 +343,7 @@ export default {
 		batchUpdate(){
 			let data={
 				ids:this.multipleSelection,
-				status: 3,//通过交接
+				status: 1,//通过交接
 				remark:this.pdf.remark
 			}
 			batchUpdateStatusAPI(data).then(res => {
@@ -357,7 +359,7 @@ export default {
 					this.updateTit='批量驳回'
 					this.batchUpdateVisible=true;
 					this.passVisible=true;
-					this.dataUpdate.status=4
+					this.dataUpdate.status=7
 				}else{
 					this.$message.warning("请先选择需要提交的内容");
 				}	
@@ -365,7 +367,7 @@ export default {
 		batchBack(){
 			let data={
 				ids:this.multipleSelection,
-				status: 4,//拒接交接
+				status: 7,//拒接交接
 				remark:this.pdf.remark
 			}
 			batchUpdateStatusAPI(data).then(res => {
@@ -377,13 +379,13 @@ export default {
 			});  
 		},
 		alertUpdate(item){
-			this.dataUpdate.status=3;
+			this.dataUpdate.status=1;
 			this.batchUpdateVisible=false;
 			let {name,responsibility,description}=item;
 			this.pdf.name=name;
 			this.pdf.responsibility=responsibility;
 			this.pdf.description=description;
-			this.updateTit='资源交接'
+			this.updateTit='资源提交'
 			this.passVisible=true;
 			this.dataUpdate.ids=[item.id];
 		},
@@ -398,7 +400,7 @@ export default {
 			});
 		},
 		alertRefus(item){
-			this.dataUpdate.status=4;
+			this.dataUpdate.status=7;
 			this.batchUpdateVisible=false;
 			let {name,responsibility,description}=item;
 			this.pdf.name=name;
@@ -411,7 +413,7 @@ export default {
 		refuse(){
 				let data={
 					ids:this.dataUpdate.ids,
-					status: 4,//拒绝交接
+					status: 7,//拒绝交接
 					remark:this.pdf.remark
 				}
 				batchUpdateStatusAPI(data).then(res => {
@@ -419,6 +421,7 @@ export default {
 						res.data.code,
 						`提交`
 					]);
+					this.passVisible=false;
 				});
 		},
 		handleCheckAllChange(val) {
@@ -457,8 +460,8 @@ export default {
 				endTime:'',
 				pageNum:1,
 				pageSize:30,
-				status:1,//默认待交接的
-				createrId:'',
+				status:6,//默认待交接的
+				createrId:Cookies.get('userId'),
 				content:''
 			};
 			this.formation='';

src/views/submission/infoview/allresource.vue

@@ -6,6 +6,11 @@
 				<span class="refBtn" @click="refPage">刷新 <i class="el-icon-refresh fr"></i></span>
 			</div>
 			<div class="screeningConditions">
+				<div style="padding:10px 0;">
+					<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in optionsStatus" :key="item.value" @click="changeStatus(item)">
+								{{item.label}}
+							</span>
+				</div>
 				<div class="screeningConditionsLeft">
 					<label for="">排列：</label>
 					<span @click="formationSort" class="btn" :class="[formation?'active':'']">形成时间<i :class="[formation=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
@@ -13,9 +18,7 @@
 					<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 					<em @click="searchUserVisible=true"  v-if="!searchForm.createrId">筛选用户提交</em>
 					<em class="empty" v-else @click="clearUaer">清空用户筛选</em>
-					<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in optionsStatus" :key="item.value" @click="changeStatus(item)">
-								{{item.label}}
-							</span>
+					
 				</div>
 				<div class="screeningConditionsRight">
 					<!-- <label for="">检索：</label>
@@ -157,6 +160,9 @@ export default {
 			optionsStatus: [{
 				value: '0',
 				label: '待录入'
+			},{
+				value: '6',
+				label: '待提交',
 			}, {
 				value: '1',
 				label: '待交接'
@@ -172,6 +178,12 @@ export default {
 			}, {
 				value: '5',
 				label: '已入库',
+			},{
+				value: '7',
+				label: '提交失败',
+			},{
+				value: '',
+				label: '全部',
 			}],
 			userList:[],
 			userValue:'',
@@ -412,7 +424,7 @@ export default {
     padding:37px 28px 20;
     .metaDataTop {
 			width:100%;
-			border-bottom:1px solid #EBEEF1;
+			// border-bottom:1px solid #EBEEF1;
 			padding-bottom:23px;
 			em {
 				color:#3F4560;
@@ -436,6 +448,7 @@ export default {
         font-size:14px;
         background:#F9FAFC;
 				border-bottom:1px solid #DCE1E9;
+				border-top:1px solid #DCE1E9;
 				display: flex;
 				justify-content: space-between;
         .screeningConditionsLeft {

src/views/submission/infoview/mycommit.vue

@@ -5,15 +5,17 @@
 				<em>我提交的资源</em>
 				<span class="refBtn" @click="refPage">刷新 <i class="el-icon-refresh fr"></i></span>
 			</div>
+			<div style="padding:10px 0;">
+				<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in optionsStatus" :key="item.value" @click="changeStatus(item)">
+								{{item.label}}
+							</span>
+			</div>
 			<div class="screeningConditions">
 				<div class="screeningConditionsLeft">
 					<label for="">排列：</label>
 					<span @click="formationSort" class="btn" :class="[formation?'active':'']">形成时间<i :class="[formation=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 					<span @click="sizeSort" class="btn" :class="[size?'active':'']">资源大小<i :class="[size=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 					<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
-					<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in optionsStatus" :key="item.value" @click="changeStatus(item)">
-								{{item.label}}
-							</span>
 				</div>
 				<div class="screeningConditionsRight">
 					<!-- <label for="">检索：</label> -->
@@ -120,6 +122,9 @@ export default {
 			optionsStatus: [{
 				value: '0',
 				label: '待录入',
+			},{
+				value: '6',
+				label: '待提交',
 			}, {
 				value: '1',
 				label: '待交接',
@@ -135,6 +140,12 @@ export default {
 			}, {
 				value: '5',
 				label: '已入库',
+			},{
+				value: '7',
+				label: '提交失败',
+			},{
+				value: '',
+				label: '全部',
 			}],
 			userList:[],
 			userValue:'',
@@ -314,7 +325,7 @@ export default {
 	padding:37px 28px 20;
 	.metaDataTop {
 		width:100%;
-		border-bottom:1px solid #EBEEF1;
+		// border-bottom:1px solid #EBEEF1;
 		padding-bottom:23px;
 		em {
 			color:#3F4560;
@@ -336,6 +347,7 @@ export default {
 		font-size:14px;
 		background:#F9FAFC;
 		border-bottom:1px solid #DCE1E9;
+		border-top:1px solid #DCE1E9;
 		min-height: 50px;
 		line-height: 50px;
 		display: flex;

src/views/submission/infoview/myedit.vue

@@ -5,15 +5,18 @@
 				<em>我提交的资源</em>
 				<span class="refBtn" @click="refPage">刷新 <i class="el-icon-refresh fr"></i></span>
 			</div>
+			<div style="padding:10px 0;">
+				<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in optionsStatus" :key="item.value" @click="changeStatus(item)">
+								{{item.label}}
+							</span>
+			</div>
 			<div class="screeningConditions">
 				<div class="screeningConditionsLeft">
 					<label for="">排列：</label>
 					<span @click="formationSort" class="btn" :class="[formation?'active':'']">形成时间<i :class="[formation=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 					<span @click="sizeSort" class="btn" :class="[size?'active':'']">资源大小<i :class="[size=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 					<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
-					 <span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in optionsStatus" :key="item.value" @click="changeStatus(item)">
-								{{item.label}}
-							</span>
+					 
 				</div>
 				<div class="screeningConditionsRight">
 					<!-- <label for="">检索：</label>
@@ -120,7 +123,10 @@ export default {
 			optionsStatus: [{
 				value: '0',
 				label: '待录入'
-			}, {
+			},{
+				value: '6',
+				label: '待提交',
+			},  {
 				value: '1',
 				label: '待交接'
 			}, {
@@ -135,6 +141,12 @@ export default {
 			}, {
 				value: '5',
 				label: '已入库'
+			},{
+				value: '7',
+				label: '提交失败',
+			},{
+				value: '',
+				label: '全部',
 			}],
 			userList:[],
 			userValue:'',
@@ -313,7 +325,7 @@ export default {
     padding:37px 28px 20;
     .metaDataTop {
         width:100%;
-        border-bottom:1px solid #EBEEF1;
+        // border-bottom:1px solid #EBEEF1;
         padding-bottom:23px;
         em {
             color:#3F4560;
@@ -337,6 +349,7 @@ export default {
         font-size:14px;
         background:#F9FAFC;
 				border-bottom:1px solid #DCE1E9;
+				border-top:1px solid #DCE1E9;
 				display: flex;
 				justify-content: space-between;
         .screeningConditionsLeft {

src/views/submission/metadatamange/browsebycategory.vue

@@ -32,15 +32,18 @@
 					</div>
 				</div>
 				<div class="right">
+					<div style="padding:10px 0;">
+						<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in statusOptions" :key="item.value" @click="changeStatus(item)">
+								{{item.label}}
+							</span>
+					</div>
 					<div class="sipConditions">
 						<div class="screeningConditionsLeft">
 							<label for="">排列：</label>
 							<span @click="formationSort" class="btn" :class="[formation?'active':'']">形成时间<i :class="[formation=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 							<span @click="sizeSort" class="btn" :class="[size?'active':'']">资源大小<i :class="[size=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 							<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
-							<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in statusOptions" :key="item.value" @click="changeStatus(item)">
-								{{item.label}}
-							</span>
+							
 							<!-- <el-button type="success" plain size="mini">待交接</el-button>
 							<el-button type="success" plain size="mini">待挂接</el-button>
 							<el-button type="success" plain size="mini">通过交接</el-button>
@@ -186,7 +189,10 @@ export default {
 				value: '0',
 				label: '待录入',
 				text: '待录入'
-			}, {
+			},{
+				value: '6',
+				label: '待提交',
+			},  {
 				value: '1',
 				label: '待交接',
 				text: '待交接'
@@ -206,6 +212,12 @@ export default {
 				value: '5',
 				label: '已入库',
 				text: '已入库'
+			},{
+				value: '7',
+				label: '提交失败',
+			},{
+				value: '',
+				label: '全部',
 			}],
 			rules: {
 				typeName: [

src/views/submission/sip/index.scss

@@ -230,6 +230,7 @@
     .pdf_wrap{
         .pic_show{
             max-width: 100%;
+            max-height: 100%;
         }
         .pdf_tit{
             color: #3F4560;
@@ -253,7 +254,7 @@
         margin-left:24px;
         // overflow: hidden;
         position: relative;
-        padding: 0 28px 15px;
+        padding: 0 22px 15px;
         background-color: #fff;
         &.upClass{
             width: 68px;
@@ -276,7 +277,7 @@
             overflow: hidden;
         }
         .side_content{
-            width: 388px;
+            width: 400px;
         }
         .title_wrap{
             padding: 0px;
@@ -300,11 +301,14 @@
                 font-weight: bold;
             }
             .tag_label{
+                display: inline-block;
                 background-color:#7e899b;
                 border-radius: 4px;
                 padding: 4px 8px;
                 color: #fff;
                 margin-right: 4px;
+                white-space: nowrap;
+                margin-bottom: 4px;
             }
             .cont{
                 flex: 1;

src/views/submission/sip/index.vue

@@ -57,7 +57,7 @@
 							<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="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>
 								<el-button type="success" size="mini" icon="el-icon-view" @click="lookTo(item)">查看</el-button>
 							</div>
@@ -188,7 +188,7 @@ export default {
 			userList:[],
 			userListOption:[],
 			userValue:'',
-			updateTit:"资源交接",
+			updateTit:"资源提交",
 			typeOptions: [{
 				value: '',
 				label: '全部'
@@ -229,7 +229,7 @@ export default {
 			dataUpdate:{
 				ids:[],
 				remark:'',
-				status: 3//通过交接
+				status: 1//通过交接
 			},
 			dateTime:'',
 			createTime:'desc',
@@ -328,7 +328,7 @@ export default {
 		alertBatchUpdate(){
 				if (this.multipleSelection.length > 0) {
 					this.batchUpdateVisible=true;
-					this.updateTit="批量交接"
+					this.updateTit="批量提交"
 					this.passVisible=true;
 					this.dataUpdate.status=1
 				}else{
@@ -384,7 +384,7 @@ export default {
 			this.pdf.name=name;
 			this.pdf.responsibility=responsibility;
 			this.pdf.description=description;
-			this.updateTit="资源交接"
+			this.updateTit="资源提交"
 			this.passVisible=true;
 			this.dataUpdate.ids=[item.id];
 		},
@@ -463,7 +463,7 @@ export default {
 				pageNum:1,
 				pageSize:30,
 				status:6,//默认待提交的
-				createrId:'',
+				createrId:Cookies.get('userId'),
 				content:''
 			};
 			this.formation='';