Browse Source

Merge branch 'master' into release/V1.0.0/test

半生瓜 3 months ago
parent
commit
8bb80c01a1

+ 5 - 2
src/components/VersionsBut/src/VersionBut.vue

@@ -2,7 +2,7 @@
2
  * @Author: 半生瓜 1515706227@qq.com
2
  * @Author: 半生瓜 1515706227@qq.com
3
  * @Date: 2024-05-08 15:04:53
3
  * @Date: 2024-05-08 15:04:53
4
  * @LastEditors: 半生瓜 1515706227@qq.com
4
  * @LastEditors: 半生瓜 1515706227@qq.com
5
- * @LastEditTime: 2024-05-22 10:21:23
5
+ * @LastEditTime: 2024-06-05 16:38:48
6
  * @FilePath: \vue-element-plus-admin-mini\src\components\VersionsBut\src\Screenfull.vue
6
  * @FilePath: \vue-element-plus-admin-mini\src\components\VersionsBut\src\Screenfull.vue
7
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
7
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8
 -->
8
 -->
@@ -16,6 +16,7 @@ const dialogVisible = ref(false)
16
 
16
 
17
 const v1 = ref('')
17
 const v1 = ref('')
18
 const v2 = ref('')
18
 const v2 = ref('')
19
+const v3 = ref('')
19
 
20
 
20
 const btnClick = async () => {
21
 const btnClick = async () => {
21
   console.log('点击版本====')
22
   console.log('点击版本====')
@@ -26,6 +27,7 @@ const btnClick = async () => {
26
       if (item.configKey == 'jarVersion') {
27
       if (item.configKey == 'jarVersion') {
27
         v1.value = JSON.parse(item.configValue).app
28
         v1.value = JSON.parse(item.configValue).app
28
         v2.value = JSON.parse(item.configValue).manger
29
         v2.value = JSON.parse(item.configValue).manger
30
+        v3.value = JSON.parse(item.configValue).java
29
       }
31
       }
30
     })
32
     })
31
   }
33
   }
@@ -37,6 +39,7 @@ const btnClick = async () => {
37
   <ElButton type="primary" @click="btnClick">版本</ElButton>
39
   <ElButton type="primary" @click="btnClick">版本</ElButton>
38
   <Dialog v-model="dialogVisible" maxHeight="80px" width="35rem" title="版本信息">
40
   <Dialog v-model="dialogVisible" maxHeight="80px" width="35rem" title="版本信息">
39
     <div> 客户端版本:{{ v1 }}</div>
41
     <div> 客户端版本:{{ v1 }}</div>
40
-    <div style="margin-top: 10px"> Web后台管理系统:{{ v2 }}</div>
42
+    <div style="margin-top: 10px"> Web后台管理系统版本:{{ v2 }}</div>
43
+    <div style="margin-top: 10px"> 后端服务版本:{{ v3 }}</div>
41
   </Dialog>
44
   </Dialog>
42
 </template>
45
 </template>

+ 2 - 2
src/views/Login/components/LoginForm.vue

@@ -2,7 +2,7 @@
2
  * @Author: 半生瓜 1515706227@qq.com
2
  * @Author: 半生瓜 1515706227@qq.com
3
  * @Date: 2024-04-21 17:20:21
3
  * @Date: 2024-04-21 17:20:21
4
  * @LastEditors: 半生瓜 1515706227@qq.com
4
  * @LastEditors: 半生瓜 1515706227@qq.com
5
- * @LastEditTime: 2024-05-28 14:10:29
5
+ * @LastEditTime: 2024-06-05 16:55:24
6
  * @FilePath: \vue-element-plus-admin-mini\src\views\Login\components\LoginForm.vue
6
  * @FilePath: \vue-element-plus-admin-mini\src\views\Login\components\LoginForm.vue
7
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
7
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8
 -->
8
 -->
@@ -218,7 +218,7 @@ const signIn = async () => {
218
               if (item.configKey == 'jarVersion') {
218
               if (item.configKey == 'jarVersion') {
219
                 a1 = item
219
                 a1 = item
220
                 a1.configValue = JSON.parse(a1.configValue)
220
                 a1.configValue = JSON.parse(a1.configValue)
221
-                a1.configValue.manger = 'v1.0.0'
221
+                a1.configValue.manger = 'V1.0.0.20240606'
222
                 a1.configValue = JSON.stringify(a1.configValue)
222
                 a1.configValue = JSON.stringify(a1.configValue)
223
 
223
 
224
                 saveSystem([a1]).then(() => {})
224
                 saveSystem([a1]).then(() => {})