dedsudiyu 9 meses atrás
pai
commit
1585f0b266
2 arquivos alterados com 100 adições e 93 exclusões
  1. 8 2
      .env.production
  2. 92 91
      src/views/basicsModules/login.vue

+ 8 - 2
.env.production

@@ -22,8 +22,11 @@ VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 
 # ####################外网接口配置####################
 
+# 现场
+VUE_APP_BASE_API = '172.16.0.65/api'
+
 # 1.8外网地址
-VUE_APP_BASE_API = 'lab.zjznai.com/labTest'
+# VUE_APP_BASE_API = 'lab.zjznai.com/labTest'
 
 # 43外网地址
 # VUE_APP_BASE_API = 'lab.zjznai.com/labapp'
@@ -33,8 +36,11 @@ VUE_APP_BASE_API = 'lab.zjznai.com/labTest'
 
 # ####################内网接口配置####################
 
+# 现场
+VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
+
 # 1.8内网地址
-VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
+# VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 
 # 43内网地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.43/api'

+ 92 - 91
src/views/basicsModules/login.vue

@@ -6,7 +6,8 @@
         <img class="title-img" src="@/assets/ZDimages/basicsModules/title_icon.png">
       </div>
     </div>
-    <div v-if="loginBoxType == 1" class="form-box">
+    <!--<div v-if="loginBoxType == 1" class="form-box">-->
+    <div class="form-box">
       <p class="form-title-p">登录</p>
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
         <div class="username-input-box" :class="userTypeCode == 1||userTypeCode == 4?'username-input-box-code':''">
@@ -49,98 +50,98 @@
         </el-form-item>
       </el-form>
     </div>
