Compare commits

...

33 Commits

Author SHA1 Message Date
  wangxy d8928d1301 Merge branch 'suzhou_blueVersion' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion 3 years ago
  wangxy cee16d36df Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion 3 years ago
  liwei f54a5752fb 数值类型调整 3 years ago
  liwei 3356462c41 配置调整 3 years ago
  liwei 079093e511 删除多余文件 3 years ago
  liwei b814e6db2a 添加展示字段 3 years ago
  liwei a83ac1224a 配置文件添加注释 3 years ago
  wangxy fa0710d85e 维护服务定义优化 3 years ago
  wangxy 1f03c3119f 人员列表样式优化 3 years ago
  wangxy e33158106c 优化 3 years ago
  wangxy 8ff175c82c 维护服务定义需求更改 3 years ago
  wangxy 1bd5767a98 优化 3 years ago
  wangxy 1b1d3a12e2 工单优化 3 years ago
  wangxy 1f20040b0a 维护工单管理 3 years ago
  wangxy dccf89fbb5 Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion 3 years ago
  wangxy 34c212d3d8 苏州蓝色版本维护服务页面优化 3 years ago
  wangxy 101ae235aa 服务维护优化 3 years ago
  wangxy 0bdfed186e Merge branch 'suzhou_blueVersion' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion 3 years ago
  wangxy bd401f7d34 Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion 3 years ago
  liwei 8f63196dfb 合并冲突 3 years ago
  wangxy 6faf92bd39 Merge branch 'suzhou_blueVersion' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion 3 years ago
  wangxy fb56aa7263 Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion 3 years ago
  liwei 1031dd58a0 合并冲突 3 years ago
  liwei d00729af0e 合并代码 3 years ago
  liwei 3fa5428e8d 合并冲突 3 years ago
  liwei e215f58362 合并分支 3 years ago
  wangxy e301cd40ac Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_newLogin 3 years ago
  luanss fccc1ed096 update:修改维护工单状态判断;修改logo背景颜色 3 years ago
  luanss 4ced4e40cc update:更新环境变量 4 years ago
  luanss 5a2032b31f update:修改环境变量 4 years ago
  luanss 45fade21ff update:修改主题色 4 years ago
  luanss 2a819fd8b3 update:头部颜色更改 4 years ago
  luanss 3916bbb561 update:更改登录页面样式 4 years ago
12 changed files with 256 additions and 146 deletions
Split View
  1. +1
    -0
      .env.development
  2. +2
    -4
      .env.production
  3. +1
    -2
      .env.staging
  4. BIN
      src/assets/imgs/bg_login2.png
  5. +46
    -30
      src/layout/components/Navbar.vue
  6. +21
    -8
      src/layout/components/Sidebar/Logo.vue
  7. +4
    -4
      src/styles/variables.scss
  8. +2
    -2
      src/views/equip/basic/personnelList.vue
  9. +1
    -1
      src/views/equip/basic/service.vue
  10. +13
    -0
      src/views/equip/reportform/history.vue
  11. +38
    -18
      src/views/equip/workbench/order.vue
  12. +127
    -77
      src/views/login/index.vue

+ 1
- 0
.env.development View File

@ -12,3 +12,4 @@ VUE_APP_BASE_API = 'http://101.201.121.115:8093'
# when you have a large number of pages.
VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 2
- 4
.env.production View File

@ -2,7 +2,5 @@
VUE_APP_ENV = 'Prod'
NODE_ENV = 'production'
# base api
#广州线上
VUE_APP_BASE_API = 'http://10.122.64.94:8093'
#广州供应商门户线上
#VUE_APP_BASE_API = 'http://8.134.81.220:8097'
# 正式版本
VUE_APP_BASE_API = 'http://192.168.3.22:8095'

+ 1
- 2
.env.staging View File

