From 942683ff5b1554202cbd1bd60b76f4bf9c99221b Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Mon, 22 Jun 2020 19:13:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/imgs/login_eye.png     | Bin 0 -> 1250 bytes
 src/assets/imgs/login_eye_dis.png | Bin 0 -> 1157 bytes
 src/pages/user/user_info.vue      | 122 ++++++++++++++++++++++++------
 src/request/api/authority.js      |   8 +-
 4 files changed, 107 insertions(+), 23 deletions(-)
 create mode 100644 src/assets/imgs/login_eye.png
 create mode 100644 src/assets/imgs/login_eye_dis.png

diff --git a/src/assets/imgs/login_eye.png b/src/assets/imgs/login_eye.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e65d6bacfc0dacb4def35316e5e50c3a64885eb
GIT binary patch
literal 1250
zcmeAS@N?(olHy`uVBq!ia0vp^!a&T&!3HGHN~m`NDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49seoArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XQrEMXkw~hZmDNz
zW^7_<siR<IU}&LlV4-hltZQgyWny4uWTXHEN<iC+Qqrt~T-=~`0eQAc86_nJR{Hwo
z<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mX=fTvCgZi!uvJGV}8kKqe+8
z<(HP&Dgj*z@j`9^+}ONgXfOc-Our(rK;KZ$0OTc@LSJ9}N^^7Js*6j4QW5UOYH)E#
zWkITbP-=00X;CsT;?k5sRuxz|7o{ea<QIkH=jXseF(4zqB)>Q#zd*s+85C-k3L4>=
zc`5nj#hPF}zP?tTdBr7(dC94sF1AWQQ}i-3Q>;vkoQ)lgos1pL3@i){T^$`wjomEV
z3=LddOw64OO&wu+UGkGlb5rw5V0u#!dQEWZ1to{v0-((<sYRJ(sVQzn`MC;UZ(C*J
zc8eiS^PqZDaJ$6_r(S)aWAs6hixk-~Az%suG2uxU$bl#R)I4B{F9IfQMum6l7#J9X
zJY5_^DsIiWtmxtFD0BSd^9ihxGGbf(TG+b+yU!Y3P}rmtVXhuwsv#k=_=H)`woZvH
zJS@!;Cfv-0M;C})G%@6vQ}_Q<b%D%#-Y*Xh7ykeM`~Jq;|9|zJU)MaturKwDLOWy4
zqE>C0hv)QPeZQt`aUkXl<F<z_YaYt1uIRd*<0YRm_lB+Chn_^8Bp*xbf~e2EtU+Ea
zJ3g4*3aDY9KFj&&;)$WL61mfkX&Rk#7k#s+r`#q>Pdlz~-`N#*xwEGlyi(bH!%gn@
zIYr5}pHG#~m0GQTGtKq=qPOzZu8JM<tWTrk_RQd#bo{&g<Nf7fpOdbIH?L5?a%JlI
z%8#>h!;UtWA5fEewRqd3+_loDcJDv+YW1~rS)B*hcD@nalfd6Dap@QL>r?KJoxjdq
zkvV(D*ICzoWvz6-e5)e(ve{qpgjk!Gw(8n<ymsuKcV06f>EC|-zwQl;4EMML(yCQ%
QmV!zhPgg&ebxsLQ0D9uStN;K2

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/login_eye_dis.png b/src/assets/imgs/login_eye_dis.png
new file mode 100644
index 0000000000000000000000000000000000000000..015a03460e2d5b4972d9ff89f808fae91d430224
GIT binary patch
literal 1157
zcmeAS@N?(olHy`uVBq!ia0vp^!a&T)!3HER$ch^RDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49seoArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XQrEMXkw~hZmDNz
zW^7_<siR<IU}&LlV4-hltZQgyWny4uWTXHEN<iC+Qqrt~T-=~`0eQAc86_nJR{Hwo
z<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mX=fTvCgZi!uvJGV}8kKqe+8
z<(HP&Dgj*z@j`9^+}ONgXfOc-Our(rK;KZ$0OTc@LSJ9}N^^7Js*6j4QW5UOYH)E#
zWkITbP-=00X;CsT;?k5sRuxz|7o{ea<QIkH=jXseF(4zqB)>Q#zd*s+85C-k3L4>=
zc`5nj#hPF}zP?tTdBr7(dC94sF1AWQQ}i-3Q>=_#-GIo{!qLpY!qCvw(ZbB!&B?{c
z+{D1Z+1$X<5~kNBKe;qFHLnDwHwB^B5~p5Ja>y+J+U$~Alv$RV;#QQOs{r=4RVHq?
znBg=Jsy79<Tg-9l)dxC89~8Mrkqr|9rXUa#o^*j6c;ZjZ1E%;QVA2kGvqA@$ExvlX
zIEGZ*nsaf#w^N|Vfsd<iE?UB($-BtJtgHKl(hvKN%?d6oj!n+h0nGuICjDdHwUv{v
zDX%plp_%Vdya2DCR_6WB7W^tgwQ@i96xYkWtGymt|8}2rvQx+7(-!>tRWo+}oTJc{
zzB%6JflQrdS)*vtj^c<HY~c|~`bVR7T=hK3%d%aBb3xapZ~7Mtv!BcL-#VAnq`std
z@e#qGU1dE@ec~ULc*Xe@Zni5P`f=<dU-*{mwF+v?-%hH?FX{|V2{_DQzbmbgQOn~2
zPyVl2VHGC+f){x|N#v$}`E^}m?O!hINftk%eUkP)w5px^`%ik_$~8Yk6Bu-@4OZKg
R%3lT*44$rjF6*2UngHqgg}49!

literal 0
HcmV?d00001

diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index ece7269..395db05 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -51,17 +51,12 @@
             <p>组织机构：</p>
             <el-input v-model="user_data.organization" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item class="info_item info_item_right_btn">
+          <el-form-item
+            :class="user_data.userType == 3 ? 'info_item info_item_right_btn' : 'info_item'"
+          >
             <p>当前用户类型：</p>
-            <el-select v-model="user_data.userType" :disabled="true">
-              <el-option
-                v-for="item in userTypeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-            <el-button class="option_btn" @click="upLevel">升级为开发者</el-button>
+            <el-input v-model="user_data.userTypeName" :disabled="true"></el-input>
+            <el-button v-if="user_data.userType == 3" class="option_btn" @click="upLevel">升级为开发者</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -111,7 +106,7 @@
             <p>密钥：</p>
             <el-input ref="keys" v-model="formBusiness.key"></el-input>
             <el-button class="option_btn" @click="copyKey">复制</el-button>
-            <el-button class="option_btn_gray" @click="upLevel">重置</el-button>
+            <el-button class="option_btn_gray" @click="resetKey">重置</el-button>
           </el-form-item>
           <el-form-item class="info_item">
             <p>描述：</p>
@@ -137,11 +132,27 @@
             </el-form-item>
             <el-form-item class="dia_item">
               <p>新密码：</p>
-              <el-input v-model="form.passwordNew"></el-input>
+              <el-input v-model="form.passwordNew" :type="visible1 ? 'password':'text'">
+                <span
+                  slot="suffix"
+                  :title="visible1 ? '显示密码':'隐藏密码'"
+                  @click="changePass1()"
+                  style="cursor:pointer;"
+                  :class="visible1 ? 'eye_dis':'eye'"
+                ></span>
+              </el-input>
             </el-form-item>
             <el-form-item class="dia_item">
               <p>请再次输入密码：</p>
-              <el-input v-model="form.nextname"></el-input>
+              <el-input v-model="form.nextname" :type="visible2 ? 'password':'text'">
+                <span
+                  slot="suffix"
+                  :title="visible2 ? '显示密码':'隐藏密码'"
+                  @click="changePass2()"
+                  style="cursor:pointer;"
+                  :class="visible2 ? 'eye_dis':'eye'"
+                ></span>
+              </el-input>
             </el-form-item>
           </el-form>
         </div>
@@ -173,8 +184,11 @@ export default {
       phone: "",
       email: "",
       organization: "",
-      userType: ""
+      userType: "",
+      userTypeName: ""
     },
+    visible1: true,
+    visible2: true,
     form: {
       passwordOld: "",
       passwordNew: "",
@@ -207,13 +221,7 @@ export default {
     blackAddShow: false,
     newIpWhite: "",
     newIpBlack: "",
-    diaPassWord: false,
-    userTypeOptions: [
-      { value: 1, label: "超级管理员" },
-      { value: 2, label: "组织管理员" },
-      { value: 3, label: "普通用户" },
-      { value: 4, label: "普通用户开发者" }
-    ]
+    diaPassWord: false
   }),
   mounted() {
     this.getCurrentUser();
@@ -240,6 +248,14 @@ export default {
           this.user_data.email = data.email;
           this.user_data.organization = data.department;
           this.user_data.userType = data.is_admin;
+          this.user_data.userTypeName =
+            this.user_data.userType == 1
+              ? "超级管理员"
+              : this.user_data.userType == 2
+              ? "组织管理员"
+              : this.user_data.userType == 3
+              ? "普通用户"
+              : "普通用户开发者";
           this.imgList.push(data.picture_path);
           this.formBusiness.businessSystemName = data.system_name;
           this.formBusiness.domainName = data.domain_name;
@@ -296,10 +312,23 @@ export default {
     changePassword() {
       this.diaPassWord = true;
     },
+    changePass1() {
+      this.visible1 = !this.visible1;
+    },
+    changePass2() {
+      this.visible2 = !this.visible2;
+    },
     cancelChangePwd() {
       this.diaPassWord = false;
     },
     submitChangePwd() {
+      let query = {
+        id: this.user_data.accountNo,
+        form: {
+          origin_password: this.form.passwordOld,
+          new_password: this.form.passwordNew
+        }
+      }
       this.$api.user.editUserPassword(query).then(response => {
         if (response.data.success == 1) {
           this.$message({
@@ -315,7 +344,38 @@ export default {
         }
       });
     },
-    upLevel() {},
+    resetKey() {
+      this.$api.authority
+        .resetUserKey({ user_id: this.user_data.accountNo })
+        .then(response => {
+          if (response.data.success == 1) {
+            this.$message({
+              message: "重置密钥成功",
+              type: "success"
+            });
+          } else {
+            this.$message({
+              message: "重置密钥失败",
+              type: "error"
+            });
+          }
+        });
+    },
+    upLevel() {
+      this.$api.authority.updateLevel().then(response => {
+        if (response.data.success == 1) {
+          this.$message({
+            message: "重置密钥成功",
+            type: "success"
+          });
+        } else {
+          this.$message({
+            message: "重置密钥失败",
+            type: "error"
+          });
+        }
+      });
+    },
     copyKey() {
       this.$refs.keys.select();
       document.execCommand("Copy");
@@ -465,6 +525,24 @@ export default {
   margin-right: 10px;
   margin-bottom: 10px;
 }
+.eye {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  position: relative;
+  top: 4px;
+  cursor: pointer;
+  background: url("~@/assets/imgs/login_eye.png") no-repeat center center;
+}
+.eye_dis {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  position: relative;
+  top: 6px;
+  cursor: pointer;
+  background: url("~@/assets/imgs/login_eye_dis.png") no-repeat center center;
+}
 </style>
 <style>
 .info_item_right_btn .el-input {
diff --git a/src/request/api/authority.js b/src/request/api/authority.js
index c57c1e2..3f673de 100644
--- a/src/request/api/authority.js
+++ b/src/request/api/authority.js
@@ -26,11 +26,17 @@ const authority = {
     getOrganizationList() {
         return axios.get(`/apaas/backmgt/department/list`);
     },
-
+    
     // User
     setUserInfo(params) {
         return axios.put(`/apaas/backmgt/user/put?pageType=${params.pageType}`, params);
     },
+    resetUserKey(params) {
+        return axios.put(`/apaas/backmgt/user/reset?user_id=${params.user_id}`);
+    },
+    updateLevel() {
+        return axios.post(`/apaas/backmgt/user/upgrade`);
+    },
 }
 
 export default authority;
-- 
2.26.0