Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
07a8b829
提交
07a8b829
authored
5月 27, 2021
作者:
junjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(仪表板):UI fix
上级
47608dd7
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
50 行增加
和
28 行删除
+50
-28
Preview.vue
frontend/src/components/canvas/components/Editor/Preview.vue
+1
-1
index.vue
frontend/src/views/panel/GrantAuth/dept/index.vue
+4
-0
index.vue
frontend/src/views/panel/GrantAuth/index.vue
+3
-3
index.vue
frontend/src/views/panel/GrantAuth/role/index.vue
+3
-0
index.vue
frontend/src/views/panel/GrantAuth/user/index.vue
+3
-0
PanelList.vue
frontend/src/views/panel/list/PanelList.vue
+13
-3
PanelMain.vue
frontend/src/views/panel/list/PanelMain.vue
+15
-13
PanelViewShow.vue
frontend/src/views/panel/list/PanelViewShow.vue
+5
-5
SaveToTemplate.vue
frontend/src/views/panel/list/SaveToTemplate.vue
+3
-3
没有找到文件。
frontend/src/components/canvas/components/Editor/Preview.vue
浏览文件 @
07a8b829
...
@@ -144,7 +144,7 @@ export default {
...
@@ -144,7 +144,7 @@ export default {
min-height
:
300px
;
min-height
:
300px
;
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
border
:
1px
solid
#E6E6E6
;
/*border: 1px solid #E6E6E6;*/
background-size
:
100%
100%
!
important
;
background-size
:
100%
100%
!
important
;
.canvas-container
{
.canvas-container
{
width
:
100%
;
width
:
100%
;
...
...
frontend/src/views/panel/GrantAuth/dept/index.vue
浏览文件 @
07a8b829
...
@@ -229,4 +229,8 @@ export default {
...
@@ -229,4 +229,8 @@ export default {
/* 去除下边框 */
/* 去除下边框 */
height
:
0
;
height
:
0
;
}
}
.my_table
>>>
.el-table-column--selection
.cell
{
text-align
:
center
;
}
</
style
>
</
style
>
frontend/src/views/panel/GrantAuth/index.vue
浏览文件 @
07a8b829
...
@@ -72,14 +72,14 @@ export default {
...
@@ -72,14 +72,14 @@ export default {
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.de-tab
{
.de-tab
{
border
:
1px
solid
#E6E6E6
;
border
:
1px
solid
#E6E6E6
;
min-height
:
2
00px
!
important
;
min-height
:
4
00px
!
important
;
max-height
:
3
00px
!
important
;
max-height
:
4
00px
!
important
;
overflow
:auto
;
overflow
:auto
;
}
}
.de-icon
{
.de-icon
{
position
:
absolute
;
position
:
absolute
;
right
:
20px
;
right
:
20px
;
top
:
5
0px
;
top
:
7
0px
;
z-index
:
99
;
z-index
:
99
;
}
}
.el-input-group__append
{
.el-input-group__append
{
...
...
frontend/src/views/panel/GrantAuth/role/index.vue
浏览文件 @
07a8b829
...
@@ -143,4 +143,7 @@ export default {
...
@@ -143,4 +143,7 @@ export default {
/* 去除下边框 */
/* 去除下边框 */
height
:
0
;
height
:
0
;
}
}
.my_table
>>>
.el-table-column--selection
.cell
{
text-align
:
center
;
}
</
style
>
</
style
>
frontend/src/views/panel/GrantAuth/user/index.vue
浏览文件 @
07a8b829
...
@@ -152,4 +152,7 @@ export default {
...
@@ -152,4 +152,7 @@ export default {
/* 去除下边框 */
/* 去除下边框 */
height
:
0
;
height
:
0
;
}
}
.my_table
>>>
.el-table-column--selection
.cell
{
text-align
:
center
;
}
</
style
>
</
style
>
frontend/src/views/panel/list/PanelList.vue
浏览文件 @
07a8b829
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
</div>
</div>
</el-col>
</el-col>
<el-dialog
:title=
"dialogTitle"
:visible=
"editGroup"
:show-close=
"false"
width=
"30%
"
>
<el-dialog
v-dialogDrag
:title=
"dialogTitle"
:visible=
"editGroup"
:show-close=
"false"
width=
"500px
"
>
<el-form
ref=
"groupForm"
:model=
"groupForm"
:rules=
"groupFormRules"
>
<el-form
ref=
"groupForm"
:model=
"groupForm"
:rules=
"groupFormRules"
>
<el-form-item
:label=
"$t('commons.name')"
prop=
"name"
>
<el-form-item
:label=
"$t('commons.name')"
prop=
"name"
>
<el-input
v-model=
"groupForm.name"
/>
<el-input
v-model=
"groupForm.name"
/>
...
@@ -146,14 +146,17 @@
...
@@ -146,14 +146,17 @@
</el-dialog>
</el-dialog>
<el-dialog
<el-dialog
v-dialogDrag
:title=
"authTitle"
:title=
"authTitle"
:visible
.
sync=
"authVisible"
:visible
.
sync=
"authVisible"
custom-class=
"de-dialog"
width=
"500px"
class=
"dialog-css"
>
>
<grant-auth
v-if=
"authVisible"
:resource-id=
"authResourceId"
@
close-grant=
"closeGrant"
/>
<grant-auth
v-if=
"authVisible"
:resource-id=
"authResourceId"
@
close-grant=
"closeGrant"
/>
</el-dialog>
</el-dialog>
<el-dialog
<el-dialog
v-dialogDrag
:title=
"linkTitle"
:title=
"linkTitle"
:visible
.
sync=
"linkVisible"
:visible
.
sync=
"linkVisible"
width=
"500px"
width=
"500px"
...
@@ -162,7 +165,7 @@
...
@@ -162,7 +165,7 @@
<link-generate
v-if=
"linkVisible"
:resource-id=
"linkResourceId"
/>
<link-generate
v-if=
"linkVisible"
:resource-id=
"linkResourceId"
/>
</el-dialog>
</el-dialog>
<!--新建仪表盘dialog-->
<!--新建仪表盘dialog-->
<el-dialog
:title=
"panelDialogTitle"
:visible
.
sync=
"editPanel.visible"
:show-close=
"true"
width=
"600px"
>
<el-dialog
v-dialogDrag
:title=
"panelDialogTitle"
:visible
.
sync=
"editPanel.visible"
:show-close=
"true"
width=
"600px"
>
<edit-panel
v-if=
"editPanel.visible"
:edit-panel=
"editPanel"
@
closeEditPanelDialog=
"closeEditPanelDialog"
@
newPanelSave=
"newPanelSave"
/>
<edit-panel
v-if=
"editPanel.visible"
:edit-panel=
"editPanel"
@
closeEditPanelDialog=
"closeEditPanelDialog"
@
newPanelSave=
"newPanelSave"
/>
</el-dialog>
</el-dialog>
</el-col>
</el-col>
...
@@ -686,4 +689,11 @@ export default {
...
@@ -686,4 +689,11 @@ export default {
padding
:
0
8px
;
padding
:
0
8px
;
}
}
.dialog-css
>>>
.el-dialog__body
{
padding
:
15px
20px
;
}
.dialog-css
>>>
.el-dialog__body
{
padding
:
10px
20px
20px
;
}
</
style
>
</
style
>
frontend/src/views/panel/list/PanelMain.vue
浏览文件 @
07a8b829
<
template
>
<
template
>
<de-container>
<de-container>
<de-aside-container>
<de-aside-container>
<el-tabs
v-model=
"activeName"
class=
"tab-
header"
@
tab-click=
"handleClick"
type=
"card"
:stretch=
"true
"
>
<el-tabs
v-model=
"activeName"
class=
"tab-
panel"
:stretch=
"true"
@
tab-click=
"handleClick
"
>
<el-tab-pane
name=
"PanelList"
>
<el-tab-pane
name=
"PanelList"
>
<span
slot=
"label"
><i
class=
"el-icon-document"
/>
{{
$t
(
'panel.panel_list'
)
}}
</span>
<span
slot=
"label"
><i
class=
"el-icon-document"
/>
{{
$t
(
'panel.panel_list'
)
}}
</span>
<panel-list
/>
<panel-list
/>
...
@@ -83,18 +83,20 @@ export default {
...
@@ -83,18 +83,20 @@ export default {
padding
:
0px
;
padding
:
0px
;
}
}
.tab-header
>>>
.el-tabs__item
{
/*.tab-panel>>>.is-stretch{*/
font-size
:
13px
;
/* min-width: 80% !important;*/
background-color
:
#E8EAED
;
/*}*/
padding
:
0
15px
;
/*.tab-panel>>>.el-tabs__nav-scroll {*/
/* overflow: hidden;*/
/* text-align: center;*/
/* display: flex;*/
/* align-items: center;*/
/* justify-content: center;*/
/*}*/
.tab-panel
>>>
.el-tabs__nav-wrap
{
padding
:
0
10px
;
}
}
.tab-panel
>>>
.el-tabs__nav-wrap
::after
{
.tab-header
>>>
.is-active
{
height
:
1px
;
background-color
:
#ffffff
;
border-bottom-color
:
#ffffff
!important
;
}
.tab-header
>>>
.el-tabs__nav-scroll
{
padding-left
:
0
!important
;
}
}
</
style
>
</
style
>
frontend/src/views/panel/list/PanelViewShow.vue
浏览文件 @
07a8b829
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<el-row
style=
"height: 100%;width: 100%;"
>
<el-row
style=
"height: 100%;width: 100%;"
>
<el-col
v-if=
"panelInfo.name.length>0"
class=
"panel-design"
>
<el-col
v-if=
"panelInfo.name.length>0"
class=
"panel-design"
>
<el-row
class=
"panel-design-head"
>
<el-row
class=
"panel-design-head"
>
<!--
TODO
仪表盘头部区域-->
<!--仪表盘头部区域-->
<el-col
:span=
"12"
style=
"text-overflow:ellipsis;overflow: hidden;white-space: nowrap;font-size: 14px"
>
<el-col
:span=
"12"
style=
"text-overflow:ellipsis;overflow: hidden;white-space: nowrap;font-size: 14px"
>
<span>
{{
panelInfo
.
name
||
'测试仪表板'
}}
</span>
<span>
{{
panelInfo
.
name
||
'测试仪表板'
}}
</span>
</el-col>
</el-col>
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
</el-col>
</el-col>
</el-row>
</el-row>
<!--
TODO
仪表盘预览区域-->
<!-- 仪表盘预览区域-->
<el-row
class=
"panel-design-preview"
>
<el-row
class=
"panel-design-preview"
>
<div
ref=
"imageWrapper"
style=
"width: 100%;height: 100%"
>
<div
ref=
"imageWrapper"
style=
"width: 100%;height: 100%"
>
<Preview
v-if=
"showMain"
/>
<Preview
v-if=
"showMain"
/>
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
v-if=
"templateSaveShow"
v-if=
"templateSaveShow"
:title=
"templateSaveTitle"
:title=
"templateSaveTitle"
:visible
.
sync=
"templateSaveShow"
:visible
.
sync=
"templateSaveShow"
custom-class=
"de-dialog
"
width=
"500px
"
>
>
<save-to-template
:template-info=
"templateInfo"
@
closeSaveDialog=
"closeSaveDialog"
/>
<save-to-template
:template-info=
"templateInfo"
@
closeSaveDialog=
"closeSaveDialog"
/>
</el-dialog>
</el-dialog>
...
@@ -219,6 +219,7 @@ export default {
...
@@ -219,6 +219,7 @@ export default {
background-color
:
white
;
background-color
:
white
;
padding
:
0
6px
;
padding
:
0
6px
;
line-height
:
40px
;
line-height
:
40px
;
border-bottom
:
1px
solid
#dfe4ed
;
}
}
.panel-design-preview
{
.panel-design-preview
{
...
@@ -226,8 +227,7 @@ export default {
...
@@ -226,8 +227,7 @@ export default {
height
:
calc
(
100%
-
40px
);
height
:
calc
(
100%
-
40px
);
overflow-x
:
hidden
;
overflow-x
:
hidden
;
overflow-y
:
auto
;
overflow-y
:
auto
;
padding
:
5px
;
/*padding: 5px;*/
border-top
:
1px
solid
#E6E6E6
;
}
}
.custom-position
{
.custom-position
{
...
...
frontend/src/views/panel/list/SaveToTemplate.vue
浏览文件 @
07a8b829
<
template
>
<
template
>
<el-row>
<el-row>
<el-row>
<el-row
style=
"display: flex;align-items: center;"
>
<el-col
:span=
"4"
>
{{
$t
(
'panel.template_nale'
)
}}
</el-col>
<el-col
:span=
"4"
>
{{
$t
(
'panel.template_nale'
)
}}
</el-col>
<el-col
:span=
"20"
>
<el-col
:span=
"20"
>
<el-input
v-model=
"templateInfo.name"
clearable
size=
"mini"
/>
<el-input
v-model=
"templateInfo.name"
clearable
size=
"mini"
/>
...
@@ -26,8 +26,8 @@
...
@@ -26,8 +26,8 @@
</div>
</div>
</el-row>
</el-row>
<el-row
class=
"root-class"
>
<el-row
class=
"root-class"
>
<el-button
@
click=
"cancel()"
>
{{ $t('commons.cancel') }}
</el-button>
<el-button
size=
"mini"
@
click=
"cancel()"
>
{{ $t('commons.cancel') }}
</el-button>
<el-button
type=
"primary"
@
click=
"save()"
>
{{ $t('commons.save') }}
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"save()"
>
{{ $t('commons.save') }}
</el-button>
</el-row>
</el-row>
</el-row>
</el-row>
</template>
</template>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论