From dec639127e37bc1b25eab22adefdc329dd89c118 Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Tue, 25 Oct 2022 11:35:55 +0800
Subject: [PATCH] gx

---
 src/main.js                           |  4 ++--
 src/pages/Login/Login.vue             | 16 +++++++++-------
 src/pages/improveData/improveData.vue |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main.js b/src/main.js
index cb91536..543b3ba 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,5 +26,5 @@ app.$mount()
 import http from "@/request/index.js"
 Vue.prototype.http=http
 
-Vue.prototype.socketUrl = "ws://61.130.44.231/webSocket"
-// Vue.prototype.socketUrl = "ws://yxx.ydool.net/webSocket"
\ No newline at end of file
+Vue.prototype.socketUrl = "wss://61.130.44.231/webSocket"
+// Vue.prototype.socketUrl = "wss://yxx.ydool.net/webSocket"
\ No newline at end of file
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index 92f10ab..3b33b52 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -14,6 +14,7 @@
                     <view :class="tab == 0?'choosed':'unchoosed'" @click="pwdLog()">
                         密码登录
                     </view>
+					<view class="whiteBox"></view>
                     <view :class="tab == 1?'choosed':'unchoosed'" @click="codeLog()">
                         验证码登录
                     </view>
@@ -33,12 +34,12 @@
                     <u-input placeholder="请输入验证码" border="bottom" clearable v-model="userInfo.code">
                         <template slot="suffix">
                             <u-code ref="uCode" @change="codeChange" seconds="60" changeText="X秒重新获取"></u-code>
-                            <u-button @click="getCode" :text="tips" :hairline="false" plain style="border: 0px;">
+                            <u-button @click="getCode" :text="tips" :hairline="false" plain style="border: 0px; height: 21px;">
                             </u-button>
                         </template>
                     </u-input>
                 </u-form-item>
-                <u-button text="登录" size="large" throttleTime=1000 color="#99241B" style="margin-top: 84rpx;"
+                <u-button text="登录" size="large" throttleTime=1000 color="#99241B" style="margin-top: 84rpx; height: 40px;"
                     @click="login()">
                 </u-button>
                 <view class="other_op">
@@ -210,22 +211,23 @@
         .tab_op {
             height: 60rpx;
             width: 100%;
-            height: 60rpx;
             overflow: hidden;
             font-size: 16px;
             font-weight: 600;
 
             .choosed {
-                width: 200rpx;
-                text-align: center;
                 color: #99241B;
                 float: left;
                 font-size: 17px;
             }
+			
+			.whiteBox{
+				width: 60rpx;
+				height: 60rpx;
+				float: left;
+			}
 
             .unchoosed {
-                width: 200rpx;
-                text-align: center;
                 color: #32333B;
                 float: left;
             }
diff --git a/src/pages/improveData/improveData.vue b/src/pages/improveData/improveData.vue
index 4454cd8..70f5859 100644
--- a/src/pages/improveData/improveData.vue
+++ b/src/pages/improveData/improveData.vue
@@ -383,7 +383,7 @@
                 honorList: [''],
                 StandradList: [''],
                 peopleSkillColums: [
-                    ["天才", "卓越", "平平"]
+                    ["无", "乡镇人才", "县级人才", "乡镇人才", "市级人才", "省级人才", "国家级人才"]
                 ],
                 Zucolumns: [
                     ["汉族", "朝鲜族"],