Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cocktail-party-server
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
cocktail-party
cocktail-party-server
Commits
0c1a2776
提交
0c1a2776
authored
2月 28, 2020
作者:
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
删除无用页面
上级
bb1340ec
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
9 行增加
和
96 行删除
+9
-96
auth-redirect.vue
ruoyi-ui/src/views/login/auth-redirect.vue
+0
-15
SocialSignin.vue
ruoyi-ui/src/views/login/components/SocialSignin.vue
+0
-72
index.vue
ruoyi-ui/src/views/system/dept/index.vue
+1
-1
index.vue
ruoyi-ui/src/views/system/menu/index.vue
+8
-8
没有找到文件。
ruoyi-ui/src/views/login/auth-redirect.vue
deleted
100644 → 0
浏览文件 @
bb1340ec
<
script
>
export
default
{
name
:
'AuthRedirect'
,
created
()
{
const
hash
=
window
.
location
.
search
.
slice
(
1
)
if
(
window
.
localStorage
)
{
window
.
localStorage
.
setItem
(
'x-admin-oauth-code'
,
hash
)
window
.
close
()
}
},
render
:
function
(
h
)
{
return
h
()
// avoid warning message
}
}
</
script
>
ruoyi-ui/src/views/login/components/SocialSignin.vue
deleted
100644 → 0
浏览文件 @
bb1340ec
<
template
>
<div
class=
"social-signup-container"
>
<div
class=
"sign-btn"
@
click=
"wechatHandleClick('wechat')"
>
<span
class=
"wx-svg-container"
><svg-icon
icon-class=
"wechat"
class=
"icon"
/></span>
WeChat
</div>
<div
class=
"sign-btn"
@
click=
"tencentHandleClick('tencent')"
>
<span
class=
"qq-svg-container"
><svg-icon
icon-class=
"qq"
class=
"icon"
/></span>
QQ
</div>
</div>
</
template
>
<
script
>
// import openWindow from '@/utils/open-window'
export
default
{
name
:
'SocialSignin'
,
methods
:
{
wechatHandleClick
(
thirdpart
)
{
alert
(
'ok'
)
// this.$store.commit('SET_AUTH_TYPE', thirdpart)
// const appid = 'xxxxx'
// const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/auth-redirect')
// const url = 'https://open.weixin.qq.com/connect/qrconnect?appid=' + appid + '&redirect_uri=' + redirect_uri + '&response_type=code&scope=snsapi_login#wechat_redirect'
// openWindow(url, thirdpart, 540, 540)
},
tencentHandleClick
(
thirdpart
)
{
alert
(
'ok'
)
// this.$store.commit('SET_AUTH_TYPE', thirdpart)
// const client_id = 'xxxxx'
// const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/auth-redirect')
// const url = 'https://graph.qq.com/oauth2.0/authorize?response_type=code&client_id=' + client_id + '&redirect_uri=' + redirect_uri
// openWindow(url, thirdpart, 540, 540)
}
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.social-signup-container
{
margin
:
20px
0
;
.sign-btn
{
display
:
inline-block
;
cursor
:
pointer
;
}
.icon
{
color
:
#fff
;
font-size
:
24px
;
margin-top
:
8px
;
}
.wx-svg-container
,
.qq-svg-container
{
display
:
inline-block
;
width
:
40px
;
height
:
40px
;
line-height
:
40px
;
text-align
:
center
;
padding-top
:
1px
;
border-radius
:
4px
;
margin-bottom
:
20px
;
margin-right
:
5px
;
}
.wx-svg-container
{
background-color
:
#24da70
;
}
.qq-svg-container
{
background-color
:
#6BA2D6
;
margin-left
:
50px
;
}
}
</
style
>
ruoyi-ui/src/views/system/dept/index.vue
浏览文件 @
0c1a2776
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
default-expand-all
default-expand-all
:tree-props=
"
{children: 'children', hasChildren: 'hasChildren'}"
:tree-props=
"
{children: 'children', hasChildren: 'hasChildren'}"
>
>
<el-table-column
prop=
"deptName"
label=
"部门名称"
width=
"2
0
0"
></el-table-column>
<el-table-column
prop=
"deptName"
label=
"部门名称"
width=
"2
6
0"
></el-table-column>
<el-table-column
prop=
"orderNum"
label=
"排序"
width=
"200"
></el-table-column>
<el-table-column
prop=
"orderNum"
label=
"排序"
width=
"200"
></el-table-column>
<el-table-column
prop=
"status"
label=
"状态"
:formatter=
"statusFormat"
width=
"100"
></el-table-column>
<el-table-column
prop=
"status"
label=
"状态"
:formatter=
"statusFormat"
width=
"100"
></el-table-column>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"200"
>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"200"
>
...
...
ruoyi-ui/src/views/system/menu/index.vue
浏览文件 @
0c1a2776
...
@@ -32,22 +32,22 @@
...
@@ -32,22 +32,22 @@
row-key=
"menuId"
row-key=
"menuId"
:tree-props=
"
{children: 'children', hasChildren: 'hasChildren'}"
:tree-props=
"
{children: 'children', hasChildren: 'hasChildren'}"
>
>
<el-table-column
prop=
"menuName"
label=
"菜单名称"
:show-overflow-tooltip=
"true"
width=
"1
30px
"
></el-table-column>
<el-table-column
prop=
"menuName"
label=
"菜单名称"
:show-overflow-tooltip=
"true"
width=
"1
60
"
></el-table-column>
<el-table-column
prop=
"icon"
label=
"图标"
align=
"center"
width=
"100
px
"
>
<el-table-column
prop=
"icon"
label=
"图标"
align=
"center"
width=
"100"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<svg-icon
:icon-class=
"scope.row.icon"
/>
<svg-icon
:icon-class=
"scope.row.icon"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"orderNum"
label=
"排序"
width=
"60
px
"
></el-table-column>
<el-table-column
prop=
"orderNum"
label=
"排序"
width=
"60"
></el-table-column>
<el-table-column
prop=
"perms"
label=
"权限标识"
width=
"130px"
:show-overflow-tooltip=
"true"
></el-table-column>
<el-table-column
prop=
"perms"
label=
"权限标识"
:show-overflow-tooltip=
"true"
></el-table-column>
<el-table-column
prop=
"component"
label=
"组件路径"
width=
"180px"
:show-overflow-tooltip=
"true"
></el-table-column>
<el-table-column
prop=
"component"
label=
"组件路径"
:show-overflow-tooltip=
"true"
></el-table-column>
<el-table-column
prop=
"visible"
label=
"可见"
:formatter=
"visibleFormat"
width=
"80
px
"
></el-table-column>
<el-table-column
prop=
"visible"
label=
"可见"
:formatter=
"visibleFormat"
width=
"80"
></el-table-column>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"180"
>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
createTime
)
}}
</span>
<span>
{{
parseTime
(
scope
.
row
.
createTime
)
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"操作"
align=
"center"
width=
"180"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
<el-button
size=
"mini"
type=
"text"
type=
"text"
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论