From 0c1a27769a6b19a9e69f1cd73c34ada9a137ce65 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期五, 28 二月 2020 19:56:19 +0800 Subject: [PATCH] 删除无用页面 --- /dev/null | 72 ------------------------------------ ruoyi-ui/src/views/system/menu/index.vue | 16 ++++---- ruoyi-ui/src/views/system/dept/index.vue | 2 3 files changed, 9 insertions(+), 81 deletions(-) diff --git a/ruoyi-ui/src/views/login/auth-redirect.vue b/ruoyi-ui/src/views/login/auth-redirect.vue deleted file mode 100644 index de7bbf3..0000000 --- a/ruoyi-ui/src/views/login/auth-redirect.vue +++ /dev/null @@ -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> diff --git a/ruoyi-ui/src/views/login/components/SocialSignin.vue b/ruoyi-ui/src/views/login/components/SocialSignin.vue deleted file mode 100644 index 17537ed..0000000 --- a/ruoyi-ui/src/views/login/components/SocialSignin.vue +++ /dev/null @@ -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> - 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> diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue index cca08b2..a8c065e 100644 --- a/ruoyi-ui/src/views/system/dept/index.vue +++ b/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"> diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index 9f2d04f..40bb428 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/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" -- Gitblit v1.9.3