-    <div v-if="loginBoxType == 2" class="form-box-one">
-      <div class="form-title-box">
-        <p class="form-title-null"></p>
-        <p class="form-title-p" :class="loginType==1?'form-title-p-color':''" @click="loginTypeClick(1)">密码登录</p>
-        <p class="form-title-p" :class="loginType==2?'form-title-p-color':''" @click="loginTypeClick(2)">短信登录</p>
-        <p class="form-title-null"></p>
-      </div>
-      <el-form ref="loginForm"v-show="loginType == 1"
-               :model="loginForm" :rules="loginRules" class="login-form-one">
-        <div class="username-input-box" :class="userTypeCode == 1||userTypeCode == 4?'username-input-box-code':''">
-          <img src="@/assets/ZDimages/basicsModules/icon_dl_zh.png" alt="">
-          <input type="text" v-model="loginForm.username" placeholder="请输入账号" maxlength="20" @keyup.enter="handleLogin(1)">
-        </div>
-        <div class="password-input-box" :class="userTypeCode == 2||userTypeCode == 4?'username-input-box-code':''">
-          <img src="@/assets/ZDimages/basicsModules/icon_dl_mm.png" alt="">
-          <input type="password" v-model="loginForm.password" placeholder="请输入密码" maxlength="20" autocomplete="new-password" @keyup.enter="handleLogin(1)">
-        </div>
-        <p class="text-p">{{text}}</p>
-        <div class="code-input-box">
-          <div class="code-input-left-box" :class="userTypeCode == 3||userTypeCode == 5?'username-input-box-code':''">
-            <img src="@/assets/ZDimages/basicsModules/icon_dl_yzm.png" alt="">
-            <input type="text" v-model="loginForm.code" placeholder="请输入验证码" maxlength="4" @keyup.enter="handleLogin(1)">
-          </div>
-          <div class="login-code">
-            <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-          </div>
-        </div>
-        <el-form-item>
-          <el-button
-            class="form-button-p"
-            :loading="loading"
-            size="medium"
-            height="50"
-            @click.native.prevent="handleLogin(1)"
-          >
-            <span v-if="!loading">登 录</span>
-            <span v-else>登 录 中...</span>
-          </el-button>
-          <div class="forgotPasswordBox">
-            <p class="forgotPasswordNull"></p>
-            <p class="forgotPassword">忘记密码</p>
-            <p class="forgotPasswordNull"></p>
-          </div>
-          <!--<div style="float: right;" v-if="register">-->
-            <!--<router-link class="link-type" :to="'/register'">立即注册</router-link>-->
+    <!--<div v-if="loginBoxType == 2" class="form-box-one">-->
+      <!--<div class="form-title-box">-->
+        <!--<p class="form-title-null"></p>-->
+        <!--<p class="form-title-p" :class="loginType==1?'form-title-p-color':''" @click="loginTypeClick(1)">密码登录</p>-->
+        <!--<p class="form-title-p" :class="loginType==2?'form-title-p-color':''" @click="loginTypeClick(2)">短信登录</p>-->
+        <!--<p class="form-title-null"></p>-->
+      <!--</div>-->
+      <!--<el-form ref="loginForm"v-show="loginType == 1"-->
+               <!--:model="loginForm" :rules="loginRules" class="login-form-one">-->
+        <!--<div class="username-input-box" :class="userTypeCode == 1||userTypeCode == 4?'username-input-box-code':''">-->
+          <!--<img src="@/assets/ZDimages/basicsModules/icon_dl_zh.png" alt="">-->
+          <!--<input type="text" v-model="loginForm.username" placeholder="请输入账号" maxlength="20" @keyup.enter="handleLogin(1)">-->
+        <!--</div>-->
+        <!--<div class="password-input-box" :class="userTypeCode == 2||userTypeCode == 4?'username-input-box-code':''">-->
+          <!--<img src="@/assets/ZDimages/basicsModules/icon_dl_mm.png" alt="">-->
+          <!--<input type="password" v-model="loginForm.password" placeholder="请输入密码" maxlength="20" autocomplete="new-password" @keyup.enter="handleLogin(1)">-->
+        <!--</div>-->
+        <!--<p class="text-p">{{text}}</p>-->
+        <!--<div class="code-input-box">-->
+          <!--<div class="code-input-left-box" :class="userTypeCode == 3||userTypeCode == 5?'username-input-box-code':''">-->
+            <!--<img src="@/assets/ZDimages/basicsModules/icon_dl_yzm.png" alt="">-->
+            <!--<input type="text" v-model="loginForm.code" placeholder="请输入验证码" maxlength="4" @keyup.enter="handleLogin(1)">-->
           <!--</div>-->
-        </el-form-item>
-      </el-form>
-      <el-form ref="loginFormTwo" v-show="loginType == 2"
-               :model="loginFormTwo" :rules="loginRulesTwo" class="login-form-two">
-        <div class="username-input-box">
-          <img src="@/assets/ZDimages/basicsModules/user.png" alt="">
-          <p>
-            <span>+86</span>
-            <span>丨</span>
-          </p>
-          <input type="text" v-model="loginFormTwo.username" placeholder="请输入联系方式"
-                 onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"
-                 maxlength="11">
-        </div>
-        <p class="text-p">{{textTwo}}</p>
-        <div class="code-input-box">
-          <div class="code-input-left-box">
-            <img src="@/assets/ZDimages/basicsModules/code.png" alt="">
-            <input type="text" v-model="loginFormTwo.password" placeholder="请输入验证码"
-                   onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"
-                   maxlength="6">
-          </div>
-          <div class="login-code" :class="codeNum>0?'login-code-one':'login-code-two'" @click="getCodeOne">
-            获取验证码 {{codeNum>0?'('+codeNum+')':''}}
+          <!--<div class="login-code">-->
             <!--<img :src="codeUrl" @click="getCode" class="login-code-img"/>-->
