From 1b9aa9b5e93a5967cf4694c23c34b18e673b88ff Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 5 Jul 2024 11:14:10 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8E=E7=AE=A1=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A1=A9=E5=8A=A8=E6=80=81=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/api/pile/basic.js              |  7 +++
 .../src/views/system/user/profile/index.vue   | 53 ++++++++++++++++++-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/jsowell-ui/src/api/pile/basic.js b/jsowell-ui/src/api/pile/basic.js
index 137b9e0ff..f5c2139dc 100644
--- a/jsowell-ui/src/api/pile/basic.js
+++ b/jsowell-ui/src/api/pile/basic.js
@@ -122,3 +122,10 @@ export function getPersonalPileList(data) {
         data: data
     })
 }
+
+export function generatePileSecret() {
+    return request({
+        url: '/pile/basic/getPileSecretStr',
+        method: 'get'
+    })
+}
diff --git a/jsowell-ui/src/views/system/user/profile/index.vue b/jsowell-ui/src/views/system/user/profile/index.vue
index 5d6872ecc..0aedd67a8 100644
--- a/jsowell-ui/src/views/system/user/profile/index.vue
+++ b/jsowell-ui/src/views/system/user/profile/index.vue
@@ -55,7 +55,39 @@
         </el-card>
       </el-col>
     </el-row>
-  </div>
+
+      <el-row :gutter="20">
+      <el-col :span="6" :xs="24">
+          <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                  <span>桩动态密码</span>
+                  <div class="button-container">
+                      <el-button
+                          type="primary"
+                          @click="generatePileSecret"
+                          plain>点击生成动态密码</el-button>
+                  </div>
+              </div>
+              <div>
+                  <div>
+                      <ul class="list-group list-group-striped">
+                          <li class="list-group-item">
+                              <svg-icon icon-class="date" /> 当前日期
+                              <div class="pull-right">{{ nowDate }}</div>
+                          </li>
+                      </ul>
+                      <ul class="list-group list-group-striped">
+                          <li class="list-group-item">
+                              <el-icon name="key" /> 动态密码
+                              <div class="pull-right">{{ pileSecret }}</div>
+                          </li>
+                      </ul>
+                  </div>
+              </div>
+          </el-card>
+      </el-col>
+      </el-row>
+      </div>
 </template>
 
 <script>
@@ -63,6 +95,7 @@ import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
 import { getUserProfile } from "@/api/system/user";
