Merge remote-tracking branch 'origin/master'

jeecgboot-vue3/src/views/demo/page/desc/high/index.vue

@@ -14,7 +14,7 @@
     </template>
 
     <div class="pt-4 m-4 desc-wrap">
-      <a-descriptions size="small" :column="2">
+      <a-descriptions :bordered="true" size="small" :column="2">
         <a-descriptions-item label="创建人"> 曲丽丽 </a-descriptions-item>
         <a-descriptions-item label="订购产品"> XX 服务 </a-descriptions-item>
         <a-descriptions-item label="创建时间"> 2017-01-10 </a-descriptions-item>
@@ -39,8 +39,8 @@
         </a-steps>
       </a-card>
 
-      <a-card title="用户信息" :bordered="false" class="mt-5">
+      <a-card title="用户信息" :bordered="true" class="mt-5">
-        <a-descriptions :column="3">
+        <a-descriptions :column="3" :bordered="true">
           <a-descriptions-item label="用户姓名"> 付小小 </a-descriptions-item>
           <a-descriptions-item label="会员卡号"> XX 32943898021309809423 </a-descriptions-item>
           <a-descriptions-item label="身份证"> 3321944288191034921 </a-descriptions-item>

jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/DepartBaseInfoDemo.vue

@@ -15,6 +15,9 @@
     <!–引用表格–>
     <BasicTable @register="registerTable"></BasicTable>
   </div>-->
+  <div class="button-container">
+    <a-button type="primary"  @click="router.back();">返回</a-button>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -23,7 +26,7 @@ import {Description} from '/@/components/Description/index';
 import {PageWrapper} from '/@/components/Page';
 import {BasicTable, useTable} from '/@/components/Table';
 
-import {useRoute} from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import {useModal} from "@/components/Modal";
 import {list} from '@/views/projectApplication/project/Project.api';
 import {getDepartByProjectId} from './FengMian.api';
@@ -31,6 +34,7 @@ import {columns2} from "@/views/cooperationDepart/CooperationDepart.data";
 import {list2} from "@/views/cooperationDepart/CooperationDepart.api";
 
 const route = useRoute();
+const router = useRouter();
 const falg = ref(false)
 
 const DepartBaseInfoData: any = {
@@ -155,3 +159,9 @@ async function getData() {
 getData();
 
 </script>
+
+<style>
+.button-container {
+  text-align: center;
+}
+</style>

jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/FengMianDemo.vue

@@ -52,13 +52,16 @@
       </tbody>
     </table>
   </div>
+  <div class="button-container">
+    <a-button type="primary"  @click="router.back();">返回</a-button>
+  </div>
 </template>
 <script setup lang="ts">
 
-import {useRoute} from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import {getFengMian} from './FengMian.api';
 import {onMounted, ref} from "vue";
-
+const router = useRouter();
 const route = useRoute();
 const data = ref({})
 
@@ -71,7 +74,6 @@ async function getData() {
   data.value = obj
 }
 
-
 onMounted(() => {
   getData()
 });
@@ -92,4 +94,8 @@ th, td {
   line-height: 40px;
   border: 1px solid #000;
 }
+
+ .button-container {
+   text-align: center;
+ }
 </style>

jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/ProjectBaseInfoDemo.vue

@@ -15,6 +15,9 @@
     <!--引用表格-->
     <BasicTable @register="registerTable"></BasicTable>
   </div>
+  <div class="button-container">
+    <a-button type="primary"  @click="router.back();">返回</a-button>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -23,7 +26,7 @@ import {Description} from '/@/components/Description/index';
 import {PageWrapper} from '/@/components/Page';
 import {BasicTable, useTable} from '/@/components/Table';
 
-import {useRoute} from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import {useModal} from "@/components/Modal";
 import {useListPage} from "@/hooks/system/useListPage";
 import {columns} from "@/views/projectObjective/ProjectObjective.data";
@@ -32,6 +35,7 @@ import {columns2} from "@/views/cooperationDepart/CooperationDepart.data";
 import {list2} from "@/views/cooperationDepart/CooperationDepart.api";
 
 const route = useRoute();
+const router = useRouter();
 const falg = ref(false)
 //注册model
 const [registerModal, {openModal}] = useModal();
@@ -136,3 +140,9 @@ async function getData() {
 getData();
 
 </script>
+
+<style>
+  .button-container {
+    text-align: center;
+  }
+</style>