-          </div>
-        </div>
-        <el-form-item>
-          <el-button
-            class="form-button-p"
-            :loading="loading"
-            size="medium"
-            height="50"
-            @click.native.prevent="handleLogin(2)"
-          >
-            <span v-if="!loading">登 录</span>
-            <span v-else>登 录 中...</span>
-          </el-button>
-          <div class="forgotPasswordBox">
-            <p class="forgotPasswordNull"></p>
-            <p class="forgotPassword">忘记密码</p>
-            <p class="forgotPasswordNull"></p>
-          </div>
-        </el-form-item>
-      </el-form>
-    </div>
+          <!--</div>-->
+        <!--</div>-->
+        <!--<el-form-item>-->
+          <!--<el-button-->
+            <!--class="form-button-p"-->
+            <!--:loading="loading"-->
+            <!--size="medium"-->
+            <!--height="50"-->
+            <!--@click.native.prevent="handleLogin(1)"-->
+          <!--&gt;-->
+            <!--<span v-if="!loading">登 录</span>-->
+            <!--<span v-else>登 录 中...</span>-->
+          <!--</el-button>-->
+          <!--<div class="forgotPasswordBox">-->
+            <!--<p class="forgotPasswordNull"></p>-->
+            <!--<p class="forgotPassword">忘记密码</p>-->
+            <!--<p class="forgotPasswordNull"></p>-->
+          <!--</div>-->
+          <!--&lt;!&ndash;<div style="float: right;" v-if="register">&ndash;&gt;-->
+            <!--&lt;!&ndash;<router-link class="link-type" :to="'/register'">立即注册</router-link>&ndash;&gt;-->
+          <!--&lt;!&ndash;</div>&ndash;&gt;-->
+        <!--</el-form-item>-->
+      <!--</el-form>-->
+      <!--<el-form ref="loginFormTwo" v-show="loginType == 2"-->
+               <!--:model="loginFormTwo" :rules="loginRulesTwo" class="login-form-two">-->
+        <!--<div class="username-input-box">-->
+          <!--<img src="@/assets/ZDimages/basicsModules/user.png" alt="">-->
+          <!--<p>-->
+            <!--<span>+86</span>-->
+            <!--<span>丨</span>-->
+          <!--</p>-->
+          <!--<input type="text" v-model="loginFormTwo.username" placeholder="请输入联系方式"-->
+                 <!--onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"-->
+                 <!--maxlength="11">-->
+        <!--</div>-->
+        <!--<p class="text-p">{{textTwo}}</p>-->
+        <!--<div class="code-input-box">-->
+          <!--<div class="code-input-left-box">-->
+            <!--<img src="@/assets/ZDimages/basicsModules/code.png" alt="">-->
+            <!--<input type="text" v-model="loginFormTwo.password" placeholder="请输入验证码"-->
+                   <!--onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"-->
+                   <!--maxlength="6">-->
+          <!--</div>-->
+          <!--<div class="login-code" :class="codeNum>0?'login-code-one':'login-code-two'" @click="getCodeOne">-->
+            <!--获取验证码 {{codeNum>0?'('+codeNum+')':''}}-->
+            <!--&lt;!&ndash;<img :src="codeUrl" @click="getCode" class="login-code-img"/>&ndash;&gt;-->
+          <!--</div>-->
+        <!--</div>-->
+        <!--<el-form-item>-->
+          <!--<el-button-->
+            <!--class="form-button-p"-->
+            <!--:loading="loading"-->
+            <!--size="medium"-->
+            <!--height="50"-->
+            <!--@click.native.prevent="handleLogin(2)"-->
+          <!--&gt;-->
+            <!--<span v-if="!loading">登 录</span>-->
+            <!--<span v-else>登 录 中...</span>-->
+          <!--</el-button>-->
+          <!--<div class="forgotPasswordBox">-->
+            <!--<p class="forgotPasswordNull"></p>-->
+            <!--<p class="forgotPassword">忘记密码</p>-->
+            <!--<p class="forgotPasswordNull"></p>-->
+          <!--</div>-->
+        <!--</el-form-item>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <p class="introduction-p">技术支持:江苏忠江智能科技有限公司</p>
   </div>
 </template>