From 7c0ca626768e7afec7ed23f6763ddefd92cf6574 Mon Sep 17 00:00:00 2001
From: v_yutyi <a670003190@qq.com>
Date: Wed, 11 Jan 2023 10:52:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AF=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=20#879?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/package.json                        |  2 +-
 src/pages/src/views/audit/index.vue           | 12 +---
 .../organization/details/UserMaterial.vue     | 59 +++++++++----------
 3 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/src/pages/package.json b/src/pages/package.json
index 2fe2fb4c8..3b7be6e02 100644
--- a/src/pages/package.json
+++ b/src/pages/package.json
@@ -57,7 +57,7 @@
         "express-art-template": "1.0.1",
         "intl-tel-input": "16.0.0",
         "js-base64": "^3.7.2",
-        "jsencrypt": "^3.3.1",
+        "jsencrypt": "3.3.1",
         "jsonp": "0.2.1",
         "query-string": "6.5.0",
         "sortablejs": "1.10.1",
diff --git a/src/pages/src/views/audit/index.vue b/src/pages/src/views/audit/index.vue
index 21bc5ccbe..5e6eafc01 100644
--- a/src/pages/src/views/audit/index.vue
+++ b/src/pages/src/views/audit/index.vue
@@ -60,7 +60,7 @@
                   <template v-if="isOperate">
                     <td><div class="text-overflow-hidden" v-bk-overflow-tips>{{item.operator}}</div></td>
                     <td><div class="text-overflow-hidden" v-bk-overflow-tips>{{item.display_name || '--'}}</div></td>
-                    <td><div class="text-overflow-hidden">{{item.datetime | convertIsoTime}}</div></td>
+                    <td><div class="text-overflow-hidden">{{item.datetime}}</div></td>
                     <td><div class="text-overflow-hidden" v-bk-overflow-tips>{{item.client_ip}}</div></td>
                     <td><div class="text-overflow-hidden">{{item.operation}}</div></td>
                     <td><div class="text-overflow-hidden" v-bk-overflow-tips>{{item.category_display_name}}</div></td>
@@ -69,7 +69,7 @@
                   <template v-else>
                     <td><div class="text-overflow-hidden">{{item.username}}</div></td>
                     <td><div class="text-overflow-hidden">{{item.display_name || '--'}}</div></td>
-                    <td><div class="text-overflow-hidden">{{item.datetime | convertIsoTime}}</div></td>
+                    <td><div class="text-overflow-hidden">{{item.datetime}}</div></td>
                     <td><div class="text-overflow-hidden">{{item.client_ip}}</div></td>
                     <td><div class="text-overflow-hidden" v-bk-tooltips="errorTips(item)">
                       <i :class="['status', { 'status-fail': !item.is_success }]" />
@@ -109,14 +109,6 @@
 <script>
 export default {
   name: 'AuditIndex',
-  filters: {
-    convertIsoTime(iso) {
-      const arr = iso.split('T');
-      const year = arr[0];
-      const time = arr[1].split('.')[0];
-      return `${year} ${time}`;
-    },
-  },
   data() {
     return {
       basicLoading: true,
diff --git a/src/pages/src/views/organization/details/UserMaterial.vue b/src/pages/src/views/organization/details/UserMaterial.vue
index 1fc781abe..78160aa3e 100644
--- a/src/pages/src/views/organization/details/UserMaterial.vue
+++ b/src/pages/src/views/organization/details/UserMaterial.vue
@@ -378,36 +378,41 @@ export default {
         return;
       }
       this.clickSecond = true;
-      try {
-        this.$emit('showBarLoading');
-        let data = {};
-        // 任何人在重置admin密码时，需要先输入原密码
-        if (this.isAdmin) {
-          // passwordData.old_password = this.oldPassword.trim();
-          if (this.isRsaEncrypted) {
-            data = {
-              password: this.Rsa.rsaPublicData(this.newPassword.trim(), this.publicKey),
-              old_password: this.Rsa.rsaPublicData(this.oldPassword.trim(), this.publicKey),
-            };
-          } else {
-            data = {
-              password: this.newPassword.trim(),
-              old_password: this.oldPassword.trim(),
-            };
-          }
+      this.$emit('showBarLoading');
+      let data = {};
+      // 任何人在重置admin密码时，需要先输入原密码
+      if (this.isAdmin) {
+        if (this.isRsaEncrypted) {
+          data = {
+            password: this.Rsa.rsaPublicData(this.newPassword.trim(), this.publicKey),
+            old_password: this.Rsa.rsaPublicData(this.oldPassword.trim(), this.publicKey),
+          };
         } else {
-          if (this.isRsaEncrypted) {
-            data = { password: this.Rsa.rsaPublicData(this.newPassword.trim(), this.publicKey) };
-          } else {
-            data = { password: this.newPassword.trim() };
-          }
+          data = {
+            password: this.newPassword.trim(),
+            old_password: this.oldPassword.trim(),
+          };
+        }
+      } else {
+        if (this.isRsaEncrypted) {
+          data = { password: this.Rsa.rsaPublicData(this.newPassword.trim(), this.publicKey) };
+        } else {
+          data = { password: this.newPassword.trim() };
         }
-        this.patchProfile(this.currentProfile.id, data);
+      }
+      this.patchProfile(this.currentProfile.id, data);
+      this.isShowReset = false;
+    },
+    async patchProfile(id, data) {
+      try {
+        await this.$store.dispatch('organization/patchProfile', {
+          id,
+          data,
+        });
         this.$bkMessage({
           message: this.$t('重置密码成功'),
           theme: 'success',
         });
-        this.isShowReset = false;
       } catch (e) {
         console.warn(e);
       } finally {
@@ -415,12 +420,6 @@ export default {
         this.$emit('closeBarLoading');
       }
     },
-    async patchProfile(id, data) {
-      await this.$store.dispatch('organization/patchProfile', {
-        id,
-        data,
-      });
-    },
     closeResetDialog(e) {
       if (e.target.innerText === '重置密码') return;
       this.isShowReset = false;