+import {generatePileSecret} from "@/api/pile/basic";
 
 export default {
   name: "Profile",
@@ -70,6 +103,8 @@ export default {
   data() {
     return {
       user: {},
+        nowDate: '',
+        pileSecret: '',
       roleGroup: {},
       postGroup: {},
       activeTab: "userinfo"
@@ -77,6 +112,7 @@ export default {
   },
   created() {
     this.getUser();
+    this.nowDate = new Date().toLocaleDateString();
   },
   methods: {
     getUser() {
@@ -85,7 +121,20 @@ export default {
         this.roleGroup = response.roleGroup;
         this.postGroup = response.postGroup;
       });
-    }
+    },
+      generatePileSecret() {
+          generatePileSecret().then(response => {
+              console.log("response", response);
+              this.pileSecret = response.obj;
+          });
+      }
   }
 };
 </script>
+
+<style>
+.button-container {
+    display: flex;
+    justify-content: right; /* 靠右 */
+}
+</style>

From 0d3dc3fe9b9d05eeb853f14d01e5961f820be023 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 5 Jul 2024 11:23:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8E=E7=AE=A1=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A1=A9=E5=8A=A8=E6=80=81=E5=AF=86=E7=A0=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/system/user/profile/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jsowell-ui/src/views/system/user/profile/index.vue b/jsowell-ui/src/views/system/user/profile/index.vue
index 0aedd67a8..db5d57612 100644
--- a/jsowell-ui/src/views/system/user/profile/index.vue
+++ b/jsowell-ui/src/views/system/user/profile/index.vue
@@ -56,7 +56,7 @@
       </el-col>
     </el-row>
 
-      <el-row :gutter="20">
+      <el-row :gutter="20" v-hasRole="['admin', 'common']">
       <el-col :span="6" :xs="24">
           <el-card class="box-card">
               <div slot="header" class="clearfix">

From c20b6612d8e36898030e2d086f4c6f74ddfab515 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 5 Jul 2024 11:35:54 +0800
Subject: [PATCH 3/4] update

---
 jsowell-admin/src/test/java/SpringBootTestController.java | 1 +
 jsowell-ui/src/views/system/user/profile/index.vue        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index d159090b7..0a21adb64 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -2502,6 +2502,7 @@ public class SpringBootTestController {
 
         GetStationInfoDTO dto = new GetStationInfoDTO();
         dto.setType("page");
+        dto.setIdList(Lists.newArrayList("395"));
         aMapService.getStationInfosV2(dto);
     }
 
diff --git a/jsowell-ui/src/views/system/user/profile/index.vue b/jsowell-ui/src/views/system/user/profile/index.vue
index db5d57612..8946a51f5 100644
--- a/jsowell-ui/src/views/system/user/profile/index.vue
+++ b/jsowell-ui/src/views/system/user/profile/index.vue
@@ -72,7 +72,7 @@
                   <div>
                       <ul class="list-group list-group-striped">
                           <li class="list-group-item">
-                              <svg-icon icon-class="date" /> 当前日期
+                              <el-icon name="date" /> 当前日期
                               <div class="pull-right">{{ nowDate }}</div>
                           </li>
                       </ul>

From d66bd9e34e7b6e121d7a9a1294cb0235fd42c519 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Fri, 5 Jul 2024 14:16:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=20=20?=
 =?UTF-8?q?=E6=A1=A9=E5=AF=86=E7=A0=81=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/user/profile/index.vue   | 80 +++++++++----------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/jsowell-ui/src/views/system/user/profile/index.vue b/jsowell-ui/src/views/system/user/profile/index.vue
index 8946a51f5..80da098a2 100644
--- a/jsowell-ui/src/views/system/user/profile/index.vue
+++ b/jsowell-ui/src/views/system/user/profile/index.vue
@@ -56,38 +56,33 @@
       </el-col>
     </el-row>
 
-      <el-row :gutter="20" v-hasRole="['admin', 'common']">
+    <el-row :gutter="20" v-hasRole="['admin', 'common']" style="margin-top: 20px;">
       <el-col :span="6" :xs="24">
-          <el-card class="box-card">
-              <div slot="header" class="clearfix">
-                  <span>桩动态密码</span>
-                  <div class="button-container">
-                      <el-button
-                          type="primary"
-                          @click="generatePileSecret"
-                          plain>点击生成动态密码</el-button>
-                  </div>
-              </div>
-              <div>
-                  <div>
-                      <ul class="list-group list-group-striped">
-                          <li class="list-group-item">
-                              <el-icon name="date" /> 当前日期
-                              <div class="pull-right">{{ nowDate }}</div>
-                          </li>
-                      </ul>
-                      <ul class="list-group list-group-striped">
-                          <li class="list-group-item">
-                              <el-icon name="key" /> 动态密码
-                              <div class="pull-right">{{ pileSecret }}</div>
-                          </li>
-                      </ul>
-                  </div>
-              </div>
-          </el-card>
+        <el-card class="box-card">
+          <div slot="header" class="password">
+            <p>桩动态密码</p>
+            <el-button type="primary" @click="generatePileSecret" plain>点击生成动态密码</el-button>
+          </div>
+          <div>
+            <div>
+              <ul class="list-group list-group-striped">
+                <li class="list-group-item">
+                  <el-icon name="date" /> 当前日期
+                  <div class="pull-right">{{ nowDate }}</div>
+                </li>
+              </ul>
+              <ul class="list-group list-group-striped">
+                <li class="list-group-item">
+                  <el-icon name="key" /> 动态密码
+                  <div class="pull-right">{{ pileSecret }}</div>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </el-card>
       </el-col>
-      </el-row>
-      </div>
+    </el-row>
+  </div>
 </template>
 
 <script>
@@ -95,7 +90,7 @@ import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
 import { getUserProfile } from "@/api/system/user";
-import {generatePileSecret} from "@/api/pile/basic";
+import { generatePileSecret } from "@/api/pile/basic";
 
 export default {
   name: "Profile",
@@ -103,8 +98,8 @@ export default {
   data() {
     return {
       user: {},
-        nowDate: '',
-        pileSecret: '',
+      nowDate: '',
+      pileSecret: '',
       roleGroup: {},
       postGroup: {},
       activeTab: "userinfo"
@@ -122,19 +117,20 @@ export default {
         this.postGroup = response.postGroup;
       });
     },
-      generatePileSecret() {
-          generatePileSecret().then(response => {
-              console.log("response", response);
-              this.pileSecret = response.obj;
-          });
-      }
+    generatePileSecret() {
+      generatePileSecret().then(response => {
+        console.log("response", response);
+        this.pileSecret = response.obj;
+      });
+    }
   }
 };
 </script>
 
 <style>
-.button-container {
-    display: flex;
-    justify-content: right; /* 靠右 */
+.password {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 </style>