Commit 0c1a27769a6b19a9e69f1cd73c34ada9a137ce65
1 parent
bb1340ec
删除无用页面
Showing
4 changed files
with
9 additions
and
96 deletions
ruoyi-ui/src/views/login/auth-redirect.vue deleted
| 1 | -<script> | |
| 2 | -export default { | |
| 3 | - name: 'AuthRedirect', | |
| 4 | - created() { | |
| 5 | - const hash = window.location.search.slice(1) | |
| 6 | - if (window.localStorage) { | |
| 7 | - window.localStorage.setItem('x-admin-oauth-code', hash) | |
| 8 | - window.close() | |
| 9 | - } | |
| 10 | - }, | |
| 11 | - render: function(h) { | |
| 12 | - return h() // avoid warning message | |
| 13 | - } | |
| 14 | -} | |
| 15 | -</script> |
ruoyi-ui/src/views/login/components/SocialSignin.vue deleted
| 1 | -<template> | |
| 2 | - <div class="social-signup-container"> | |
| 3 | - <div class="sign-btn" @click="wechatHandleClick('wechat')"> | |
| 4 | - <span class="wx-svg-container"><svg-icon icon-class="wechat" class="icon" /></span> | |
| 5 | ||
| 6 | - </div> | |
| 7 | - <div class="sign-btn" @click="tencentHandleClick('tencent')"> | |
| 8 | - <span class="qq-svg-container"><svg-icon icon-class="qq" class="icon" /></span> | |
| 9 | ||
| 10 | - </div> | |
| 11 | - </div> | |
| 12 | -</template> | |
| 13 | - | |
| 14 | -<script> | |
| 15 | -// import openWindow from '@/utils/open-window' | |
| 16 | - | |
| 17 | -export default { | |
| 18 | - name: 'SocialSignin', | |
| 19 | - methods: { | |
| 20 | - wechatHandleClick(thirdpart) { | |
| 21 | - alert('ok') | |
| 22 | - // this.$store.commit('SET_AUTH_TYPE', thirdpart) | |
| 23 | - // const appid = 'xxxxx' | |
| 24 | - // const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/auth-redirect') | |
| 25 | - // const url = 'https://open.weixin.qq.com/connect/qrconnect?appid=' + appid + '&redirect_uri=' + redirect_uri + '&response_type=code&scope=snsapi_login#wechat_redirect' | |
| 26 | - // openWindow(url, thirdpart, 540, 540) | |
| 27 | - }, | |
| 28 | - tencentHandleClick(thirdpart) { | |
| 29 | - alert('ok') | |
| 30 | - // this.$store.commit('SET_AUTH_TYPE', thirdpart) | |
| 31 | - // const client_id = 'xxxxx' | |
| 32 | - // const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/auth-redirect') | |
| 33 | - // const url = 'https://graph.qq.com/oauth2.0/authorize?response_type=code&client_id=' + client_id + '&redirect_uri=' + redirect_uri | |
| 34 | - // openWindow(url, thirdpart, 540, 540) | |
| 35 | - } | |
| 36 | - } | |
| 37 | -} | |
| 38 | -</script> | |
| 39 | - | |
| 40 | -<style lang="scss" scoped> | |
| 41 | - .social-signup-container { | |
| 42 | - margin: 20px 0; | |
| 43 | - .sign-btn { | |
| 44 | - display: inline-block; | |
| 45 | - cursor: pointer; | |
| 46 | - } | |
| 47 | - .icon { | |
| 48 | - color: #fff; | |
| 49 | - font-size: 24px; | |
| 50 | - margin-top: 8px; | |
| 51 | - } | |
| 52 | - .wx-svg-container, | |
| 53 | - .qq-svg-container { | |
| 54 | - display: inline-block; | |
| 55 | - width: 40px; | |
| 56 | - height: 40px; | |
| 57 | - line-height: 40px; | |
| 58 | - text-align: center; | |
| 59 | - padding-top: 1px; | |
| 60 | - border-radius: 4px; | |
| 61 | - margin-bottom: 20px; | |
| 62 | - margin-right: 5px; | |
| 63 | - } | |
| 64 | - .wx-svg-container { | |
| 65 | - background-color: #24da70; | |
| 66 | - } | |
| 67 | - .qq-svg-container { | |
| 68 | - background-color: #6BA2D6; | |
| 69 | - margin-left: 50px; | |
| 70 | - } | |
| 71 | - } | |
| 72 | -</style> |
ruoyi-ui/src/views/system/dept/index.vue
| ... | ... | @@ -46,7 +46,7 @@ |
| 46 | 46 | default-expand-all |
| 47 | 47 | :tree-props="{children: 'children', hasChildren: 'hasChildren'}" |
| 48 | 48 | > |
| 49 | - <el-table-column prop="deptName" label="部门名称" width="200"></el-table-column> | |
| 49 | + <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column> | |
| 50 | 50 | <el-table-column prop="orderNum" label="排序" width="200"></el-table-column> |
| 51 | 51 | <el-table-column prop="status" label="状态" :formatter="statusFormat" width="100"></el-table-column> |
| 52 | 52 | <el-table-column label="创建时间" align="center" prop="createTime" width="200"> | ... | ... |
ruoyi-ui/src/views/system/menu/index.vue
| ... | ... | @@ -32,22 +32,22 @@ |
| 32 | 32 | row-key="menuId" |
| 33 | 33 | :tree-props="{children: 'children', hasChildren: 'hasChildren'}" |
| 34 | 34 | > |
| 35 | - <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="130px"></el-table-column> | |
| 36 | - <el-table-column prop="icon" label="图标" align="center" width="100px"> | |
| 35 | + <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column> | |
| 36 | + <el-table-column prop="icon" label="图标" align="center" width="100"> | |
| 37 | 37 | <template slot-scope="scope"> |
| 38 | 38 | <svg-icon :icon-class="scope.row.icon" /> |
| 39 | 39 | </template> |
| 40 | 40 | </el-table-column> |
| 41 | - <el-table-column prop="orderNum" label="排序" width="60px"></el-table-column> | |
| 42 | - <el-table-column prop="perms" label="权限标识" width="130px" :show-overflow-tooltip="true"></el-table-column> | |
| 43 | - <el-table-column prop="component" label="组件路径" width="180px" :show-overflow-tooltip="true"></el-table-column> | |
| 44 | - <el-table-column prop="visible" label="可见" :formatter="visibleFormat" width="80px"></el-table-column> | |
| 45 | - <el-table-column label="创建时间" align="center" prop="createTime" width="180"> | |
| 41 | + <el-table-column prop="orderNum" label="排序" width="60"></el-table-column> | |
| 42 | + <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column> | |
| 43 | + <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column> | |
| 44 | + <el-table-column prop="visible" label="可见" :formatter="visibleFormat" width="80"></el-table-column> | |
| 45 | + <el-table-column label="创建时间" align="center" prop="createTime"> | |
| 46 | 46 | <template slot-scope="scope"> |
| 47 | 47 | <span>{{ parseTime(scope.row.createTime) }}</span> |
| 48 | 48 | </template> |
| 49 | 49 | </el-table-column> |
| 50 | - <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width"> | |
| 50 | + <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | |
| 51 | 51 | <template slot-scope="scope"> |
| 52 | 52 | <el-button size="mini" |
| 53 | 53 | type="text" | ... | ... |