Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
K
knowledgeServiceAdmin
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
quanlili
knowledgeServiceAdmin
Commits
0f382a81
提交
0f382a81
authored
12月 17, 2019
作者:
quanlili
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'qll' into dev
上级
51ddce9c
2374d70b
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
28 行增加
和
22 行删除
+28
-22
index.scss
src/views/draw/metadata/index.scss
+1
-0
index.scss
src/views/draw/sip/index.scss
+1
-0
index.scss
src/views/submission/atlas/index.scss
+1
-1
index.vue
src/views/submission/atlas/index.vue
+22
-19
index.scss
src/views/submission/sip/index.scss
+1
-0
index.vue
src/views/submission/sip/index.vue
+2
-2
没有找到文件。
src/views/draw/metadata/index.scss
浏览文件 @
0f382a81
...
@@ -84,6 +84,7 @@
...
@@ -84,6 +84,7 @@
.pdf_wrap
{
.pdf_wrap
{
.pic_show
{
.pic_show
{
max-width
:
100%
;
max-width
:
100%
;
max-height
:
100%
;
height
:
auto
;
height
:
auto
;
}
}
.pdf_tit
{
.pdf_tit
{
...
...
src/views/draw/sip/index.scss
浏览文件 @
0f382a81
...
@@ -230,6 +230,7 @@
...
@@ -230,6 +230,7 @@
.pdf_wrap
{
.pdf_wrap
{
.pic_show
{
.pic_show
{
max-width
:
100%
;
max-width
:
100%
;
max-height
:
100%
;
}
}
.pdf_tit
{
.pdf_tit
{
color
:
#3F4560
;
color
:
#3F4560
;
...
...
src/views/submission/atlas/index.scss
浏览文件 @
0f382a81
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
display
:
inline-block
;
display
:
inline-block
;
line-height
:
1
;
line-height
:
1
;
white-space
:
nowrap
;
white-space
:
nowrap
;
background-color
:
rgb
(
255
,
168
,
125
)
background-color
:
#FF7588
}
}
.check_all
{
.check_all
{
padding
:
20px
20px
0
;
padding
:
20px
20px
0
;
...
...
src/views/submission/atlas/index.vue
浏览文件 @
0f382a81
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
<el-button
type=
"success"
plain
size=
"mini"
@
click=
"alertBatchUpdate"
>
批量提交
</el-button>
<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=
"alertBatchBack"
>
批量驳回
</el-button>
<el-button
type=
"success"
plain
size=
"mini"
@
click=
"searchTimerVisible=true"
>
通过时间筛选
</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>
<
!--
<el-button
type=
"success"
plain
size=
"mini"
@
click=
"searchUserVisible=true"
v-if=
"!searchForm.createrId"
>
筛选用户提交
</
!
-->
<
em
class=
"empty"
v-else
@
click=
"clearUaer"
>
清空用户筛选
</em>
<
!--
<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>
<span
@
click=
"createTimeSort"
class=
"btn"
:class=
"[createTime?'active':'']"
>
提交时间
<i
:class=
"[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"
></i></span>
</div>
</div>
<div
class=
"screeningConditionsRight"
>
<div
class=
"screeningConditionsRight"
>
...
@@ -126,7 +126,7 @@
...
@@ -126,7 +126,7 @@
</el-dialog>
</el-dialog>
<!-- 资源交接弹框 -->
<!-- 资源交接弹框 -->
<el-dialog
<el-dialog
title=
"资源交接
"
:title=
"updateTit
"
:visible
.
sync=
"passVisible"
:visible
.
sync=
"passVisible"
width=
"800px"
width=
"800px"
class=
""
class=
""
...
@@ -148,21 +148,23 @@
...
@@ -148,21 +148,23 @@
</el-form>
</el-form>
<span
slot=
"footer"
class=
"dialog-footer"
>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"passVisible = false"
>
取消
</el-button>
<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=
"singleUpdate"
v-if=
'!batchUpdateVisible&&dataUpdate.status==
1
'
>
确定
</el-button>
<el-button
type=
"primary"
@
click=
"batchUpdate"
v-if=
'batchUpdateVisible&&dataUpdate.status==
3
'
>
确定
</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==
4
'
>
确定
</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==
4
"
>
确定
</el-button>
<el-button
type=
"primary"
@
click=
"refuse"
v-if=
"!batchUpdateVisible&&dataUpdate.status==
7
"
>
确定
</el-button>
</span>
</span>
</el-dialog>
</el-dialog>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
Cookies
from
'js-cookie'
import
{
getListAPI
,
batchUpdateStatusAPI
}
from
'@/api/atlas/index'
import
{
getListAPI
,
batchUpdateStatusAPI
}
from
'@/api/atlas/index'
import
{
getUserListAPI
}
from
'@/api/commonResource'
import
{
getUserListAPI
}
from
'@/api/commonResource'
import
pagination
from
'@/components/pagination/pagination'
import
pagination
from
'@/components/pagination/pagination'
import
{
operationMsg
,
confirm
}
from
'@/utils/publicFunctions'
import
{
operationMsg
,
confirm
}
from
'@/utils/publicFunctions'
import
{
uploadUrl
,
uploadPath
,
requestPath
}
from
"@/utils/global.js"
import
{
uploadUrl
,
uploadPath
,
requestPath
}
from
"@/utils/global.js"
export
default
{
export
default
{
name
:
'atlasMetadata'
,
name
:
'atlasMetadata'
,
components
:{
pagination
},
components
:{
pagination
},
...
@@ -227,15 +229,15 @@ export default {
...
@@ -227,15 +229,15 @@ export default {
endTime
:
''
,
endTime
:
''
,
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
30
,
pageSize
:
30
,
status
:
1
,
//默认待交接的
status
:
6
,
//默认待交接的
createrId
:
''
,
createrId
:
Cookies
.
get
(
'userId'
)
,
content
:
''
content
:
''
},
},
pdf
:{},
pdf
:{},
dataUpdate
:{
dataUpdate
:{
ids
:[],
ids
:[],
remark
:
''
,
remark
:
''
,
status
:
3
//通过交接
status
:
1
//通过交接
},
},
dateTime
:
''
,
dateTime
:
''
,
createTime
:
'desc'
,
createTime
:
'desc'
,
...
@@ -333,7 +335,7 @@ export default {
...
@@ -333,7 +335,7 @@ export default {
this
.
updateTit
=
'批量交接'
this
.
updateTit
=
'批量交接'
this
.
batchUpdateVisible
=
true
;
this
.
batchUpdateVisible
=
true
;
this
.
passVisible
=
true
;
this
.
passVisible
=
true
;
this
.
dataUpdate
.
status
=
3
;
this
.
dataUpdate
.
status
=
1
;
}
else
{
}
else
{
this
.
$message
.
warning
(
"请先选择需要提交的内容"
);
this
.
$message
.
warning
(
"请先选择需要提交的内容"
);
}
}
...
@@ -341,7 +343,7 @@ export default {
...
@@ -341,7 +343,7 @@ export default {
batchUpdate
(){
batchUpdate
(){
let
data
=
{
let
data
=
{
ids
:
this
.
multipleSelection
,
ids
:
this
.
multipleSelection
,
status
:
3
,
//通过交接
status
:
1
,
//通过交接
remark
:
this
.
pdf
.
remark
remark
:
this
.
pdf
.
remark
}
}
batchUpdateStatusAPI
(
data
).
then
(
res
=>
{
batchUpdateStatusAPI
(
data
).
then
(
res
=>
{
...
@@ -357,7 +359,7 @@ export default {
...
@@ -357,7 +359,7 @@ export default {
this
.
updateTit
=
'批量驳回'
this
.
updateTit
=
'批量驳回'
this
.
batchUpdateVisible
=
true
;
this
.
batchUpdateVisible
=
true
;
this
.
passVisible
=
true
;
this
.
passVisible
=
true
;
this
.
dataUpdate
.
status
=
4
this
.
dataUpdate
.
status
=
7
}
else
{
}
else
{
this
.
$message
.
warning
(
"请先选择需要提交的内容"
);
this
.
$message
.
warning
(
"请先选择需要提交的内容"
);
}
}
...
@@ -365,7 +367,7 @@ export default {
...
@@ -365,7 +367,7 @@ export default {
batchBack
(){
batchBack
(){
let
data
=
{
let
data
=
{
ids
:
this
.
multipleSelection
,
ids
:
this
.
multipleSelection
,
status
:
4
,
//拒接交接
status
:
7
,
//拒接交接
remark
:
this
.
pdf
.
remark
remark
:
this
.
pdf
.
remark
}
}
batchUpdateStatusAPI
(
data
).
then
(
res
=>
{
batchUpdateStatusAPI
(
data
).
then
(
res
=>
{
...
@@ -377,7 +379,7 @@ export default {
...
@@ -377,7 +379,7 @@ export default {
});
});
},
},
alertUpdate
(
item
){
alertUpdate
(
item
){
this
.
dataUpdate
.
status
=
3
;
this
.
dataUpdate
.
status
=
1
;
this
.
batchUpdateVisible
=
false
;
this
.
batchUpdateVisible
=
false
;
let
{
name
,
responsibility
,
description
}
=
item
;
let
{
name
,
responsibility
,
description
}
=
item
;
this
.
pdf
.
name
=
name
;
this
.
pdf
.
name
=
name
;
...
@@ -398,7 +400,7 @@ export default {
...
@@ -398,7 +400,7 @@ export default {
});
});
},
},
alertRefus
(
item
){
alertRefus
(
item
){
this
.
dataUpdate
.
status
=
4
;
this
.
dataUpdate
.
status
=
7
;
this
.
batchUpdateVisible
=
false
;
this
.
batchUpdateVisible
=
false
;
let
{
name
,
responsibility
,
description
}
=
item
;
let
{
name
,
responsibility
,
description
}
=
item
;
this
.
pdf
.
name
=
name
;
this
.
pdf
.
name
=
name
;
...
@@ -411,7 +413,7 @@ export default {
...
@@ -411,7 +413,7 @@ export default {
refuse
(){
refuse
(){
let
data
=
{
let
data
=
{
ids
:
this
.
dataUpdate
.
ids
,
ids
:
this
.
dataUpdate
.
ids
,
status
:
4
,
//拒绝交接
status
:
7
,
//拒绝交接
remark
:
this
.
pdf
.
remark
remark
:
this
.
pdf
.
remark
}
}
batchUpdateStatusAPI
(
data
).
then
(
res
=>
{
batchUpdateStatusAPI
(
data
).
then
(
res
=>
{
...
@@ -419,6 +421,7 @@ export default {
...
@@ -419,6 +421,7 @@ export default {
res
.
data
.
code
,
res
.
data
.
code
,
`提交`
`提交`
]);
]);
this
.
passVisible
=
false
;
});
});
},
},
handleCheckAllChange
(
val
)
{
handleCheckAllChange
(
val
)
{
...
@@ -457,8 +460,8 @@ export default {
...
@@ -457,8 +460,8 @@ export default {
endTime
:
''
,
endTime
:
''
,
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
30
,
pageSize
:
30
,
status
:
1
,
//默认待交接的
status
:
6
,
//默认待交接的
createrId
:
''
,
createrId
:
Cookies
.
get
(
'userId'
)
,
content
:
''
content
:
''
};
};
this
.
formation
=
''
;
this
.
formation
=
''
;
...
...
src/views/submission/sip/index.scss
浏览文件 @
0f382a81
...
@@ -230,6 +230,7 @@
...
@@ -230,6 +230,7 @@
.pdf_wrap
{
.pdf_wrap
{
.pic_show
{
.pic_show
{
max-width
:
100%
;
max-width
:
100%
;
max-height
:
100%
;
}
}
.pdf_tit
{
.pdf_tit
{
color
:
#3F4560
;
color
:
#3F4560
;
...
...
src/views/submission/sip/index.vue
浏览文件 @
0f382a81
...
@@ -229,7 +229,7 @@ export default {
...
@@ -229,7 +229,7 @@ export default {
dataUpdate
:{
dataUpdate
:{
ids
:[],
ids
:[],
remark
:
''
,
remark
:
''
,
status
:
3
//通过交接
status
:
1
//通过交接
},
},
dateTime
:
''
,
dateTime
:
''
,
createTime
:
'desc'
,
createTime
:
'desc'
,
...
@@ -463,7 +463,7 @@ export default {
...
@@ -463,7 +463,7 @@ export default {
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
30
,
pageSize
:
30
,
status
:
6
,
//默认待提交的
status
:
6
,
//默认待提交的
createrId
:
''
,
createrId
:
Cookies
.
get
(
'userId'
)
,
content
:
''
content
:
''
};
};
this
.
formation
=
''
;
this
.
formation
=
''
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论