Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
K
knowledgeServiceAdmin
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
quanlili
knowledgeServiceAdmin
Commits
392e862d
提交
392e862d
authored
10月 25, 2019
作者:
王腾飞
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'qll' of
http://192.168.2.120/quanlili/knowledgeServiceAdmin
into wtf
上级
6a7f4cad
326a95ef
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
54 行增加
和
28 行删除
+54
-28
element-ui.scss
src/styles/element-ui.scss
+7
-6
index.scss
src/views/dataManagement/index.scss
+5
-4
search.vue
src/views/dataManagement/search.vue
+6
-3
index.vue
src/views/draw/atlas/index.vue
+6
-2
index.vue
src/views/draw/atlas_rich/index.vue
+4
-1
detail.vue
src/views/draw/metadata/detail.vue
+9
-3
index.vue
src/views/draw/metadata/index.vue
+6
-2
index.vue
src/views/draw/sip/index.vue
+6
-2
allresource.vue
src/views/submission/infoview/allresource.vue
+1
-1
browsebycategory.vue
src/views/submission/infoview/browsebycategory.vue
+1
-1
mycommit.vue
src/views/submission/infoview/mycommit.vue
+2
-2
myedit.vue
src/views/submission/infoview/myedit.vue
+1
-1
没有找到文件。
src/styles/element-ui.scss
浏览文件 @
392e862d
...
@@ -203,12 +203,13 @@
...
@@ -203,12 +203,13 @@
.user_list_dialog
{
.user_list_dialog
{
display
:
flex
;
display
:
flex
;
.header_pic
{
.header_pic
{
width
:
75px
;
width
:
74px
;
height
:
75px
;
height
:
74px
;
img
{
img
{
width
:
100%
;
width
:
60px
;
height
:
100%
;
height
:
60px
;
}
margin-top
:
7px
;
}
}
}
.content_right
{
.content_right
{
flex
:
1
;
flex
:
1
;
...
...
src/views/dataManagement/index.scss
浏览文件 @
392e862d
...
@@ -195,11 +195,12 @@
...
@@ -195,11 +195,12 @@
.user_list_dialog
{
.user_list_dialog
{
display
:
flex
;
display
:
flex
;
.header_pic
{
.header_pic
{
width
:
7
5
px
;
width
:
7
4
px
;
height
:
7
5
px
;
height
:
7
4
px
;
img
{
img
{
width
:
100%
;
width
:
60px
;
height
:
100%
;
height
:
60px
;
margin-top
:
7px
;
}
}
}
}
.content_right
{
.content_right
{
...
...
src/views/dataManagement/search.vue
浏览文件 @
392e862d
...
@@ -123,7 +123,10 @@
...
@@ -123,7 +123,10 @@
:label=
"item.name"
:label=
"item.name"
:value=
"item.userId"
>
:value=
"item.userId"
>
<div
class=
"user_list_dialog"
>
<div
class=
"user_list_dialog"
>
<dt
class=
"header_pic"
><img
:src=
"item.img"
alt=
"头像"
></dt>
<dt
class=
"header_pic"
>
<img
:src=
"`$
{uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img
src=
"~@/assets/img/default.png"
alt=
"默认头像"
v-else
>
</dt>
<dd
class=
"content_right"
>
<dd
class=
"content_right"
>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div>
{{
item
.
email
}}
</div>
<div>
{{
item
.
email
}}
</div>
...
@@ -248,7 +251,7 @@ export default {
...
@@ -248,7 +251,7 @@ export default {
dateTime
:
''
,
dateTime
:
''
,
formation
:
''
,
//形成时间的筛选的
formation
:
''
,
//形成时间的筛选的
size
:
''
,
size
:
''
,
createTime
:
''
,
createTime
:
'
desc
'
,
list
:[],
list
:[],
totalCount
:
0
,
totalCount
:
0
,
}
}
...
@@ -302,7 +305,7 @@ export default {
...
@@ -302,7 +305,7 @@ export default {
pageSize
:
this
.
searchForm
.
pageSize
pageSize
:
this
.
searchForm
.
pageSize
};
};
this
.
formation
=
''
;
this
.
formation
=
''
;
this
.
createTime
=
''
;
this
.
createTime
=
'
desc
'
;
this
.
size
=
''
;
this
.
size
=
''
;
this
.
getList
()
this
.
getList
()
},
},
...
...
src/views/draw/atlas/index.vue
浏览文件 @
392e862d
...
@@ -83,7 +83,10 @@
...
@@ -83,7 +83,10 @@
:label=
"item.name"
:label=
"item.name"
:value=
"item.userId"
>
:value=
"item.userId"
>
<div
class=
"user_list_dialog"
>
<div
class=
"user_list_dialog"
>
<dt
class=
"header_pic"
><img
:src=
"item.img"
alt=
"头像"
></dt>
<dt
class=
"header_pic"
>
<img
:src=
"`$
{uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img
src=
"~@/assets/img/default.png"
alt=
"默认头像"
v-else
>
</dt>
<dd
class=
"content_right"
>
<dd
class=
"content_right"
>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div>
{{
item
.
email
}}
</div>
<div>
{{
item
.
email
}}
</div>
...
@@ -163,7 +166,8 @@ export default {
...
@@ -163,7 +166,8 @@ export default {
data
()
{
data
()
{
return
{
return
{
domain
:
process
.
env
.
BASE_API
,
domain
:
process
.
env
.
BASE_API
,
requestPath
:
requestPath
,
requestPath
:
requestPath
,
uploadUrl
:
uploadUrl
,
loading
:
false
,
loading
:
false
,
checkAll
:
false
,
checkAll
:
false
,
searchUserVisible
:
false
,
searchUserVisible
:
false
,
...
...
src/views/draw/atlas_rich/index.vue
浏览文件 @
392e862d
...
@@ -74,7 +74,10 @@
...
@@ -74,7 +74,10 @@
:label=
"item.name"
:label=
"item.name"
:value=
"item.userId"
>
:value=
"item.userId"
>
<div
class=
"user_list_dialog"
>
<div
class=
"user_list_dialog"
>
<dt
class=
"header_pic"
><img
:src=
"item.img"
alt=
"头像"
></dt>
<dt
class=
"header_pic"
>
<img
:src=
"`$
{uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img
src=
"~@/assets/img/default.png"
alt=
"默认头像"
v-else
>
</dt>
<dd
class=
"content_right"
>
<dd
class=
"content_right"
>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div>
{{
item
.
email
}}
</div>
<div>
{{
item
.
email
}}
</div>
...
...
src/views/draw/metadata/detail.vue
浏览文件 @
392e862d
...
@@ -352,7 +352,7 @@
...
@@ -352,7 +352,7 @@
<el-input
v-model=
"positionForm.latitude"
disabled
></el-input>
<el-input
v-model=
"positionForm.latitude"
disabled
></el-input>
<div
class=
"tip"
>
请在下面地图上单击,拾取经纬度
</div>
<div
class=
"tip"
>
请在下面地图上单击,拾取经纬度
</div>
</el-form-item>
</el-form-item>
<baidu-map
class=
"bm-position"
:center=
"
backForm.keyword
"
@
ready=
"handleMap"
>
<baidu-map
class=
"bm-position"
:center=
"
city
"
@
ready=
"handleMap"
>
<bm-navigation
anchor=
"BMAP_ANCHOR_TOP_RIGHT"
></bm-navigation>
<bm-navigation
anchor=
"BMAP_ANCHOR_TOP_RIGHT"
></bm-navigation>
<bm-marker
:position=
"
{'lng': positionForm.longitude, 'lat': positionForm.latitude}" :dragging="true" @dragging="remove">
<bm-marker
:position=
"
{'lng': positionForm.longitude, 'lat': positionForm.latitude}" :dragging="true" @dragging="remove">
</bm-marker>
</bm-marker>
...
@@ -505,7 +505,7 @@ export default {
...
@@ -505,7 +505,7 @@ export default {
loading
:
false
,
loading
:
false
,
domain
:
process
.
env
.
BASE_API
,
domain
:
process
.
env
.
BASE_API
,
requestPath
:
requestPath
,
requestPath
:
requestPath
,
//
packet:{lng: 116.404, lat: 39.915},
packet
:{
lng
:
116.404
,
lat
:
39.915
},
entityVisible
:
false
,
entityVisible
:
false
,
personLinkVisible
:
false
,
personLinkVisible
:
false
,
positionLinkVisible
:
false
,
positionLinkVisible
:
false
,
...
@@ -723,7 +723,8 @@ export default {
...
@@ -723,7 +723,8 @@ export default {
}
else
if
(
this
.
backForm
.
state
==
4
){
}
else
if
(
this
.
backForm
.
state
==
4
){
this
.
timerLinkVisible
=
true
;
this
.
timerLinkVisible
=
true
;
}
}
this
.
backForm
.
keyword
=
keyword
;
this
.
backForm
.
keyword
=
keyword
;
this
.
city
=
keyword
;
//地图的显示中心
this
.
backDetial
()
this
.
backDetial
()
},
},
resetEntity
(){
resetEntity
(){
...
@@ -791,6 +792,11 @@ export default {
...
@@ -791,6 +792,11 @@ export default {
}
else
if
(
this
.
backForm
.
state
==
3
){
}
else
if
(
this
.
backForm
.
state
==
3
){
if
(
res
.
data
.
data
){
if
(
res
.
data
.
data
){
this
.
positionForm
=
res
.
data
.
data
;
this
.
positionForm
=
res
.
data
.
data
;
if
(
!
this
.
positionForm
.
longitude
){
this
.
city
=
"北京"
;
//地图的显示中心
}
}
else
{
this
.
city
=
"北京"
;
//地图的显示中心
}
}
}
else
if
(
this
.
backForm
.
state
==
2
){
}
else
if
(
this
.
backForm
.
state
==
2
){
this
.
organizationForm
=
res
.
data
.
data
||
{};
this
.
organizationForm
=
res
.
data
.
data
||
{};
...
...
src/views/draw/metadata/index.vue
浏览文件 @
392e862d
...
@@ -72,7 +72,10 @@
...
@@ -72,7 +72,10 @@
:label=
"item.name"
:label=
"item.name"
:value=
"item.userId"
>
:value=
"item.userId"
>
<div
class=
"user_list_dialog"
>
<div
class=
"user_list_dialog"
>
<dt
class=
"header_pic"
><img
:src=
"item.img"
alt=
"头像"
></dt>
<dt
class=
"header_pic"
>
<img
:src=
"`$
{uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img
src=
"~@/assets/img/default.png"
alt=
"默认头像"
v-else
>
</dt>
<dd
class=
"content_right"
>
<dd
class=
"content_right"
>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div>
{{
item
.
email
}}
</div>
<div>
{{
item
.
email
}}
</div>
...
@@ -121,7 +124,8 @@ export default {
...
@@ -121,7 +124,8 @@ export default {
data
()
{
data
()
{
return
{
return
{
domain
:
process
.
env
.
BASE_API
,
domain
:
process
.
env
.
BASE_API
,
requestPath
:
requestPath
,
requestPath
:
requestPath
,
uploadUrl
:
uploadUrl
,
searchUserVisible
:
false
,
searchUserVisible
:
false
,
searchTimerVisible
:
false
,
searchTimerVisible
:
false
,
loading
:
false
,
loading
:
false
,
...
...
src/views/draw/sip/index.vue
浏览文件 @
392e862d
...
@@ -85,7 +85,10 @@
...
@@ -85,7 +85,10 @@
:label=
"item.name"
:label=
"item.name"
:value=
"item.userId"
>
:value=
"item.userId"
>
<div
class=
"user_list_dialog"
>
<div
class=
"user_list_dialog"
>
<dt
class=
"header_pic"
><img
:src=
"item.img"
alt=
"头像"
></dt>
<dt
class=
"header_pic"
>
<img
:src=
"`$
{uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img
src=
"~@/assets/img/default.png"
alt=
"默认头像"
v-else
>
</dt>
<dd
class=
"content_right"
>
<dd
class=
"content_right"
>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div
style=
"font-size: 16px;font-weight:600"
>
{{
item
.
name
}}
</div>
<div>
{{
item
.
email
}}
</div>
<div>
{{
item
.
email
}}
</div>
...
@@ -167,7 +170,8 @@ export default {
...
@@ -167,7 +170,8 @@ export default {
data
()
{
data
()
{
return
{
return
{
domain
:
process
.
env
.
BASE_API
,
domain
:
process
.
env
.
BASE_API
,
requestPath
:
requestPath
,
requestPath
:
requestPath
,
uploadUrl
:
uploadUrl
,
loading
:
false
,
loading
:
false
,
checkAll
:
false
,
checkAll
:
false
,
searchUserVisible
:
false
,
searchUserVisible
:
false
,
...
...
src/views/submission/infoview/allresource.vue
浏览文件 @
392e862d
...
@@ -147,7 +147,7 @@ export default {
...
@@ -147,7 +147,7 @@ export default {
dateTime
:
''
,
dateTime
:
''
,
formation
:
''
,
//形成时间的筛选的
formation
:
''
,
//形成时间的筛选的
size
:
''
,
size
:
''
,
createTime
:
''
,
createTime
:
'
desc
'
,
list
:[],
list
:[],
totalCount
:
0
,
totalCount
:
0
,
}
}
...
...
src/views/submission/infoview/browsebycategory.vue
浏览文件 @
392e862d
...
@@ -217,7 +217,7 @@ export default {
...
@@ -217,7 +217,7 @@ export default {
},
},
formation
:
''
,
//形成时间的筛选的
formation
:
''
,
//形成时间的筛选的
size
:
''
,
size
:
''
,
createTime
:
''
,
createTime
:
'
desc
'
,
list
:[],
list
:[],
totalCount
:
0
,
totalCount
:
0
,
diytypeList
:[],
diytypeList
:[],
...
...
src/views/submission/infoview/mycommit.vue
浏览文件 @
392e862d
...
@@ -155,7 +155,7 @@ export default {
...
@@ -155,7 +155,7 @@ export default {
dateTime
:
''
,
dateTime
:
''
,
formation
:
''
,
//形成时间的筛选的
formation
:
''
,
//形成时间的筛选的
size
:
''
,
size
:
''
,
createTime
:
''
,
createTime
:
'
desc
'
,
list
:[],
list
:[],
totalCount
:
0
,
totalCount
:
0
,
}
}
...
@@ -205,7 +205,7 @@ export default {
...
@@ -205,7 +205,7 @@ export default {
},
},
refPage
(){
refPage
(){
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
resetSearch
();
//
this.resetSearch();
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
},
1000
)
},
1000
)
...
...
src/views/submission/infoview/myedit.vue
浏览文件 @
392e862d
...
@@ -153,7 +153,7 @@ export default {
...
@@ -153,7 +153,7 @@ export default {
dateTime
:
''
,
dateTime
:
''
,
formation
:
''
,
//形成时间的筛选的
formation
:
''
,
//形成时间的筛选的
size
:
''
,
size
:
''
,
createTime
:
''
,
createTime
:
'
desc
'
,
list
:[],
list
:[],
totalCount
:
0
,
totalCount
:
0
,
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论