Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

src/components/OrgCard/OrgCardCom.vue

@@ -2,11 +2,11 @@
   <a-card :class="{
     'selected-card': isSelected,
     'directive-selected-card': isDirectiveSelected,
-    'org-card': clickable
+    'org-card': true
   }" style="width: 100%; border-radius: 8px;" :style="{ cursor: clickable ? 'pointer' : 'default' }"
-    :bodyStyle="{ padding: '24px' }" @click="handleClick">
-    <div>
-      <a-row style="font-weight: normal; margin-bottom: 12px;">
+    :bodyStyle="{ padding: '24px 24px 0 24px' }" @click="handleClick">
+    <template #title>
+      <a-row style="font-weight: normal; ">
         <a-col :span="existTagFunc() ? 16 : 21">
           <div>
             <span class="ellipsis-one-lines1" :title="orgInfo.departName" style="font-size: 17px; font-weight: bold;">{{
@@ -30,20 +30,22 @@
           </div>
         </a-col>
       </a-row>
-      <div style="position: relative;">
-        <div>
-          <div><span style="color: #909399;">机构负责人：</span>{{ orgInfo.orgLeader }}</div>
-          <div><span style="color: #909399;">负责人电话：</span>{{ orgInfo.orgLeaderPhone }}</div>
-        </div>
-        <div class="org-address">
-          <span class="ellipsis-one-lines2" :title="orgInfo.comRegisterAddress">{{ orgInfo.comRegisterAddress }}</span>
-        </div>
-        <div
-          style="font-size: 12px; display: flex; justify-content: space-between; align-items: center; margin-top: 12px;">
-          <span style="color: #909399;">加盟时间：{{ orgInfo.franchiseTime?.substring(0, 10) }}</span>
-          <a-button style="font-size: 12px;" v-show="showDetail" type="link" size="small"
-            @click.stop="handleDetail">了解更多</a-button>
-        </div>
+    </template>
+
+    
+    <div style="position: relative;">
+      <div>
+        <div><span style="color: #909399;">机构负责人：</span>{{ orgInfo.orgLeader }}</div>
+        <div><span style="color: #909399;">负责人电话：</span>{{ orgInfo.orgLeaderPhone }}</div>
+      </div>
+      <div class="org-address">
+        <span class="ellipsis-one-lines2" :title="orgInfo.comRegisterAddress">{{ orgInfo.comRegisterAddress }}</span>
+      </div>
+      <div
+        style="font-size: 12px; display: flex; justify-content: space-between; align-items: center; margin-top: 12px;">
+        <span style="color: #909399;">加盟时间：{{ orgInfo.franchiseTime?.substring(0, 10) }}</span>
+        <a-button style="font-size: 12px;" v-show="showDetail" type="link" size="small"
+          @click.stop="handleDetail">了解更多</a-button>
       </div>
     </div>
   </a-card>
@@ -81,14 +83,12 @@ const handleDetail = () => {
 <style lang="less" scoped>
 .zxClass {
   font-size: 12px;
-  background-color: white;
-  border: 1px solid #e4e4e4;
+  background: linear-gradient(to right, #1ea0fa, #017de9);
   border-radius: 8px;
   height: 25px;
-  color: #7c7c7c;
+  color: white;
   line-height: 25px;
-  padding: 0 8px;
-  flex-shrink: 0;
+  padding: 0 10px;
 }
 
 .zxbkClass {
@@ -105,13 +105,36 @@ const handleDetail = () => {
   box-shadow: 0 0 8px rgba(37, 149, 255, 0.3);
 }
 
+
 .org-card {
+  margin-bottom: 16px;
+  border-radius: 8px;
+  // box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  transition: all 0.3s ease;
+  height: 100%;
+
   &:hover {
-    border-color: #55a9f8;
-    box-shadow: 0 2px 8px rgba(37, 149, 255, 0.3);
+    transform: translateY(-4px);
+    // box-shadow: 0 6px 16px rgba(0, 0, 0, 0.15);
+    // background: radial-gradient(circle at center, #c7e6ff 0%, #d4eeff 70%, #e4f0ff 100%);
+  }
+
+  :deep(.ant-card-head) {
+    border-bottom: 1px solid #f0f0f0;
+    padding: 0 16px;
+    min-height: 48px;
+
+    .ant-card-head-title {
+      padding: 12px 0;
+      font-weight: 500;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
   }
 }
 
+
 :deep .ant-divider {
   margin: 0 0 8px 0;
 }

src/components/SimpleMenu/src/SimpleMenu.vue

@@ -203,6 +203,7 @@
 .jeecg-menu-light.jeecg-menu-vertical .jeecg-menu-item-active.jeecg-menu-submenu {
   color: #606266 !important;
   background: #f0f0f0;
+  padding-bottom: 10px;;
   
 }
 .jeecg-menu-vertical .jeecg-menu-item, .jeecg-menu-vertical .jeecg-menu-submenu-title {
@@ -222,4 +223,16 @@
     // margin: 10px 20px 0 20px;
     transform: scale(1.02);
 }
+
+.ant-drawer-close {
+  position: absolute;
+  right: 0;
+  left: auto !important;
+  margin-right: 16px;
+}
+.jeecg-layout-content{
+position: relative;
+  flex: 1 1 auto;
+  min-height: 0;
+}
 </style>

src/design/ant/index.less

@@ -5,6 +5,16 @@
 // update-end--author:liaozhiyang---date:20240130---for：【issues/5857】Button color类型颜色失效
 // @import './table.less';
 
+.jeecg-basic-table-form-container .ant-form {
+  margin-bottom: 14px !important;
+}
+.jeecg-basic-table-form-container .table-page-search-submitButtons {
+  margin-bottom: 12px !important;
+}
+.ant-form-item {
+  margin-bottom: 14px !important;
+}
+
 // TODO beta.11 fix
 .ant-col {
   width: 100%;