Skip to content

K
knowledgeServiceAdmin
提交 8b78836a authored 作者: 王腾飞's avatar 王腾飞
浏览文件
操作

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

上级 e15acf9c b8cc3a1d
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 591 行增加 和 82 行删除
src/filters/index.js
浏览文件 @ 8b78836a
......@@ -102,7 +102,7 @@ export function html2Text(val) {
export function toThousandslsFilter(num) {
return (+num || 0).toString().replace(/^-?\d+/g, m => m.replace(/(?=(?!\b)(\d{3})+$)/g, ','))
}
//后缀
//列表的图标判断，根据后缀
export function formatImg(type) {
let srcImg='';
switch(type) {
......@@ -135,3 +135,36 @@ export function formatImg(type) {
}
return require('../assets/img/'+srcImg)
}
//列表的根据状态，格式化文本
export function formatStatus(status) {
let txt='';
switch(status) {
case 0:
txt='待录入';
break;
case 1:
txt='待交接';
break;
case 2:
txt='待挂接';
break;
case 3:
txt='通过交接';
break;
case 4:
txt='拒绝交接';
break;
case 5:
txt='已入库';
break;
case 6:
txt='待提交';
break;
case 7:
txt='提交失败';
break;
default:
txt='待录入';
}
return txt
}
\ No newline at end of file
src/router/index.js
浏览文件 @ 8b78836a
......@@ -135,6 +135,15 @@ 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',
......@@ -191,6 +200,15 @@ export const asyncRouterMap = [{
routerIds: ['2407']
},
},{
path: 'atlas_Metadata',
component: _import('submission/atlas/index'),
name: 'atlasMetadata',
meta: {
title: '待审核图册',
routerIds: ['2409'],
search:true
}
},{
path: 'addatlas',
component: _import('submission/infoview/addatlas'),
name: 'addatlas',
......@@ -490,7 +508,8 @@ export const asyncRouterMap = [{
}
},{
path: 'resources_class',
component: _import('draw/resources/index'),
// component: _import('draw/resources/index'),
component: _import('submission/metadatamange/browsebycategory'),
name: 'resourcesClass',
meta: {
title: '资源分类管理',
......
src/styles/index.scss
浏览文件 @ 8b78836a
......@@ -575,7 +575,7 @@ p.divider {
}
}
}
// 修改资源状态按钮
// 头部-修改资源状态按钮
.status_btn{
display: inline-block;
line-height: 1;
......@@ -605,3 +605,28 @@ p.divider {
.totalCount{
white-space: nowrap;
}
//列表的 -状态颜色
.status--color--0{//待录入
color : #FFAA00 !important;
}
.status--color--1{//待交接
color : #FF5500 !important;
}
.status--color--2{//待挂接
color : #FFAA00 !important;
}
.status--color--3{//通过交接
color : #87D068 !important;
}
.status--color--4{//拒绝交接
color : #666666 !important;
}
.status--color--5{//已入库
color : #87D068 !important;
}
.status--color--6{//待提交
color : #FF7588 !important;
}
.status--color--7{//提交失败
color : #666666 !important;
}
\ No newline at end of file
src/views/draw/atlas/index.vue
浏览文件 @ 8b78836a
......@@ -432,7 +432,7 @@ export default {
},
lookTo(id){
//this.$router.push({path:'/draw/msgPacket',query:{id:id}})
this.$router.push({path:'/submission/infoview/photolook',query:{oid:id}})
this.$router.push({path:'/submission/photolook',query:{oid:id}})
},
refPage(){
this.loading=true;
......
src/views/draw/metadata/detail.vue
浏览文件 @ 8b78836a
......@@ -1243,7 +1243,7 @@ export default {
//window.location.reload()
},
linkPic(){
this.$router.push({path:'/submission/infoview/photolook',query:{oid:this.pdf.albumId}})
this.$router.push({path:'/submission/photolook',query:{oid:this.pdf.albumId}})
},
linkTo(item){
//id=0648831bf60911e996cc0050569033dc&entityType=2
......
src/views/storagemodule/storageinfomanger/resourcelook.vue
浏览文件 @ 8b78836a
......@@ -80,7 +80,7 @@
</div>
<img class="tag userPhoto" :src="`${uploadUrl}?fileName=${item.userImg}`" alt="头像" v-if="item.userImg" >
<img class="tag userPhoto" src="../../../assets/img/default.png" alt="" v-else>
<span class="tag" style="min-width:100px;text-align: center;" :style="{color: item.backgroundColor}">{{ item.statusVal }}</span>
<span class="tag" style="min-width:100px;text-align: center;" :class="[item.status !=null? 'status--color--' + item.status : '']">{{ item.status|formatStatus }}</span>
<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>
......
src/views/submission/atlas/index.scss 0 → 100644
浏览文件 @ 8b78836a
.submit_atlas_wrap{
.status_tag{
color: #fff;
font-size: 12px;
border-radius: 3px;
display: inline-block;
padding: 7px 15px;
display: inline-block;
line-height: 1;
white-space: nowrap;
background-color: rgb(255, 168, 125)
}
.check_all{
padding:20px 20px 0;
float: left;
}
.checkbox .el-checkbox__label{
visibility: hidden;
display: none;
}
.btn{
margin-left:10px;
}
.refBtn{
font-size:14px;
color:#868BA3;
}
.sip_Top {
padding: 20px 0px;
span{
color:#3F4560;
font-size:20px;
font-style:normal;
}
i {
padding: 4px;
font-size:14px;
color:#868BA3;
}
}
.sipConditions {
width:100%;
height:52px;
line-height:50px;
color:#62738D;
font-size:14px;
background:#F9FAFC;
border-bottom:1px solid #DCE1E9;
border-top:1px solid #DCE1E9;
padding: 0 20px;
.screeningConditionsLeft {
.el-button--success.is-plain{
color: #62738D !important;
border-color: #62738D !important;
}
.el-button--success.is-plain:hover{
background-color: #00B5B8 !important;
border-color: #00B5B8 !important;
color: #fff !important;
}
float:left;
label {
font-weight:400;
}
em {
font-style:normal;
display:inline-block;
width:100px;
height:26px;
text-align:center;
line-height:24px;
border-radius:4px;
cursor: pointer;
color:#62738D;
border:1px solid #62738D;
margin-left:10px;
&.empty{
color:#fff;
background:#F98B8B;
border:1px solid #F98B8B;
}
}
// span:nth-of-type(1) {
// color:#02B4D0;
// }
span.active{
color:#02B4D0;
}
span:nth-of-type(2),span:nth-of-type(3){
margin:0 0px 0 14px;
}
img {
cursor:pointer;
}
img:nth-of-type(1),img:nth-of-type(3),img:nth-of-type(5) {
margin:0 6px;
}
}
.screeningConditionsRight {
float:right;
margin-right:26px;
}
}
.list_wrap{
background: #fff;
}
.list{
width: 100%;
padding-right: 20px;
padding-left: 20px;
float: left;
box-sizing: border-box;
.block{
display: flex;
align-items: center;
padding: 20px 0;
border-bottom: 1px solid #EBEEF5;
}
.peeson_pic{
width: 100px;
height: 128px;
}
.position_pic{
width: 100px;
height: 100px;
}
.pdf_pic{
width: 50px;
height: 50px;
}
.content{
flex: 1;
padding: 0 60px 0 40px;
font-size:14px;
color:rgba(102,110,142,1);
}
.tit{
font-size:18px;
font-weight:bold;
color:rgba(63,69,96,1);
}
.tit2{
font-size:16px;
color:rgba(34,34,34,1);
cursor: pointer;
}
.text{
position: relative;
line-height: 24px;
max-height: calc(3px * 24);
text-align: justify;
overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
word-wrap:break-word;
word-break:break-all;
color: #4F5672;
overflow: hidden;
text-overflow: ellipsis
}
.tag{
margin-right: 40px;
color:#F56C6C;
}
.tag_img{
width: 28px;
height: 28px;
margin-right: 40px;
border-radius: 4px;
cursor: pointer;
}
.opt_wrap{
width: 100px;
.el-button{
margin-left: 0;
margin-bottom: 14px;
}
}
}
}
\ No newline at end of file
src/views/submission/atlas/index.vue 0 → 100644
浏览文件 @ 8b78836a
差异被折叠。
src/views/submission/entrypage/index.vue
浏览文件 @ 8b78836a
......@@ -80,7 +80,7 @@ export default {
})
} else {
this.$router.push({
path: 'infoview/atlas',
path: 'atlas',
})
}
}
......
src/views/submission/infoview/mycommit.vue
浏览文件 @ 8b78836a
......@@ -59,7 +59,7 @@
清太祖爱新觉罗·努尔哈赤（1559年2月21日—1626年9月30日），清朝的奠基者，后金开国之君，通满语和汉语，喜读《三国演义》。二十五岁时起兵统一女真各部，明神宗万历四十四年...
</p> -->
</div>
<span class="showStatusVal" :style="{ color: item.backgroundColor }">{{ item.statusVal }}</span>
<span class="showStatusVal" :class="[item.status !=null? 'status--color--' + item.status : '']">{{ item.status|formatStatus }}</span>
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" alt="用户头像" v-if="item.userImg" :title="'提交者：' + item.createrName">
<img class="tag" src="~@/assets/img/default.png" alt="用户头像" v-else :title="'提交者：' + item.createrName">
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.modifierImg}&isOnLine=true`" alt="最后修改者头像" v-if="item.modifierImg" :title="'最后编辑'+ item.modifierName">
......@@ -183,29 +183,6 @@ export default {
this.list=res.data.data.list||[];
this.totalCount=res.data.data.total||0;
this.loadListing=false;
this.list.forEach((item, index) => {
this.$set(item, 'statusVal', null);
this.$set(item, 'backgroundColor', null);
if (item.status === 0) {
item.statusVal = '待录入';
item.backgroundColor = '#FFAA00';
} else if (item.status === 1) {
item.statusVal = '待交接';
item.backgroundColor = '#FF5500';
} else if (item.status === 2) {
item.statusVal = '待挂接';
item.backgroundColor = '#FFAA00';
} else if (item.status === 3) {
item.statusVal = '通过交接';
item.backgroundColor = '#87D068';
} else if (item.status === 4) {
item.statusVal = '拒绝交接';
item.backgroundColor = '#666666';
} else {
item.statusVal = '已入库';
item.backgroundColor = '#87D068';
}
})
} else {
this.$message.error('获取失败');
this.loadListing=false;
......@@ -505,7 +482,6 @@ export default {
height:28px;
line-height:28px;
padding:0 14px;
color:#fff;
font-size:14px;
border-radius:4px;
margin-right:40px;
......
src/views/submission/infoview/myedit.vue
浏览文件 @ 8b78836a
......@@ -59,7 +59,7 @@
清太祖爱新觉罗·努尔哈赤（1559年2月21日—1626年9月30日），清朝的奠基者，后金开国之君，通满语和汉语，喜读《三国演义》。二十五岁时起兵统一女真各部，明神宗万历四十四年...
</p> -->
</div>
<span class="showStatusVal" :style="{ color: item.backgroundColor }">{{ item.statusVal }}</span>
<span class="showStatusVal" :class="[item.status !=null? 'status--color--' + item.status : '']">{{ item.status|formatStatus }}</span>
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" alt="用户头像" v-if="item.userImg" :title="'提交者：' + item.createrName">
<img class="tag" src="~@/assets/img/default.png" alt="用户头像" v-else :title="'提交者：' + item.createrName">
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.modifierImg}&isOnLine=true`" alt="最后修改者头像" v-if="item.modifierImg" :title="'最后编辑'+ item.modifierName">
......@@ -182,29 +182,6 @@ export default {
this.list=res.data.data.list||[];
this.totalCount=res.data.data.total||0;
this.loadListing=false;
this.list.forEach((item, index) => {
this.$set(item, 'statusVal', null);
this.$set(item, 'backgroundColor', null);
if (item.status === 0) {
item.statusVal = '待录入';
item.backgroundColor = '#FFAA00';
} else if (item.status === 1) {
item.statusVal = '待交接';
item.backgroundColor = '#FF5500';
} else if (item.status === 2) {
item.statusVal = '待挂接';
item.backgroundColor = '#FFAA00';
} else if (item.status === 3) {
item.statusVal = '通过交接';
item.backgroundColor = '#87D068';
} else if (item.status === 4) {
item.statusVal = '拒绝交接';
item.backgroundColor = '#666666';
} else {
item.statusVal = '已入库';
item.backgroundColor = '#87D068';
}
})
} else {
this.$message.error('获取失败');
this.loadListing=false;
......@@ -506,7 +483,6 @@ export default {
height:28px;
line-height:28px;
padding:0 14px;
color:#fff;
font-size:14px;
border-radius:4px;
margin-right:40px;
......
src/views/submission/metadatamange/browsebycategory.vue
浏览文件 @ 8b78836a
......@@ -83,7 +83,7 @@
<p class="field"><span>著录时间：{{item.createTime}}</span><span>资源大小：{{item.size}} </span></p>
<p class="text">{{item.description}}</p>
</div>
<span class="showStatusVal" :style="{ color: item.backgroundColor }">{{ item.statusVal }}</span>
<span class="showStatusVal" :class="[item.status!=null ? 'status--color--' + item.status : '']">{{ item.status|formatStatus }}</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.modifierImg}`" alt="最后修改者头像" v-if="item.modifierImg">
......@@ -281,29 +281,6 @@ export default {
if (res.data.code === 0) {
this.list=res.data.data.resList||[];
this.loadListing=false;
this.list.map((item, index) => {
this.$set(item, 'statusVal', null)
this.$set(item, 'backgroundColor', null);
if (item.status === 0) {
item.statusVal = '待录入';
item.backgroundColor = '#FFAA00';
} else if (item.status === 1) {
item.statusVal = '待交接';
item.backgroundColor = '#FF5500';
} else if (item.status === 2) {
item.statusVal = '待挂接';
item.backgroundColor = '#FFAA00';
} else if (item.status === 3) {
item.statusVal = '通过交接';
item.backgroundColor = '#87D068';
} else if (item.status === 4) {
item.statusVal = '拒绝交接';
item.backgroundColor = '#666666';
} else {
item.statusVal = '已入库';
item.backgroundColor = '#87D068';
}
})
this.totalCount=res.data.data.totalCount||0;
} else {
this.$message.error('获取失败');
......@@ -534,7 +511,6 @@ export default {
height:28px;
line-height:28px;
padding:0 14px;
color:#fff;
font-size:14px;
border-radius:4px;
margin-right:40px;
......
src/views/submission/sip/index.scss 0 → 100644
浏览文件 @ 8b78836a
.submit_sip_wrap{
.album_tag{
font-size: 12px;
border-radius: 3px;
display: inline-block;
padding: 7px 15px;
color: #fff;
display: inline-block;
line-height: 1;
white-space: nowrap;
background-color: #04c57d
}
.status_tag{
color: #fff;
font-size: 12px;
border-radius: 3px;
display: inline-block;
padding: 7px 15px;
display: inline-block;
line-height: 1;
white-space: nowrap;
background-color: #FF7588
}
.check_all{
padding:20px 20px 0;
float: left;
}
.checkbox .el-checkbox__label{
visibility: hidden;
display: none;
}
.btn{
margin-left:10px;
}
.refBtn{
font-size:14px;
color:#868BA3;
}
.sip_Top {
padding: 20px 0px;
span{
color:#3F4560;
font-size:20px;
font-style:normal;
}
i {
padding: 4px;
font-size:14px;
color:#868BA3;
}
}
.sipConditions {
width:100%;
height:52px;
line-height:50px;
color:#62738D;
font-size:14px;
background:#F9FAFC;
border-bottom:1px solid #DCE1E9;
border-top:1px solid #DCE1E9;
padding: 0 20px;
.screeningConditionsLeft {
.el-button--success.is-plain{
color: #62738D !important;
border-color: #62738D !important;
}
.el-button--success.is-plain:hover{
background-color: #00B5B8 !important;
border-color: #00B5B8 !important;
color: #fff !important;
}
float:left;
label {
font-weight:400;
}
em {
font-style:normal;
display:inline-block;
width:100px;
height:26px;
text-align:center;
line-height:24px;
border-radius:4px;
cursor: pointer;
color:#62738D;
border:1px solid #62738D;
margin-left:10px;
&.empty{
color:#fff;
background:#F98B8B;
border:1px solid #F98B8B;
}
}
// span:nth-of-type(1) {
// color:#02B4D0;
// }
span.active{
color:#02B4D0;
}
span:nth-of-type(2),span:nth-of-type(3){
margin:0 0px 0 14px;
}
img {
cursor:pointer;
}
img:nth-of-type(1),img:nth-of-type(3),img:nth-of-type(5) {
margin:0 6px;
}
}
.screeningConditionsRight {
float:right;
margin-right:26px;
}
}
.list_wrap{
background: #fff;
}
.list{
width: 100%;
padding-right: 20px;
padding-left: 20px;
float: left;
box-sizing: border-box;
.block{
display: flex;
align-items: center;
padding: 20px 0;
border-bottom: 1px solid #EBEEF5;
}
.peeson_pic{
width: 100px;
height: 128px;
}
.position_pic{
width: 100px;
height: 100px;
}
.pdf_pic{
width: 50px;
height: 50px;
}
.content{
flex: 1;
padding: 0 60px 0 40px;
font-size:14px;
color:rgba(102,110,142,1);
}
.tit{
font-size:18px;
font-weight:bold;
color:rgba(63,69,96,1);
}
.tit2{
font-size:16px;
color:rgba(34,34,34,1);
cursor: pointer;
}
.text{
position: relative;
line-height: 24px;
max-height: calc(3px * 24);
text-align: justify;
overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
word-wrap:break-word;
word-break:break-all;
color: #4F5672;
overflow: hidden;
text-overflow: ellipsis
}
.tag{
margin-right: 40px;
color:#F56C6C;
}
.tag_img{
width: 28px;
height: 28px;
margin-right: 40px;
border-radius: 4px;
cursor: pointer;
}
.opt_wrap{
width: 100px;
.el-button{
margin-left: 0;
margin-bottom: 14px;
}
}
}
}
.mag_packet{
.pdf_loading{
.el-loading-text{
font-size: 18px;
}
.el-icon-loading{
font-size: 24px;
}
}
.refBtn{
font-size:14px;
color:#868BA3;
}
.title_wrap{
height: 70px;
padding: 0 28px;
line-height: 70px;
color: #3F4560;
font-size: 16px;
}
.content_wrap{
display: flex;
}
.wrap_left{
flex: 1;
background-color: #fff
}
.title{
color: #3F4560;
font-size: 20px;
padding:17px 0px 23px;
}
.step_wrap{
margin-top:20px;
}
.pdf_wrap{
.pic_show{
max-width: 100%;
}
.pdf_tit{
color: #3F4560;
font-size: 28px;
text-align: center;
}
.pdf_sub{
text-align: center;
.pdf_icon{
margin-right: 15px;
margin-left: 15px;
}
.sub_tit{
color: #888EAB;
font-size: 14px;
}
}
}
.wrap_right{
margin-left:24px;
// overflow: hidden;
position: relative;
padding: 0 28px 15px;
background-color: #fff;
&.upClass{
width: 68px;
}
.up_btn{
position: absolute;
top:40%;
left: -14px;
width: 14px;
height: 24px;
line-height: 24px;
text-align: center;
background-color: #7D8A9D;
cursor: pointer;
i{
color: #fff;
}
}
.width_wrap{
overflow: hidden;
}
.side_content{
width: 388px;
}
.title_wrap{
padding: 0px;
border-bottom: 1px solid #E7EAEC;
}
.ref_btn>span{
margin-left: 10px;
cursor: pointer;
}
.msg_block{
font-size: 14px;
color: #293C6C;
padding: 16px 0px;
border-bottom:1px solid #E7EAEC;
.list{
display: flex;
}
.label{
min-width: 72px;
color: #404E67;
font-weight: bold;
}
.tag_label{
background-color:#7e899b;
border-radius: 4px;
padding: 4px 8px;
color: #fff;
margin-right: 4px;
}
.cont{
flex: 1;
}
}
.status-btn{
text-align: center;
padding: 20px 0;
}
}
}
src/views/submission/sip/index.vue 0 → 100644
浏览文件 @ 8b78836a
差异被折叠。
src/views/submission/sip/msg_packet.vue 0 → 100644
浏览文件 @ 8b78836a
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论