Skip to content

Commit

Permalink
feat: login
Browse files Browse the repository at this point in the history
  • Loading branch information
dawnwinterLiu committed Sep 22, 2022
1 parent c1e47bd commit a6d033e
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 40 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@
<div class="loader-section section-left"></div>
<div class="loader-section section-right"></div>
<div class="load_title" style="font-size: 16px !important">
当前阶段访问用户过多,资源加载可能慢,请耐心等待...
<br />
<p style="font-size: 16px !important">
当前版本v<%= VUE_APP_VERSION %>
</p>
Expand Down
1 change: 0 additions & 1 deletion src/api/System/filemanagement.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export async function getproductTree(params) {
// return query_object('MetaData', params)
}


export function list_dir(path) {
return request({
url: 'list_dir',
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default {
currentConnections: '当前连接数',
},
home: {
'login title': '物联网平台',
'department switch': '部门切换',
'error log': '错误日志',
search: '搜索',
Expand All @@ -29,7 +30,7 @@ export default {
konva: '进入组态',
updatedAt: '更新时间',
preview: '查看产品',
login: '用户登录',
login: '登录',
unit: '工程单位',
scale: '服务规模',
category: '所属行业',
Expand Down
4 changes: 2 additions & 2 deletions src/views/CloudOT/maintenance/ChangeStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
</el-form>
</el-tab-pane>
<el-tab-pane
v-if="form.type == 'Ѳ¼ì'"
v-if="form.type == '巡检'"
:label="$translateTitle('Maintenance.inspection data')"
name="second"
style="height: 90%; overflow-x: hidden; overflow-y: auto"
Expand Down Expand Up @@ -390,7 +390,7 @@
margin: 20px 0;
}
}
/* Êý¾Ý¿¨Æ¬Áбí */
/* 数据卡片列表 */
.card_content {
display: flex;
flex-wrap: wrap;
Expand Down
2 changes: 1 addition & 1 deletion src/views/CloudOT/maintenance/createTicket.vue
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@
.then((res) => {
if (res.data.url) {
this.form.info.photo.push(res.data.url)
// console.log('上传成功的回调', res.data.url, this.form.info.photo)
// console.log('上传成功的回调', res.data.url, this.form.info.photo)
} else {
console.log('no up url ', res)
}
Expand Down
57 changes: 24 additions & 33 deletions src/views/MultiTenant/user/login/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
:rules="rules"
>
<div v-if="Default.title" class="title-tips">
{{ $translateTitle('home.login') }}
{{ $translateTitle('home.login title') }}
</div>
<el-form-item prop="username" style="margin-top: 40px">
<el-input
Expand All @@ -46,18 +46,9 @@
:type="passwordType"
@keyup.enter.native="handleLogin"
>
<!-- <el-link-->
<!-- v-if="!form.password.length"-->
<!-- slot="append"-->
<!-- type="primary"-->
<!-- @click="forgotPwd()"-->
<!-- >-->
<!-- {{ $translateTitle('home.Forgot password') }}-->
<!-- </el-link>-->
<template #prefix>
<dgiot-icon v-if="form.password.length" icon="lock-line" />
</template>

<template
v-if="passwordType === 'password' && form.password.length"
#suffix
Expand All @@ -78,20 +69,20 @@
</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input class="sbMc">
<el-button
slot="append"
class="login-btn"
:loading="loading"
type="primary"
@click.native="handleLogin"
>
{{ $translateTitle('home.login') }}
</el-button>
</el-input>
</el-form-item>

<!-- <el-form-item>-->
<!-- <el-input class="sbMc">-->
<div>
<el-button
slot="append"
class="login-btn"
:loading="loading"
@click.native="handleLogin"
>
{{ $translateTitle('home.login') }}
</el-button>
</div>
<!-- </el-input>-->
<!-- </el-form-item>-->
<span>
<router-link v-show="false" style="float: left" to="/register">
<div style="margin-top: 20px">
Expand All @@ -104,9 +95,6 @@
</span>
</el-form>
</el-col>
<!-- <el-col :lg="1" :md="1" :sm="24" :xl="1" :xs="24">-->
<!-- <div style="color: transparent">占位符</div>-->
<!-- </el-col>-->
</el-row>
</div>
</template>
Expand Down Expand Up @@ -459,7 +447,7 @@
clearInterval(this.interval)
window.clearInterval(this.interval)
}
}, 800)
}, 100)
} catch (error) {
console.log(error)
this.$baseMessage(
Expand All @@ -486,10 +474,10 @@
padding: 4.5vh;
margin: calc((100vh - 475px) / 2) 5vw 5vw;
overflow: hidden;
background: #fff;
background: #002d55;
//background: url('http://dgiot-1253666439.cos.ap-shanghai-fsi.myqcloud.com/platform/assets/login_images/login_form.png');
background-size: 100% 100%;
border: 8px solid #3cb2fb;
border: 1px solid #3cb2fb;
.title {
font-size: 54px;
Expand All @@ -501,7 +489,7 @@
margin: 0 auto;
font-size: 26px;
font-weight: 400;
color: #096dd9;
color: #dcdbdb;
text-align: center;
}
Expand All @@ -513,20 +501,23 @@
.el-input-group__append {
color: #fff;
background-color: #409eff;
border-color: #409eff;
background-color: #4a7ca8;
//border-color: #409eff;
}
}
}
.login-btn {
background-color: #2f6fe7 !important;
display: inherit;
width: 100%;
height: 50px;
margin: 0 auto;
margin-top: 5px;
text-align: center;
border: 0;
font-size: 20px;
color: white !important;
&:hover {
opacity: 0.9;
Expand Down

1 comment on commit a6d033e

@vercel
Copy link

@vercel vercel bot commented on a6d033e Sep 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

dgiot-dashboard – ./

dgiot-dashboard.vercel.app
dgiot-dashboard-git-master-dgiot.vercel.app
dgiot-dashboard-dgiot.vercel.app

Please sign in to comment.