Skip to content

9
91isoft_web_vue
Commit 766f454e authored by 张伯涛's avatar 张伯涛
Browse files
Options

pad适配修改

parent 36abaf74
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 74 deletions
public/index.html
View file @ 766f454e
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
<link rel="icon" href="<%= BASE_URL %>liulanqi_logo.png"> <link rel="icon" href="<%= BASE_URL %>liulanqi_logo.png">
<!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">--> <!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">-->
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
<script src="./vconsole.min.js"></script>
<script>new VConsole()</script>
</head> </head>
<body> <body>
<noscript> <noscript>
......
public/vconsole.min.js 0 → 100644
View file @ 766f454e
This diff is collapsed.
src/permission.js
View file @ 766f454e
...@@ -3,7 +3,7 @@ import store from './store' ...@@ -3,7 +3,7 @@ import store from './store'
import { Message } from 'element-ui' import { Message } from 'element-ui'
import NProgress from 'nprogress' // progress bar import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style import 'nprogress/nprogress.css' // progress bar style
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth/index'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import de from 'element-ui/src/locale/lang/de' // get token from cookie import de from 'element-ui/src/locale/lang/de' // get token from cookie
// import getPageTitle from '@/utils/get-page-title' // import getPageTitle from '@/utils/get-page-title'
...@@ -14,6 +14,7 @@ const whiteList = ['/auth-redirect', '/bind', '/register', '/login', '/forgetPwd ...@@ -14,6 +14,7 @@ const whiteList = ['/auth-redirect', '/bind', '/register', '/login', '/forgetPwd
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() NProgress.start()
console.log('getToken()',getToken())
if (getToken()) { if (getToken()) {
/* has token*/ /* has token*/
if (to.path === '/login') { if (to.path === '/login') {
......
src/store/modules/user.js
View file @ 766f454e
import { login, logout, getInfo } from '@/api/login' import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth' import { getToken, setToken, removeToken } from '@/utils/auth/index'
import Layout from '@/layout' import Layout from '@/layout'
import { loadView } from '@/store/modules/permission' import { loadView } from '@/store/modules/permission'
......
src/styles/index.scss
View file @ 766f454e
...@@ -26,7 +26,7 @@ html { ...@@ -26,7 +26,7 @@ html {
#app { #app {
height: 100%; height: 100%;
overflow-x: hidden; overflow-x: hidden;
min-width: 1440px; min-width: 768px;
} }
*, *,
......
src/styles/themeA/layout.scss
View file @ 766f454e
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
//top: 0; //top: 0;
//right: 0; //right: 0;
//z-index: 9; //z-index: 9;
width: calc(100% - #{$sideBarWidth}); width: calc(100% - 153px);
transition: width 0.28s; transition: width 0.28s;
} }
.hideSidebar .fixed-header { .hideSidebar .fixed-header {
width: calc(100% - #{ $sideHideWidth }) width: calc(100% - 55px)
} }
.mobile .fixed-header { .mobile .fixed-header {
......
src/styles/themeA/login.scss
View file @ 766f454e
.login { .login {
position: relative;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -50,15 +51,17 @@ ...@@ -50,15 +51,17 @@
} }
.login-form { .login-form {
display: flex; position: absolute;
backdrop-filter: blur(4px);
display: inline;
flex-direction: column; flex-direction: column;
align-items: flex-end; align-items: flex-end;
border-radius: 6px; border-radius: 6px;
background: #ffffff no-repeat; background: #ffffff no-repeat;
background-size: 59%; background-size: 59%;
background-position-y: 57px; background-position-y: 57px;
width: 650px; width: 500px;
height: 550px; height: 400px;
padding: 25px 25px 5px 25px; padding: 25px 25px 5px 25px;
.login-form-content{ .login-form-content{
position: absolute; position: absolute;
......
src/styles/variables.scss
View file @ 766f454e
...@@ -90,7 +90,7 @@ $menuHover:#fff; ...@@ -90,7 +90,7 @@ $menuHover:#fff;
$subMenuBg:#46BCF2; $subMenuBg:#46BCF2;
$subMenuHover:#fff; $subMenuHover:#fff;
$sideBarWidth: 254px; $sideBarWidth: 154px;
$sideHideWidth: 54px; $sideHideWidth: 54px;
// the :export directive is the magic sauce for webpack // the :export directive is the magic sauce for webpack
......
src/views/login/login.vue
View file @ 766f454e
...@@ -25,70 +25,70 @@ ...@@ -25,70 +25,70 @@
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" /> <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input> </el-input>
</el-form-item> </el-form-item>
<div v-if="captchaType === 'MATH' || captchaType === 'CHAR'" class="loginCode_formItem"> <!-- <div v-if="captchaType === 'MATH' || captchaType === 'CHAR'" class="loginCode_formItem">-->
<el-form-item prop="code"> <!-- <el-form-item prop="code">-->
<el-input <!-- <el-input-->
v-model="loginForm.code" <!-- v-model="loginForm.code"-->
auto-complete="off" <!-- auto-complete="off"-->
placeholder="验证码" <!-- placeholder="验证码"-->
@keypress.enter.native="handleLogin" <!-- @keypress.enter.native="handleLogin"-->
> <!-- >-->
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" /> <!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
</el-input> <!-- </el-input>-->
</el-form-item> <!-- </el-form-item>-->
<div class="login-code"> <!-- <div class="login-code">-->
<img class="login-codeImg" :src="codeUrl" @click="getCode"> <!-- <img class="login-codeImg" :src="codeUrl" @click="getCode">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<el-form-item v-if="captchaType === 'BLOCK' || captchaType === 'WORD'" prop="code"> <!-- <el-form-item v-if="captchaType === 'BLOCK' || captchaType === 'WORD'" prop="code">-->
<div class="my_btn" @click="() => {if (!verify) verifyShowFlag = true}"> <!-- <div class="my_btn" @click="() => {if (!verify) verifyShowFlag = true}">-->
<div class="my_radar_btn" :class="[verify? 'my_radar_btn_success' : 'my_radar_btn_verify']"> <!-- <div class="my_radar_btn" :class="[verify? 'my_radar_btn_success' : 'my_radar_btn_verify']">-->
<div class="my_radar_tip"> <!-- <div class="my_radar_tip">-->
<el-popover <!-- <el-popover-->
v-model="verifyShowFlag" <!-- v-model="verifyShowFlag"-->
placement="right" <!-- placement="right"-->
popper-class="verifyPopover" <!-- popper-class="verifyPopover"-->
:visible-arrow="false" <!-- :visible-arrow="false"-->
width="345" <!-- width="345"-->
trigger="manual" <!-- trigger="manual"-->
> <!-- >-->
<Verify <!-- <Verify-->
ref="verify" <!-- ref="verify"-->
:mode="'fixed'" <!-- :mode="'fixed'"-->
:captcha-type="captchaType" <!-- :captcha-type="captchaType"-->
:img-size="{ width: '323px', height: '155px' }" <!-- :img-size="{ width: '323px', height: '155px' }"-->
@success="capctchaCheckSuccess" <!-- @success="capctchaCheckSuccess"-->
/> <!-- />-->
<div slot="reference"> <!-- <div slot="reference">-->
<el-button v-show="!verify" class="my_radar_tip_blue" /> <!-- <el-button v-show="!verify" class="my_radar_tip_blue" />-->
<div v-show="verify" class="geetest_success_box"> <!-- <div v-show="verify" class="geetest_success_box">-->
<div class="geetest_success_show"> <!-- <div class="geetest_success_show">-->
<div class="geetest_success_pie" /> <!-- <div class="geetest_success_pie" />-->
<div class="geetest_success_filter" /> <!-- <div class="geetest_success_filter" />-->
<div class="geetest_success_mask" /> <!-- <div class="geetest_success_mask" />-->
</div> <!-- </div>-->
<div class="geetest_success_correct"> <!-- <div class="geetest_success_correct">-->
<div class="geetest_success_icon" /> <!-- <div class="geetest_success_icon" />-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</el-popover> <!-- </el-popover>-->
</div> <!-- </div>-->
<div class="my_radar_text"> <!-- <div class="my_radar_text">-->
{{ verify ? '验证成功' : '点击按钮进行验证' }} <!-- {{ verify ? '验证成功' : '点击按钮进行验证' }}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item class="loginBtn_formItem"> <el-form-item class="loginBtn_formItem">
<el-button <el-button
class="blue-btn" class="blue-btn"
:loading="loading" :loading="loading"
size="medium" size="medium"
type="primary" type="primary"
:disabled="!verify"
@click.native.prevent="handleLogin" @click.native.prevent="handleLogin"
> >
<!-- :disabled="!verify"-->
<span v-if="!loading">{{ '登 录' }}</span> <span v-if="!loading">{{ '登 录' }}</span>
<span v-else>登 录 中...</span> <span v-else>登 录 中...</span>
</el-button> </el-button>
......
src/views/monitor/errorLog/index.vue
View file @ 766f454e
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<el-button class="queryBtn" type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button> <el-button class="queryBtn" type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button> <el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<el-form-item style="float: right"> <el-form-item>
<el-button <el-button
class="clearBtn" class="clearBtn"
type="danger" type="danger"
......
src/views/monitor/loginInfo/index.vue
View file @ 766f454e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-button class="queryBtn" type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button> <el-button class="queryBtn" type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button> <el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<div style="float: right"> <div>
<el-form-item> <el-form-item>
<el-button <el-button
class="clearBtn" class="clearBtn"
......
src/views/monitor/operLog/index.vue
View file @ 766f454e
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<el-button class="queryBtn" type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button> <el-button class="queryBtn" type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button> <el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<el-form-item style="float: right"> <el-form-item>
<el-button <el-button
class="clearBtn" class="clearBtn"
type="danger" type="danger"
......
src/views/system/dept/index.vue
View file @ 766f454e
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="leader" label="负责人" width="200" /> <el-table-column :show-overflow-tooltip="true" prop="leader" label="负责人" />
<el-table-column :show-overflow-tooltip="true" prop="phone" label="联系电话" width="200" /> <el-table-column :show-overflow-tooltip="true" prop="phone" label="联系电话" />
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createDate"> <el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
......
src/views/system/menu/index.vue
View file @ 766f454e
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</el-table> </el-table>
</div> </div>
<!-- 添加或修改菜单对话框 --> <!-- 添加或修改菜单对话框 -->
<el-dialog title="菜单信息" :visible.sync="open" width="41%" append-to-body> <el-dialog title="菜单信息" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="auto"> <el-form ref="form" :model="form" :rules="rules" label-width="auto">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
......
src/views/system/role/index.vue
View file @ 766f454e
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
@click="resetQuery" @click="resetQuery"
>{{ commonField.resetName }}</el-button> >{{ commonField.resetName }}</el-button>
</el-form-item> </el-form-item>
<div style="float: right"> <div>
<el-form-item> <el-form-item>
<!-- //新增按钮--> <!-- //新增按钮-->
<el-button <el-button
......
src/views/system/user/index.vue
View file @ 766f454e
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
style="padding-right: 10px" style="padding-right: 10px"
:data="userList" :data="userList"
> >
<el-table-column type="index" label="序号" width="90" /> <el-table-column type="index" label="序号" width="50" />
<el-table-column label="登录名" prop="username" :show-overflow-tooltip="true"> <el-table-column label="登录名" prop="username" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.username || '-' }} {{ scope.row.username || '-' }}
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" prop="createDate" width="160"> <el-table-column :show-overflow-tooltip="true" label="创建时间" prop="createDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment