From 5e92639b063edcab154a235df05e1ddeaa839de6 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 10 Apr 2021 11:34:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/lang/zh.js | 2
src/page/login/index.vue | 32 +++++++++------
src/styles/login.scss | 66 +++++++++++++++++++++++++-------
public/img/bg/bgzs.png | 0
public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js | 3 -
5 files changed, 71 insertions(+), 32 deletions(-)
diff --git a/public/img/bg/bgzs.png b/public/img/bg/bgzs.png
new file mode 100644
index 0000000..f2f5ff2
--- /dev/null
+++ b/public/img/bg/bgzs.png
Binary files differ
diff --git a/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js b/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
index c8ba541..5d15530 100644
--- a/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
+++ b/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
@@ -215,7 +215,6 @@
//this.map.infoWindow.anchor = anchor;
this.map.infoWindow.cluster = this.activeCluster;
-
//reset the geometry of the flare feature in the info window to be the actual location of the flared object, not the location of the flare graphic.
var p = webMercatorUtils.geographicToWebMercator(new Point(flareObject.singleData[this.xPropertyName], flareObject.singleData[this.yPropertyName], this.spatialRef));
this.map.infoWindow.features[0].geometry = p;
@@ -260,7 +259,6 @@
}
this.allData.push(obj);
-
var xVal = obj[this.xPropertyName];
var yVal = obj[this.yPropertyName];
@@ -609,7 +607,6 @@
},
_createClusterGrid: function (webExtent) {
-
//get the total amount of grid spaces based on the height and width of the map (divide it by clusterRatio) - then get the degrees for x and y
var xCount = Math.round(this.map.width / this.clusterRatio);
var yCount = Math.round(this.map.height / this.clusterRatio);
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 049ac51..f065a49 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -66,7 +66,7 @@
test: '测试页面'
},
login: {
- title: '登录 ',
+ title: '物联网安保云服务平台 ',
info: '物联网安保云服务平台',
tenantId: '请输入租户ID',
username: '请输入账号',
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 91c03cc..3692baa 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -3,32 +3,36 @@
@keyup.enter.native="handleLogin">
<top-color v-show="false"></top-color>
<div class="login-weaper animated bounceInDown">
- <div class="login-left">
- <div class="login-time">
- {{time}}
- </div>
- <img class="img" src="/img/1.jpg" alt="">
- <p class="title">{{ $t('login.info') }}</p>
- </div>
+ <!-- <div class="login-left">-->
+ <!-- <div class="login-time">-->
+ <!-- {{time}}-->
+ <!-- </div>-->
+ <!-- <img class="img" src="/img/1.jpg" alt="">-->
+ <!-- <p class="title">{{ $t('login.info') }}</p>-->
+ <!-- </div>-->
+
+ <img src="/img/bg/bgzs.png" alt="" class="login-lefts">
+
<div class="login-border">
<div class="login-main">
<h4 class="login-title">
{{ $t('login.title') }}
-<!-- <top-lang></top-lang>-->
+ <!-- <top-lang></top-lang>-->
</h4>
+ <h4 class="login-title-child">IoT security cloud service platform</h4>
<userLogin></userLogin>
<!-- <codeLogin v-else-if="activeName==='code'"></codeLogin>-->
<!-- <thirdLogin v-else-if="activeName==='third'"></thirdLogin>-->
<div class="login-menu">
<!-- <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>-->
- <!–<a href="#" @click.stop="zShow">{{ $t('login.phoneLogin') }}</a>–>
+ <a href="#" @click.stop="zShow">{{ $t('login.phoneLogin') }}</a>
<!-- <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>-->
</div>
</div>
</div>
</div>
- <div class="z" v-show="activeName == 'code'" >
+ <div class="z" v-show="activeName == 'code'">
<codeLogin></codeLogin>
</div>
@@ -125,7 +129,7 @@
</script>
<style lang="scss">
- .z{
+ .z {
position: fixed;
margin: auto;
padding: 10px;
@@ -137,8 +141,9 @@
height: 500px;
background-color: #fff;
box-sizing: border-box;
- box-shadow:6px 6px 5px #909090;
+ box-shadow: 6px 6px 5px #909090;
}
+
.company-jx {
position: fixed;
margin: auto;
@@ -147,8 +152,9 @@
right: 0px;
bottom: 120px;
text-align: center;
- color: #fff;
+ color: #fff;
font-size: 15px;
}
+
@import "@/styles/login.scss";
</style>
diff --git a/src/styles/login.scss b/src/styles/login.scss
index 498d5af..2f828c7 100644
--- a/src/styles/login.scss
+++ b/src/styles/login.scss
@@ -5,14 +5,14 @@
width: 100%;
height: 100%;
margin: 0 auto;
- background-image: url("/img/bg/bg.jpg");
background-size: 100% 100%;
+ background-color: #1D5DB2;
}
.login-weaper {
margin: 0 auto;
- width: 1000px;
- box-shadow: -4px 5px 10px rgba(0, 0, 0, 0.4);
+ width: 1500px;
+ //box-shadow: -4px 5px 10px rgba(0, 0, 0, 0.4);
.el-input-group__append {
border: none;
@@ -69,14 +69,11 @@
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
color: #fff;
- background-color: #fff;
- width: 50%;
- float: left;
+ width: 35%;
box-sizing: border-box;
}
.login-main {
- margin: 0 auto;
width: 65%;
box-sizing: border-box;
}
@@ -90,21 +87,21 @@
}
.login-title {
- color: #333;
- margin-bottom: 40px;
- font-weight: 500;
- font-size: 22px;
+ color: #FFFFFFFF;
+ font-weight: 100;
+ text-shadow: 3px 0px 20px #000000FF;
+ font-size: 40px;
+ width: 445px;
+ margin: 0;
text-align: center;
letter-spacing: 4px;
}
.login-menu {
- margin-top: 40px;
width: 100%;
- text-align: center;
-
+ opacity: 0.7;
a {
- color: #999;
+ color: #ffffff;
font-size: 12px;
margin: 0px 8px;
}
@@ -182,3 +179,42 @@
text-align: center;
cursor:pointer!important;
}
+
+.login-lefts{
+ width: 55%;
+ float: left;
+}
+
+.login-main .el-form-item__content .el-input{
+ background-color: white;
+ border-radius:5px;
+ border-bottom: 0px;
+}
+.login-main .el-form-item__content .el-input__inner{
+ border-bottom: 0px;
+}
+
+.login-main .login-form .el-form-item--feedback:nth-child(1),.el-form-item--feedback:nth-child(2){
+ margin-bottom: 20px !important;
+}
+
+.login-title-child{
+ color: #ffffff;
+ opacity: 0.7;
+ width: 445px;
+ letter-spacing: 6px;
+ font-size: 10px;
+ margin: 0px 0px 30px 10px;
+}
+
+.login-form i{
+ color: #2699FBFF;
+}
+.login-submit{
+ color: #FFF;
+ background-color: #409EFF;
+ border-color: #409EFF;
+}
+
+
+
--
Gitblit v1.9.3