@ -4,5 +4,4 @@ VUE_APP_ENV = 'QA'
NODE_ENV = 'production'
# base api
VUE_APP_BASE_API = 'http://101.201.121.115:8093'
# VUE_APP_BASE_API = 'http://101.201.121.115:8097'
VUE_APP_BASE_API = 'http://101.201.121.115:8095'

BIN
src/assets/imgs/bg_login2.png View File

Before After
Width: 1920  |  Height: 1080  |  Size: 313 KiB

+ 46
- 30
src/layout/components/Navbar.vue View File

@ -1,23 +1,33 @@
<template>
<div class="navbar" :class="{'isTest': isTest}">
<div class="navbar"
:class="{'isTest': isTest}">
<span class="hamburger-container">
<svg-icon icon-class="hamburger" :class="{'is-open': !sidebar.opened}" @click="toggleSideBar" />
<svg-icon icon-class="hamburger"
:class="{'is-open': !sidebar.opened}"
@click="toggleSideBar" />
</span>
<div class="top">
<ul style="background:transparent; margin: 0; padding: 0; height:80px">
<li v-for="(item, index) in arrayRoutes" :key="index" style="margin-left:30px; line-height:80px">
<div class="sidebar-title" @click="handleSelect(index)">
<svg-icon style="display: block; margin: 0 0 12% 35%; position:relative" :icon-class="item.icon" />
<li v-for="(item, index) in arrayRoutes"
:key="index"
style="margin-left:30px; line-height:80px">
<div class="sidebar-title"
@click="handleSelect(index)">
<svg-icon style="display: block; margin: 0 0 12% 35%; position:relative"
:icon-class="item.icon" />
<span>{{ item.title }}</span>
</div>
</li>
</ul>
</div>
<div class="right-menu">
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<screenfull id="screenfull"
class="right-menu-item hover-effect" />
<el-dropdown class="avatar-container right-menu-item hover-effect"
trigger="click">
<div class="avatar-wrapper">
<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
<img :src="avatar+'?imageView2/1/w/80/h/80'"
class="user-avatar">
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown">
@ -25,7 +35,8 @@
<el-dropdown-item>个人中心</el-dropdown-item>
</router-link>
<el-dropdown-item divided>
<span style="display:block;" @click="logout">退出登录</span>
<span style="display:block;"
@click="logout">退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@ -49,27 +60,30 @@ export default {
}
},
computed: {
...mapGetters([
'sidebar',
'avatar',
'arrayRoutes'
])
...mapGetters(['sidebar', 'avatar', 'arrayRoutes'])
},
methods: {
async handleSelect(index) {
localStorage.setItem('routerIndex', index)
const { roles } = await this.$store.dispatch('user/getInfo')
const accessRoutes = await this.$store.dispatch('permission/generateRoutes', roles)
const accessRoutes = await this.$store.dispatch(
'permission/generateRoutes',
roles
)
accessRoutes[localStorage.getItem('routerIndex')].hidden = false
if (accessRoutes[localStorage.getItem('routerIndex')].children.length > 0) {
this.generaMenu(accessRoutes[localStorage.getItem('routerIndex')].children)
if (
accessRoutes[localStorage.getItem('routerIndex')].children.length > 0
) {
this.generaMenu(
accessRoutes[localStorage.getItem('routerIndex')].children
)
}
router.selfaddRoutes(accessRoutes)
this.$router.push({ path: '/dashboard', query: { param: Math.random() }})
this.$router.push({ path: '/dashboard', query: { param: Math.random() } })
},
//
generaMenu(data) {
data.forEach(item => {
data.forEach((item) => {
item.hidden = false
if (item.children.length > 0) {
this.generaMenu(item.children)
@ -99,8 +113,9 @@ export default {
height: 80px;
overflow: hidden;
position: relative;
background: url("../../assets/imgs/bg_nav.png");
box-shadow: 0 1px 4px rgba(0,21,41,.08);
// background: url('../../assets/imgs/bg_nav.png');
background: #1467ff;
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
.top {
height: 80px;
line-height: 80px;
@ -108,7 +123,7 @@ export default {
float: left;
.el-button {
background-color: unset;
border:0;
border: 0;
color: #fff;
font-family: 'Noto Sans SC' !important;
}
@ -118,11 +133,11 @@ export default {
height: 100%;
float: left;
cursor: pointer;
transition: background .3s;
-webkit-tap-highlight-color:transparent;
transition: background 0.3s;
-webkit-tap-highlight-color: transparent;
font-size: 28px;
&:hover {
background: rgba(0, 0, 0, .025)
background: rgba(0, 0, 0, 0.025);
}
}
@ -154,10 +169,10 @@ export default {
&.hover-effect {
cursor: pointer;
transition: background .3s;
transition: background 0.3s;
&:hover {
background: rgba(0, 0, 0, .025)
background: rgba(0, 0, 0, 0.025);
}
}
}
@ -188,7 +203,8 @@ export default {
}
}
.isTest {
background: url("../../assets/imgs/bg_nav_qa.png");
// background: url("../../assets/imgs/bg_nav_qa.png");
background: #1467ff;
background-size: 100% 120%;
}
ul li {
@ -197,7 +213,7 @@ ul li {
cursor: pointer;
}
li :hover {
color: #FCC874;
color: #fcc874;
}
.sidebar-title {
display: inline-block;
@ -207,7 +223,7 @@ li :hover {
font-size: 16px;
vertical-align: middle;
background: transparent;
text-align: center
text-align: center;
}
.is-open {
transform: rotate(180deg);


+ 21
- 8
src/layout/components/Sidebar/Logo.vue View File

@ -1,13 +1,25 @@
<template>
<div class="sidebar-logo-container" :class="{'collapse':collapse, 'isTest': isTest}">
<div class="sidebar-logo-container"
:class="{'collapse':collapse, 'isTest': isTest}">
<transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" src="@/assets/logo/logo.png" class="sidebar-logo">
<h1 v-else class="sidebar-title">{{ title }} </h1>
<router-link v-if="collapse"
key="collapse"
class="sidebar-logo-link"
to="/">
<img v-if="logo"
src="@/assets/logo/logo.png"
class="sidebar-logo">
<h1 v-else
class="sidebar-title">{{ title }} </h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<router-link v-else
key="expand"
class="sidebar-logo-link"
to="/">
<h1 class="sidebar-title">
<img v-if="logo" style="display: block; width:40px; margin: 6px 0" src="@/assets/logo/logo.png">
<img v-if="logo"
style="display: block; width:40px; margin: 6px 0"
src="@/assets/logo/logo.png">
<span style="margin-left: -20px">{{ title }}</span>
</h1>
</router-link>
@ -51,7 +63,8 @@ export default {
// line-height: 50px;
height: 80px;
line-height: 80px;
background: #00465B;
// background: #00465b;
background: #1467ff;
text-align: center;
overflow: hidden;
@ -85,6 +98,6 @@ export default {
}
}
.isTest {
background: #00465B;
background: #1467ff;
}
</style>

+ 4
- 4
src/styles/variables.scss View File

@ -34,12 +34,12 @@ $menuActiveText:#409EFF;
$subMenuActiveText:#3D3D42;
$menuBg:#304156;
$menuHover:#0A708F;
// $menuHover:#1467FF;
// $menuHover:#0A708F;
$menuHover:#1467FF;
$subMenuBg:#1f2d3d;
$subMenuHover:#0A708F;
// $subMenuHover:#1467FF;
// $subMenuHover:#0A708F;
$subMenuHover:#1467FF;
$sideBarWidth: 210px;


+ 2
- 2
src/views/equip/basic/personnelList.vue View File

@ -55,7 +55,7 @@
</el-row>
<!-- 用户资产关系维护 -->
<el-dialog :title="userName+'-资产关系维护'"
width="700px"
width="90%"
:close-on-click-modal="false"
:visible.sync="isAssetsVisible"
@close="closeUserCb">
@ -70,7 +70,7 @@
</el-dialog>
<!-- 用户维护服务关系维护 -->
<el-dialog :title="userName+'-服务关系维护'"
width="700px"
width="90%"
:close-on-click-modal="false"
:visible.sync="isServiceVisible"
@close="closeServiceCb">


+ 1
- 1
src/views/equip/basic/service.vue View File

@ -170,7 +170,7 @@
</el-col>
<el-col :span="6">
<el-form-item :label="getColumnName('pm_service-maintimelen')">
<el-input v-model="form['pm_service-maintimelen']" placeholder="请输入" />
<el-input-number v-model="form['pm_service-maintimelen']" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6">


+ 13
- 0
src/views/equip/reportform/history.vue View File

@ -135,6 +135,7 @@
<span> {{ parseTime(row.credatuz) }} </span>
</template>
</vxe-table-column>
</vxe-table>
</template>
</vxe-table-column>
@ -154,6 +155,18 @@
<span> {{ parseTime(scope.row.schedendtime) }} </span>
</template>
</vxe-table-column>
<!-- 实际开始时间 -->
<vxe-table-column field="actbegtime" width="200" :title="getColumnName('actbegtime')" >
<template slot-scope="scope">
<span> {{ parseTime(scope.row.actbegtime) }} </span>
</template>
</vxe-table-column>
<!-- 实际结束时间 -->
<vxe-table-column field="actendtime" width="200" :title="getColumnName('actendtime')">
<template slot-scope="scope">
<span> {{ parseTime(scope.row.actendtime) }} </span>
</template>
</vxe-table-column>
<vxe-table-column field="lastuser" :title="getColumnName('lastuser')" />
<vxe-table-column field="credatuz" :title="getColumnName('credatuz')">
<template slot-scope="scope">


+ 38
- 18
src/views/equip/workbench/order.vue View File

@ -38,7 +38,10 @@
<el-checkbox v-model="completeChecked">已完成</el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" />
<el-button type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery" />
</el-form-item>
<!-- 根据资产查询服务 -->
<el-form-item style="margin-left:100px;">
@ -47,22 +50,24 @@
</el-form>
<!-- 列表 -->
<vxe-table ref="xTable"
v-loading="loading"
:align="allAlign"
:data="dataList"
show-overflow
resizable
border
highlight-hover-row
:cell-style="columnStyle">
v-loading="loading"
:align="allAlign"
:data="dataList"
show-overflow
resizable
border
highlight-hover-row
:cell-style="columnStyle"
>
<!-- 维护工单 -->
<vxe-table-column field="maintwoid" width="150" show-overflow :title="getColumnName('maintwoid')" />
<!-- 描述 -->
<vxe-table-column field="descr" :title="getColumnName('descr')" />
<vxe-table-column field="descr" width="150" :title="getColumnName('descr')" />
<!-- 状态 -->
<vxe-table-column field="status" width="150" :title="getColumnName('status')">
<template v-slot="{row}">
<div style="cursor:pointer;" @click="changeStatus(row)"> {{ statusEnum[row.status] }} </div>
<div style="cursor:pointer;"
@click="changeStatus(row)"> {{ statusEnum[row.status] }} </div>
</template>
</vxe-table-column>
<!-- 时间类型 -->
@ -83,9 +88,22 @@
<template slot-scope="scope">
<span> {{ parseTime(scope.row.schedendtime) }} </span>
</template>
</vxe-table-column>
<!-- 实际开始时间 -->
<vxe-table-column field="actbegtime" width="200" :title="getColumnName('actbegtime')" >
<template slot-scope="scope">
<span> {{ parseTime(scope.row.actbegtime) }} </span>
</template>
</vxe-table-column>
<!-- 实际结束时间 -->
<vxe-table-column field="actendtime" width="200" :title="getColumnName('actendtime')">
<template slot-scope="scope">
<span> {{ parseTime(scope.row.actendtime) }} </span>
</template>
</vxe-table-column>
<!-- 最近一次更改人 -->
<vxe-table-column field="lastuser" width="200" :title="getColumnName('lastuser')" />
<!-- 创建时间 -->
<vxe-table-column field="credatuz" width="200" :title="getColumnName('credatuz')">
<template slot-scope="scope">
@ -181,8 +199,10 @@
<vxe-form-item :title="getColumnName('bitmap')" field="bitmap" span="12">
<input ref="upload" type="file" accept="image/*" @change="takePhoto($event)">
</vxe-form-item>
<vxe-form-item align="center" span="24">
<vxe-button type="submit" status="primary">保存</vxe-button>
<vxe-form-item align="center"
span="24">
<vxe-button type="submit"
status="primary">保存</vxe-button>
<!-- <vxe-button type="reset">重置</vxe-button> -->
<vxe-button @click="$refs.xModal.close()">取消</vxe-button>
</vxe-form-item>
@ -197,11 +217,11 @@
resizable
border
highlight-hover-row>
<vxe-table-column field="pm_service-descr" show-overflow :title="getColumnName('pm_service-descr')" />
<vxe-table-column field="pm_service-mainttype" :title="getColumnName('pm_service-mainttype')" />
<vxe-table-column field="pm_service-lastmodif" :title="getColumnName('pm_service-lastmodif')" />
<vxe-table-column field="pm_service-lastuser" :title="getColumnName('pm_service-lastuser')" />
<vxe-table-column field="action" :title="getColumnName('action')">
<vxe-table-column field="pm_service-descr" width="200" show-overflow :title="getColumnName('pm_service-descr')" />
<vxe-table-column field="pm_service-mainttype" width="200" :title="getColumnName('pm_service-mainttype')" />
<vxe-table-column field="pm_service-lastmodif" width="200" :title="getColumnName('pm_service-lastmodif')" />
<vxe-table-column field="pm_service-lastuser" width="200" :title="getColumnName('pm_service-lastuser')" />
<vxe-table-column field="action" width="200" :title="getColumnName('action')">
<template slot-scope="scope">
<el-button type="text" icon="el-icon-plus" @click="createOrder(scope.row)">创建维护工单</el-button>
</template>


+ 127
- 77
src/views/login/index.vue View File

@ -1,6 +1,11 @@
<template>
<div class="login-container">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on" label-position="left">
<el-form ref="loginForm"
:model="loginForm"
:rules="loginRules"
class="login-form"
autocomplete="on"
label-position="left">
<div class="title-container">
<h3 class="title">LAPP管理平台</h3>
</div>
@ -8,53 +13,58 @@
<span class="svg-container">
<svg-icon icon-class="login-project" />
</span>
<el-select v-model="loginForm.workshop" style="width: 92%;" filterable placeholder="请选择车间">
<el-option
v-for="item in options"
:key="item.pid"
:label="item.descr"
:value="item.pid"
/>
<el-select v-model="loginForm.workshop"
style="width: calc(100% - 56px);"
filterable
placeholder="请选择车间">
<el-option v-for="item in options"
:key="item.pid"
:label="item.descr"
:value="item.pid" />
</el-select>
</el-form-item>
<el-form-item prop="userid">
<span class="svg-container">
<svg-icon icon-class="login-user" />
</span>
<el-input
ref="userid"
v-model="loginForm.userid"
placeholder="用户名"
name="userid"
type="text"
tabindex="1"
/>
<el-input ref="userid"
v-model="loginForm.userid"
placeholder="用户名"
name="userid"
type="text"
tabindex="1" />
</el-form-item>
<el-tooltip v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
<el-tooltip v-model="capsTooltip"
content="Caps lock is On"
placement="right"
manual>
<el-form-item prop="password">
<span class="svg-container">
<svg-icon icon-class="login-password" />
</span>
<el-input
:key="passwordType"
ref="password"
v-model="loginForm.password"
:type="passwordType"
placeholder="密码"
name="password"
tabindex="2"
autocomplete="on"
@keyup.native="checkCapslock"
@blur="capsTooltip = false"
@keyup.enter.native="handleLogin"
/>
<span class="show-pwd" @click="showPwd">
<svg-icon :icon-class="passwordType === 'password' ? 'login-eye' : 'login-eye-open'" style="font-color:#ffffff" />
<el-input :key="passwordType"
ref="password"
v-model="loginForm.password"
:type="passwordType"
placeholder="密码"
name="password"
tabindex="2"
autocomplete="on"
@keyup.native="checkCapslock"
@blur="capsTooltip = false"
@keyup.enter.native="handleLogin" />
<span class="show-pwd"
@click="showPwd">
<svg-icon :icon-class="passwordType === 'password' ? 'login-eye' : 'login-eye-open'"
style="font-color:#ffffff" />
</span>
</el-form-item>
</el-tooltip>
<el-button :loading="loading" type="primary" class="login-button" @click.native.prevent="handleLogin">
<el-button :loading="loading"
type="primary"
class="login-button"
@click.native.prevent="handleLogin">
<span v-if="!loading"> </span>
<span v-else> 中...</span>
</el-button>
@ -63,7 +73,6 @@
</template>
<script>
import { getWorkshop } from '@/api/login'
import { getAllField } from '@/api/system/field'
@ -84,9 +93,7 @@ export default {
userid: [
{ required: true, trigger: 'blur', message: '用户名不能为空' }
],
password: [
{ required: true, trigger: 'blur', message: '密码不能为空' }
]
password: [{ required: true, trigger: 'blur', message: '密码不能为空' }]
},
passwordType: 'password',
capsTooltip: false,
@ -98,7 +105,7 @@ export default {
},
watch: {
$route: {
handler: function(route) {
handler: function (route) {
const query = route.query
if (query) {
this.redirect = query.redirect
@ -120,7 +127,7 @@ export default {
},
methods: {
getPlants() {
getWorkshop().then(res => {
getWorkshop().then((res) => {
if (res.code === 200) {
this.options = res.data
localStorage.setItem('workshop', JSON.stringify(this.options))
@ -129,7 +136,10 @@ export default {
},
checkCapslock({ shiftKey, key } = {}) {
if (key && key.length === 1) {
if (shiftKey && (key >= 'a' && key <= 'z') || !shiftKey && (key >= 'A' && key <= 'Z')) {
if (
(shiftKey && key >= 'a' && key <= 'z') ||
(!shiftKey && key >= 'A' && key <= 'Z')
) {
this.capsTooltip = true
} else {
this.capsTooltip = false
@ -150,14 +160,15 @@ export default {
})
},
handleLogin() {
this.$refs.loginForm.validate(valid => {
this.$refs.loginForm.validate((valid) => {
if (valid) {
this.loading = true
localStorage.removeItem('routerIndex')
this.$store.dispatch('user/login', this.loginForm)
this.$store
.dispatch('user/login', this.loginForm)
.then(() => {
this.$router.push({ path: '/' })
getAllField().then(res => {
getAllField().then((res) => {
localStorage.removeItem('allField')
localStorage.setItem('allField', JSON.stringify(res.data))
})
@ -196,19 +207,40 @@ $cursor: #fff;
/* reset element-ui css */
.login-container {
.svg-container {
width: 54px;
height: 54px;
background: rgba($color: #fff, $alpha: 0.23);
border-radius: 3px 0px 0px 3px;
display: inline-block;
text-align: center;
line-height: 60px;
.svg-icon {
width: 1.5em;
height: 1.5em;
}
}
.el-form-item__content {
display: flex;
align-items: center;
justify-content: space-between;
border: 1px solid rgba($color: #fff, $alpha: 0.39);
border-radius: 4px;
}
.el-input {
display: inline-block;
height: 47px;
width: 85%;
width: calc(100% - 56px);
input {
background: transparent;
border: 0px;
-webkit-appearance: none;
border-radius: 0px;
padding: 12px 5px 12px 15px;
color: #FFFFFF;
height: 47px;
caret-color: #FFFFFF;
padding: 12px 5px 19px 20px;
color: #ffffff;
height: 56px;
caret-color: #ffffff;
border-radius: 4px;
// &:-webkit-autofill {
// box-shadow: 0 0 0 1000px rgba(0,76,99,0.9) inset !important;
@ -218,43 +250,53 @@ $cursor: #fff;
&:-webkit-autofill:hover,
&:-webkit-autofill:focus,
&:-webkit-autofill:active {
transition-delay: 111111s;
transition: color 11111s ease-out, background-color 111111s ease-out;
transition-delay: 111111s;
transition: color 11111s ease-out, background-color 111111s ease-out;
}
}
}
.el-input--suffix {
width: 104%;
right: 5%;
}
.el-select {
input {
padding: 12px 5px 19px 36px;
}
}
.el-form-item {
border-bottom: 1px solid rgba(231,250,255, 0.32);
color: #FFFFFF;
// border-bottom: 1px solid rgba(231, 250, 255, 0.32);
color: #ffffff;
}
}
</style>
<style lang="scss" scoped>
.login-container {
min-height: 100%;
width: 100%;
overflow: hidden;
background-image: url('../../assets/imgs/bg_login1.png');
background-size: cover;
background-image: url('../../assets/imgs/bg_login2.png');
// background-size: cover;
background-size: 100% 100%;
background-repeat: no-repeat;
.login-form {
position: relative;
width: 400px;
max-width: 100%;
padding: 0 5%;
padding: 0 4%;
margin: 0 auto;
overflow: hidden;
margin-right: 6%;
width:40%;
height:calc(60vh);
margin-top:calc(20vh);
background: rgba(0,76,99, 0.73);
margin-right: 4.5%;
// width: 40%;
// height: calc(60vh);
margin-top: calc(15vh);
background: rgba(255, 255, 255, 0.12);
width: 30%;
height: 65vh;
border-radius: 8px;
border: 1px solid rgba($color: #ffffff, $alpha: 0.39);
}
.tips {
font-size: 16px;
@ -272,22 +314,30 @@ $cursor: #fff;
position: relative;
.title {
font-size: 26px;
color: #FFFFFF;
margin: 10% auto 9% auto;
color: #ffffff;
margin: 16% auto 9% auto;
text-align: center;
font-weight: 700;
}
}
.login-button {
width:100%;
height: 12%;
color:#369bb9;
font-weight: 550;
background: #FFFFFF;
border-radius: 36px;
margin-top: 4%;
border:0;
}
.login-button {
// width: 100%;
// height: 12%;
// color: #369bb9;
// font-weight: 550;
// background: #ffffff;
// border-radius: 36px;
// margin-top: 4%;
// border: 0;
width: 380px;
height: 72px;
background: rgba($color: #fff, $alpha: 0.8);
box-shadow: 2px 12px 20px 0px rgba(2, 10, 25, 0.16);
border-radius: 8px;
color: #1467ff;
font-size: 1.1em;
margin-top: 20px;
}
.show-pwd {
position: absolute;
right: 10px;
@ -303,9 +353,9 @@ $cursor: #fff;
right: 0;
bottom: 6px;
}
/deep/ .el-select .el-input .el-select__caret {
color: #FFFFFF;
}
/deep/ .el-select .el-input .el-select__caret {
color: #ffffff;
}
@media only screen and (max-width: 470px) {
.thirdparty-button {
display: none;


Loading…
Cancel
Save