ruoyi-ui/src/views/login/auth-redirect.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/login/components/SocialSignin.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/system/dept/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/system/menu/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/tool/gen/editTable.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-ui/src/views/login/auth-redirect.vue
@@ -1,15 +0,0 @@ <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
@@ -1,72 +0,0 @@ <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> </div> <div class="sign-btn" @click="tencentHandleClick('tencent')"> <span class="qq-svg-container"><svg-icon icon-class="qq" class="icon" /></span> </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
@@ -46,7 +46,7 @@ default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" > <el-table-column prop="deptName" label="部门名称" width="200"></el-table-column> <el-table-column prop="deptName" label="部门名称" width="260"></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 label="创建时间" align="center" prop="createTime" width="200"> ruoyi-ui/src/views/system/menu/index.vue
@@ -32,22 +32,22 @@ row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" > <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="130px"></el-table-column> <el-table-column prop="icon" label="图标" align="center" width="100px"> <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column> <el-table-column prop="icon" label="图标" align="center" width="100"> <template slot-scope="scope"> <svg-icon :icon-class="scope.row.icon" /> </template> </el-table-column> <el-table-column prop="orderNum" label="排序" width="60px"></el-table-column> <el-table-column prop="perms" label="权限标识" width="130px" :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="visible" label="可见" :formatter="visibleFormat" width="80px"></el-table-column> <el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column prop="orderNum" label="排序" width="60"></el-table-column> <el-table-column prop="perms" label="权限标识" :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"></el-table-column> <el-table-column label="创建时间" align="center" prop="createTime"> <template slot-scope="scope"> <span>{{ parseTime(scope.row.createTime) }}</span> </template> </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"> <el-button size="mini" type="text" ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -13,12 +13,11 @@ min-width="10%" :show-overflow-tooltip="true" /> <el-table-column label="字段描述" prop="columnComment" min-width="10%" :show-overflow-tooltip="true" /> <el-table-column label="字段描述" min-width="10%"> <template slot-scope="scope"> <el-input v-model="scope.row.columnComment"></el-input> </template> </el-table-column> <el-table-column label="物理类型" prop="columnType"