From 56f8d8a52d261c81cbe427def724401e534d58e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Fri, 9 Sep 2022 16:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80(=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5):=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/config.js                   |   5 +-
 src/assets/images/zjsj/zjsj_admin.png | Bin 2135 -> 361 bytes
 src/assets/images/zjsj/zjsj_pass.png  | Bin 2274 -> 383 bytes
 src/assets/js/http.js                 |   4 +-
 src/components/account.vue            |   2 +-
 src/views/home/login_v1.vue           | 164 ++++++++++++++++++++++++--
 6 files changed, 161 insertions(+), 14 deletions(-)

diff --git a/public/js/config.js b/public/js/config.js
index 047a789e..d029d378 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -11,12 +11,13 @@ var COMPANY = ''; //通用
 
 
 var PROJECT = {
-    local_test: '', // 普通版
+    local_test: 'common', // 普通版
     online_hq: 'hengqin', // 横琴
+    online_zjsj: 'zjsj', // 中建四局
 }
 
 
-var PROJECT_TYPE = PROJECT.local_test
+var PROJECT_TYPE = PROJECT.online_zjsj
 
 var headerShow = true; // 是否显示头部
 var tabsShow = true;  // 是否显示tabs
diff --git a/src/assets/images/zjsj/zjsj_admin.png b/src/assets/images/zjsj/zjsj_admin.png
index e2b512637c63c948aa5f6f59d04d1150720d7ca1..5292f63106a9ea75575988ee4d968c12265afeaa 100644
GIT binary patch
literal 361
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#f1WOmAr*{Ur!?|5Iq<mJ`#s>;-q^<=e1dHQ
zW8MPg9gR5$I9{;qV9a5Vz7pnfp!<O6Lsk0;0l(IlUuQBFxHzvgQS^%P`|@cA?F*VF
zgkCmD*IDTOuIrqOSNc@0=Bk|CWy*4Prw`1vJ-wGJ&eyNXOGC@xLb3_lYQwYuNB^aU
z6;9_5TTZ(5Zf>@LG&Ap#>@C{U96m30+NUcm$}Ify)s%hhu_t$3yp(v{{@5B9!TB4M
zraM^Pxf7LXBKSV~<ILEp=04~8nf6<6O5A(lerc!WqPdP{LgE$kuHRVgnQ3ceUFq}s
zF+Z<Y)ciliY;%MAaye4Oj^5}C;NiQ`H#tWz(fOXrwJV$}ZwOidLxRE6)z4*}Q$iB}
D%C?AL

literal 2135
zcmcIlYfKbZ7#$u8)sohlSg}DS1GZI|od^4zvPIZM*uqd)u~LnNdE8|u?Cz{H1G|uF
z)v7^_EjDf0sMw|!tJ3%&My<w(#z)m?UtmEawKlcJHdR9jea7B_Wi^c&{&bVwxpVKi
z=R4=S-~Dz?d0A1)glQ8H1W9ofJKgY^0l#SSc=#J(j}5`cW5MEARRl4>1w%$$xIM1{
zLB<V9l~r05TgnKs-@u774-8>{5TX$zH!mFIggT(1JgAidcI?*SqZlfQc5J?hCE1_@
zc%|Yd1<Y+Ks}!2*1e=KEy@=+98A#v<8i$7czJSVv?bt9c1IPL_fuX|?t<H|+>jBX!
zwj6cH3P4Q;GcHg@D{8SBD6^5wF=wMRN!bX}N>DjCNin3EF<H>)2ZPZR(Zjf%bE2`}
zn;r9NT96@#P$*;w<rrk8mY{4l$Uze{jY9;kHU=~<j0e<=Q3fYa1w{&Kk{m#FMvj;3
zH9H2Cj#%&qW3&M^nkJYqBFqH|%0TLtMu9B*XsF*GL#tY01B?>Y`#@r~vM~q<H&Eqz
zMF52jAfRQ81`~zY-eA4r8+IxR1n>brgsD&%6$=&g%9^Zt<%jr)Eyvsh8HWNmO;##p
z**AJn<)bVp4PB$pvz#CWbl#b|rsx*n<TPN%XcA_dwBe++lC&|Dkuh1bNGn5<BTyDr
zg2-vy*ub(Vc^bz8Wm(1*P&F<f0GHE_K~V-t5*c2!@D$)l+{%eI+(`2_oTrQwPSX~F
z63n7#;c|v`!TnBIsMiyy?;j~#Q5GOaEJx6cNLgsoiqkeLkMmX|iE}o}jN5oXn>-dP
zX`;a>+slds?+)j?pH){SLPk;KdBI{d<GjZMpemR!o~Jq7>apgSIEuEKc$h6wU_7$o
z=U}Bsey$b}!9XpB-c#d{eX_#JBFs7TaBtq_aFi>uNAkf1)m>D8x(Xd;%4Rm>w1LtK
zAIgAsizOAFa%1!=%>|32BcFs0*C)dX`n9lQf?f|m#G=#E1JXP;LnE{yFMy<vsFD$w
zDtojLr-1xgcqC(}L*ilbRj%RD;>T7a|Eu_DY6UMBs0Fak5}0m>&^yw|!4UsFv*ES-
zy4NTiwnTjx>&5UT*3CfxQY)}mFUwhS2|?n=yPWxzRjbZl%x`8Zrgq)Ad-(VY<K#I7
z=Xs~=>xJG^1ykFd8{W(8eBV8#`DAwQtasM8XK!D#H*NK*jh!vy)-|47vHB@{=Z9y$
zyVk#>NWIlKbm6PPo{rF87i>eJvZ2ibrpj3-kUi<W6OGHKUw!(^@mu1zb}hNOa7RTC
zeRS#Iwm<uV`?}YGQ$#{)`6q{F|D86}o%!rG%O<Jk;4_m4YNogJStli^x$(~WIal1j
z?aI8pgh;&5dfEHgUc@@L8(o<if3fH|;!Bz`|D^A&<hZIN-{&Q($*dn1R3-Y(!cob!
z1;~waB`eA53<uJGeMUiKXmQ%>Nw57l!x5?NDs`4ljO<+7n3DT;b1LzY`SI2#Us$##
zxkakUx=roQ_X1=KasaC-o07lGJ>$ghxxcn=2=rI%KX_<SoMQg@a`W=kiqqZm`UWP|
zcTPO9oq2aK)x4<h`<;=cgB7Q*rguBi{@B(uudTd#C((JgmF+m**YH#6xul--o2xn_
zZ8r~ZPR)Dei4Oa?$*%5iuD9+8UB7Ah_F{iRZsw8hwI8uf8}}D~vGs$l2{jpeQmWE!
zypd*|w{KHJN44S^Ag;Ol&whHwb10kK+PfH;`exn}N9s(okpOa}Eh2Osn}#BF%d=Yg
z*^=d!kJGE$s0dPYHzB!eS7Pt{1K2u`<DbOr-3#MOpX(B@tj)f3G_K_iI3TZ|`HTM7
N?<y>F?kcER@h<|D>TCc2

diff --git a/src/assets/images/zjsj/zjsj_pass.png b/src/assets/images/zjsj/zjsj_pass.png
index 86492fd5b09d51afefa92be260c4832ca208cb1a..3ac1a9223d6cd4a61ea279bd050c5c0643b92bdf 100644
GIT binary patch
literal 383
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O(ABAzaeAr*{Ur*#W98Su0Pi(e4D;ox?F_XdM`
z1Md;u0wx(p^#s<r409dKI#wQ-xq2Ggy1(!0`kHNS9SLEOQAl!H<*8d&IZ-OeuPcGm
zIYF+Zt68^i6U%iz)#@t~^OpQB*spqYNyp6>->sL1us2OD*1B{oX}5V<WHa~Sg(5fH
zo&DV=X+EAIX{OMU!@V#0Uta2sPeCz`=Vsn@59YMEd^Sm<H`ZJDNAs&`e9e!$+otp$
zEaq`v_~KI2MT!0rD@LzgPw`8_zdZe1;|{IemLZe%!#bgUqS^_a?$t4Um*%hBWOLu)
zfY8h2qmhd&eXj|x{&7gf?x4D5MN_0|RMWl2A6H@yIICMYS@_M@{`P+@@2|u^OFT>7
Zm`kzV;MiR&_y8DQ44$rjF6*2UngDL@l<@!n

literal 2274
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
E53kc3Z2$lO

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 34650fea..e8ba52ad 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -41,9 +41,9 @@ if (process.env.NODE_ENV == 'development') {
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
+  axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  axios.defaults.baseURL = 'http://192.168.34.216:18070/'   // 邱平毅本地
+  // axios.defaults.baseURL = 'http://192.168.34.216:18070/'   // 邱平毅本地
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://139.9.66.234:8/';
diff --git a/src/components/account.vue b/src/components/account.vue
index 2b01a7d7..034a3283 100644
--- a/src/components/account.vue
+++ b/src/components/account.vue
@@ -15,7 +15,7 @@
           <div style="margin-left:10px">
             <p>{{ $store.state.userInfo.companyName }}</p>
             <!-- 横琴和鹤洲不需要客服电话-->
-            <p v-if="projectType != 'hengqin'">客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
+            <p v-if="projectType == 'common' || projectType=='zjsj'">客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
             <p
               v-if="projectType == 'hengqin' && $store.state.currentProDetail != null "
             >入场码：{{$store.state.currentProDetail.placeCode}}</p>
diff --git a/src/views/home/login_v1.vue b/src/views/home/login_v1.vue
index 2a47ff50..19744de3 100644
--- a/src/views/home/login_v1.vue
+++ b/src/views/home/login_v1.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 登录 -->
   <div >
-    <div class="login" v-if="show">
+    <div class="login" v-if="projectType == 'common'">
       <div class="title flex">
       <div class="title_l flex2">
         <img v-if="systemInfo.loginLogo" :src="systemInfo.loginLogo" class="logo" />
@@ -117,11 +117,43 @@
       </div>
     </div>
     </div>
-    <div class="zjsjLogin" v-else>
+    <div class="zjsjLogin" v-if="projectType == 'zjsj'">
       <div class="zjsjcontent">
         <img class="contentBGI" src="../../assets/images/zjsj/zjsj_loginBgc.jpg" alt="" />
+        <div class="leftContent">
+          <div class="title_r">
+        <el-button type="primary" plain size="small" class="backBtn" @click="goBackBtn">返回到首页</el-button>
+      </div>
+          <!-- <img src="../../assets/images/zjsj/zjsj_logo.png" /> -->
+          <div class="logoImg"></div>
+          <div class="btnContent">
+            <div class="minBox">
+          <el-form :model="form" :rules="rules" ref="form" label-width="0px">
+            <el-form-item label="" prop="account">
+              <div class="row1">
+              <el-input prefix-icon=" " v-model="form.account" placeholder="请输入帐号"></el-input>
+            </div>
+            </el-form-item>
+            <el-form-item style="margin-top: 39px" label="" prop="password">
+              <div class="row2">
+              <el-input prefix-icon=" " v-model="form.password" type="password" show-password placeholder="请输入密码"></el-input>
+            </div>
+            </el-form-item>
+          </el-form>
+            <div>
+              <el-button class="loginBtn" @click="loginFn">登录</el-button>
+            </div>
+            <div class="about">
+              <el-radio v-model="radio" label="1">记住登录密码</el-radio>
+              <span>忘记密码？</span>
+            </div>
+            <div>
+              <el-button class="registerBtn">注册账户</el-button>
+            </div>
+            </div>
+          </div>
+        </div>
       </div>
-      
       <div>
       </div>
     </div>
@@ -141,7 +173,10 @@ export default {
   components: { getcode },
   data() {
     return {
-      show:true,
+      show:false,
+      input:'',
+      radio:'',
+      projectType:'',
       LOGO: LOGO,
       loginType: 1,
       automaticLogin: false,
@@ -206,6 +241,7 @@ export default {
   },
   created() {
     this.company = COMPANY
+    this.projectType = PROJECT_TYPE;
   },
   mounted() {
     delete this.$http.defaults.headers.common['Authorization']
@@ -425,14 +461,124 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+  ::v-deep .el-input__inner {
+	border-top-width: 0px;
+	border-left-width: 0px;
+	border-right-width: 0px;
+	border-bottom-width: 1px;
+  border-radius:0% ;
+  background-color: rgba(2, 38, 64,0.1);
+  color: #ffffff;
+  font-size: 14px;
+}
+::v-deep ::-webkit-input-placeholder{
+  color: #eeeeee;
+  -webkit-text-fill-color: #eeeeee;
+}
+// 在使用浏览器保存的数据时 输入框的样式
+::v-deep input:-webkit-autofill , textarea:-webkit-autofill, select:-webkit-autofill {
+    // 字体颜色
+    -webkit-text-fill-color: #eeeeee;
+    // 背景颜色
+    background-color: rgba(2, 38, 64,0);
+    //设置input输入框的背景颜色为透明色
+    transition: background-color 50000s ease-in-out 0s;  
+  }
+::v-deep .el-radio{
+  color:#27e1f0;
+}
+::v-deep .el-radio__inner {
+  border-radius: 0%;
+  background-color: rgba(2, 38, 64,0);
+  border-color: #27e1f0;
+}
+::v-deep .el-radio__label {
+  padding-left:5px
+}
   .zjsjLogin{
     width: 100%;
     height: 100%;
-   .contentBGI{
-    width: 100%;
-    height:100%;
-   }
-    
+    .zjsjcontent{
+      width: 100%;
+      height:100%;
+      position: relative;
+      .contentBGI{
+        width: 100%;
+        height: 100%;
+      }
+      .leftContent{
+      position: absolute;
+      top: 20%;
+      left:9%;
+      width: 32%;
+      .logoImg{
+        height: 100px;
+        background-image: url('../../assets/images/zjsj/zjsj_logo.png');
+        background-size: 80%;
+        background-repeat: no-repeat;
+      }
+      .btnContent{
+        margin-top: 5%;
+        height: 575px;
+        background-image: url("../../assets/images/zjsj/zjsj_loginInpt.png");
+        background-size: 80%;
+        background-repeat: no-repeat;
+        .minBox{
+          box-sizing: border-box;
+          padding-left: 15%;
+          .img{
+            display: inline-block;
+          }
+          .row1,.row2{
+            width: 57%;
+            position: relative;
+          .text{
+            color: #eeeeee;
+            font-size: 14px;
+          }
+         }
+         .row1{
+          padding-top: 15%;
+        }
+         .row1::before{
+          content: url("../../assets/images/zjsj/zjsj_admin.png");
+          top: 70%;
+          left: 0%;
+          position: absolute;
+         }
+         .row2::before{
+          content: url("../../assets/images/zjsj/zjsj_pass.png");
+          top: 10%;
+          left:0%;
+          position: absolute;
+         }
+        
+        .loginBtn{
+          width: 300px;
+          color: #eeeeee;
+          background-color: #27e1f0;
+          border-color: #27e1f0;
+        }
+        .registerBtn{
+          width: 300px;
+          margin-top: 3%;
+          color: #696969;
+          background-color: #eeeeee;
+          border-color: #eeeeee;
+        }
+        .about{
+          margin-top: 3%;
+          color:#27e1f0;
+          font-size: 12px;
+          span{
+            margin-left: 21%;
+          }
+        }
+        }
+        
+      }
+    }
+  }
   }
 .flex {
   display: flex;