Merge branch 'dev-xiaole' into 'master'

Dev xiaole

See merge request !9

src/views/homeTwo/login_v1.vue

@@ -13,10 +13,10 @@
           :src="'./img/logo/' + LOGO + '.png'"
           class="logo"
         />
-        <span v-if="systemInfo.platformName && company!='nanchang'">{{ systemInfo.platformName }}</span
-        ><!--智慧工地云平台-->
-        <span v-if="!systemInfo.platformName && company!='nanchang'">{{ $t("message.login.title") }}</span
-        ><!--智慧工地云平台-->
+        <!-- <span v-if="systemInfo.platformName && company!='nanchang'">{{ systemInfo.platformName }}</span -->
+        <!--智慧工地云平台-->
+        <!-- <span v-if="!systemInfo.platformName && company!='nanchang'">{{ $t("message.login.title") }}</span -->
+        <!--智慧工地云平台-->
         
         <!-- 南昌地铁登录页不显示智慧工地云平台字样 -->
         <span v-if="company=='nanchang'"></span>
@@ -35,10 +35,11 @@
       <img
         class="contentBG"
         v-else
-        src="../../assets/images/login_bg.webp"
+        src="../../assets/images/bgclogo.png"
         alt=""
       />
       <div class="login_info">
+        <img class="image" src="../../assets/images/zjsjlogo.png"></img>
         <div class="info_title flex">
           <p
             :class="loginType == 1 ? 'border_bottom' : 'placeholder'"
@@ -136,8 +137,10 @@
             >{{ $t("message.login.login") }}
           </el-button>
         </div>
+        <div class="next"><el-radio v-model="radio"></el-radio>下次自动登录</div>
+        <div class="right"><span class="forget">忘记密码</span>&nbsp;|&nbsp;&nbsp;<span class="register">点击注册</span></div>
         <div class="info_bottom">
-          友情提示：win7以上操作系统，浏览器使用Chrome；电脑屏幕分辩率>=1440X900达到最佳浏览视觉
+          <!-- 友情提示：win7以上操作系统，浏览器使用Chrome；电脑屏幕分辩率>=1440X900达到最佳浏览视觉 -->
         </div>
         <!-- <div class="info_bottom">为了平台效果展示更好，请使用屏幕分辩率>=1440X900</div> -->
         <div class="info_bottom flex" style="display: none">
@@ -192,6 +195,7 @@ export default {
   components: { getcode },
   data() {
     return {
+      radio:'',
       LOGO: LOGO,
       loginType: 1,
       automaticLogin: false,
@@ -483,12 +487,31 @@ export default {
   align-items: center;
 }
 .contentBG {
-  width: 100%;
+  width: 50%;
   height: 100%;
   position: absolute;
-  left: 0;
+  left:0;
   top: 0;
 }
+.image {
+  margin-bottom: 70px;
+  margin-left: 40px;
+}
+.next{
+  float:left;
+  margin-top: 40px;
+  color:#8E8E8E;
+}
+.right{
+  margin-top: 40px;
+  float: right;
+}
+.forget{
+  color:#8E8E8E;
+}
+.register{
+  color:#459DF5;
+}
 .login {
   width: 100%;
   height: 100%;
@@ -515,21 +538,21 @@ export default {
 
   .content {
     width: 100%;
-    height: 652px;
+    height: 750px;
     margin-top: 90px;
     // background-image: url("../../assets/images/login_bg.png");
     flex-direction: row-reverse;
     position: relative;
 
     .login_info {
-      width: 444px;
-      height: 434px;
+      width: 740px;
+      height: 500px;
       background: #ffffff;
-      box-shadow: 0 0 31px 0 rgba(13, 28, 91, 0.28);
+      // box-shadow: 0 0 31px 0 rgba(13, 28, 91, 0.28);
       border-radius: 5px;
       margin-right: 123px;
       box-sizing: border-box;
-      padding: 37px 33.5px 0;
+      padding: 0px 33.5px 0;
       position: relative;
       z-index: 2;
 
@@ -574,6 +597,7 @@ export default {
         width: 100%;
         font-family: PingFangSC-Regular;
         font-size: 20px;
+        background-color: #459DF5;
       }
 
       .info_bottom {
@@ -612,4 +636,12 @@ export default {
   bottom: 0;
   transform: translateX(-50%);
 }
+
+::v-deep el-input__inner{
+   border-bottom: 1px solid #dbdbdb;
+    border-top: 0px;
+    border-left: 0px;
+    border-right: 0px;
+
+}
 </style>

src/views/projectAdmin/dataBoardTwo/bigScreen.vue

@@ -1,8 +1,12 @@
 <template>
-<div>
-</div>
+<div class="imgbox">
+       <img class="img" src="../../../assets/images/zjbigScreen/binscreen.png" alt="">
+  </div>
 </template>
 <script>
 </script>
 <style lang="less" scoped>
+.img{
+    width:1750px;
+}
 </style>

src/views/projectAdmin/dataBoardTwo/style.less

@@ -5,7 +5,7 @@
 }
 
 .headerBox{
-    background-image: url('../../../assets/images/dataBoard/title_line.png');
+    // background-image: url('../../../assets/images/dataBoard/title_line.png');
     background-position: bottom center;
     background-repeat: no-repeat;
     height: 100px;
@@ -66,7 +66,7 @@
         display: inline-block;
         color: rgba(92, 226, 246, 100);
         font-size: 18px;
-        background-image: url('../../../assets/images/dataBoard/menuBG.png');
+        background-image: url('../../../assets/images/dataBoardTwo/active.png');
         width: 130px;
         height: 40px;
         text-align: center;
@@ -77,8 +77,8 @@
         z-index: 2;
         margin-right: 30px;
         &.active{
-            background-image: url('../../../assets/images/dataBoard/menuBG-active.png');
-            color: rgba(247, 211, 0, 100);
+            background-image: url('../../../assets/images/dataBoardTwo/unactive.png');
+            color: white;
         }
         &.right{
             float: right;
@@ -269,7 +269,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
         
         .top{
             height: 57%;
-            background-image: url('../../../assets/images/dataBoard/centerTopBG.png');;
+            background-image: url('../../../assets/images/dataBoardTwo/top.png');;
             background-size: 100% 100%;
             background-position: center;
             background-repeat: no-repeat;
@@ -279,7 +279,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
         .bottom{
             margin: 10px 20px;
             height: calc(43% - 20px);
-            background-image: url('../../../assets/images/dataBoard/centerBottomBG.png');
+            // background-image: url('../../../assets/images/dataBoard/centerBottomBG.png');
             background-size: 100% 100%;
             background-position: center;
             background-repeat: no-repeat;