处理首页登录样式和功能处理

imcs-ui/.env.development

@@ -32,3 +32,5 @@ VUE_APP_CLIENT_SECRET=zuihou_ui_secret
 # Detail:  https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+VUE_APP_ZONE_LINE = 1

imcs-ui/.env.production

@@ -2,25 +2,27 @@
 ENV = 'production'
 
 # webSocket的推送URL
-VUE_APP_WS_URL = 'ws://192.168.1.201:8764/ws/'
+VUE_APP_WS_URL = 'ws://192.168.170.122:8764/ws/'
 
 VUE_APP_PROJECT_NAME = 'imcs-ui'
 # 开发环境请求域名前缀， 该变量仅仅开发环境需要设置
-VUE_APP_DEV_REQUEST_DOMAIN_PREFIX = 'http://localhost:80'
+VUE_APP_DEV_REQUEST_DOMAIN_PREFIX = 'http://192.168.170.122/'
 # 请求域名前缀， 该变量仅仅生产环境需要设置
-VUE_APP_PROD_REQUEST_DOMAIN_PREFIX = 'http://localhost:80'
+VUE_APP_PROD_REQUEST_DOMAIN_PREFIX = 'http://192.168.170.122/'
 # 本地打包测试需要，
-// VUE_APP_PROD_REQUEST_DOMAIN_LOCAL = 'http://localhost:8764'
+VUE_APP_PROD_REQUEST_DOMAIN_LOCAL = 'http://localhost:8764'
 
 # base api
 VUE_APP_BASE_API = '/api'
 # 是否启用多租户
 VUE_APP_IS_MULTI_TENANT = true
-# 是否启用验证码
-VUE_APP_IS_CAPTCHA = true
+
 # 客户端秘钥
 VUE_APP_CLIENT_ID=zuihou_ui
 VUE_APP_CLIENT_SECRET=zuihou_ui_secret
 
 # 是否启用验证码
 VUE_APP_IS_CAPTCHA = true
+
+# 产线默认设定
+VUE_APP_ZONE_LINE = 2

imcs-ui/src/views/login/index.vue

@@ -2,9 +2,9 @@
   <div class="login-container">
     <div class="login-info">
     	<img :src="require(`@/assets/logo/logo1.png`)"/>
-    	<div>
-	    	<div class="title">{{$t('login.shuoming.title')}}</div>
-	      <div class="title">{{$t('login.shuoming.tips')}}</div>
+    	<div>               
+	    	<div class="title">{{ this.zoneNo === '1'? $t('login.shuoming.title'): $t('login.shuoming'+ this.zoneNo +'.title') }}</div>
+	      <div class="title">{{ this.zoneNo === '1'? $t('login.shuoming.tips'): $t('login.shuoming'+ this.zoneNo +'.tips')}}</div>
       </div>
     </div>
     <el-form
@@ -40,7 +40,7 @@
 		    <el-tab-pane label="密码登录" name="second">
 		      <div class="title-container">
 		        <h3 class="title">{{$t('login.title')}}</h3>
-		        <lang-select class="set-language"/>
+		        <lang-select v-show="false" class="set-language"/>
 		      </div>
 		      <span v-if="login.type === 'up'">
 		        <el-form-item prop="tenant" v-show="isMultiTenant">
@@ -105,14 +105,13 @@
 		          @click.native.prevent="handleLogin"
 		          style="width:100%;margin-bottom:14px;"
 		          type="primary"
-		        >{{ $t("login.logIn") }}</el-button
-		        >
+		        >{{ $t("login.logIn") }}</el-button>
 		      </span>
 		      <span v-if="login.type === 'social'">
 		        {{ $t("login.chooseToSignIn") }}
 		        <div>
-		          <template v-for="(l, index) in logo">
-		            <div :key="index" class="logo-wrapper">
+		          <template>
+		            <div v-for="(l, index) in logo" :key="index" class="logo-wrapper">
 		              <img
 		                :class="{ radius: l.radius }"
 		                :src="resolveLogo(l.img)"
@@ -186,8 +185,7 @@
 		              @click.native.prevent="signLogin"
 		              style="width:100%;margin-bottom:14px;"
 		              type="primary"
-		            >{{ $t("common.signLogin") }}</el-button
-		            >
+		            >{{ $t("common.signLogin") }}</el-button>
 		          </el-tab-pane>
 		        </el-tabs>
 		      </span>
@@ -215,7 +213,7 @@
     </el-form>
     <span class="login-footer">
       © 2019 - 2022
-      <span>{{$t('login.shuoming2.tips')}}</span>
+      <span>{{ this.zoneNo === '1'?$t('login.shuoming.tips'): $t('login.shuoming'+ this.zoneNo +'.tips')}}</span>
     </span>
   </div>
 </template>
@@ -241,8 +239,8 @@
         //是否启用多租户
         isMultiTenant:
          false,
-        isCaptcha:
-          process.env.VUE_APP_IS_CAPTCHA === "true" ? true : false,
+        isCaptcha: process.env.VUE_APP_IS_CAPTCHA === "true" ? true : false,
+        zoneNo: process.env.VUE_APP_ZONE_LINE, 
         tabActiveName: "bindLogin",
         login: {
           type: "up"
@@ -269,6 +267,7 @@
           signPassword: "",
           qcodeUser: "",
           stationResourceId: "",
+          zoneType: process.env.VUE_APP_ZONE_LINE
         },
         rules: {
           account: {
@@ -349,7 +348,7 @@
       this.getStations()
     },
     mounted() {
-      db.clear();
+      db.clear();      
       this.getCodeImage();
       this.$nextTick(
         window.onload = function () { // 光标默认位置
@@ -375,8 +374,7 @@
               )
           }
         console.log(tab, event);
-      },
-
+      },      
       getCodeImage() {
         loginApi
           .getCaptcha(this.loginForm.key)
@@ -669,9 +667,14 @@
 	}
 </style>
 <style lang="scss" scoped>
-  $bg: #2d3a4b;
-  $dark_gray: #aaa;
-  $light_gray: #eee;
+  $bg1_color: #000;
+  $bg1_formbg: #4F535B;
+   
+  $bg2_color:  #4E6BBD;
+  $bg2_formbg: #2F4187;
+    
+  $bg3_color:  #375F92;
+  $bg3_formbg: #406EA4;  
 
   .login-container {
   	/*background: url(../../assets/logo/loginBg.gif) 50% no-repeat;
@@ -680,7 +683,7 @@
    	/*background: url(../../assets/logo/logoBg1.jpg) 50% no-repeat;*/
    	/*background: url(../../assets/logo/logoBg2.png) 50% no-repeat;
     background-size: cover;*/
-   	background: #000000;
+   	background: $bg1_color;
 
     width: 100%;
     height: 100vh;
@@ -728,7 +731,7 @@
       width: 320px;
       height: 440px;
       padding: 10px 36px 36px 36px;
-      background: #4F535B;
+      background: $bg1_formbg;
       border-radius: 3px;
 
 			.el-tabs__item {