Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

portal-manager-ui/admin/src/router/routes.js

@@ -17,6 +17,10 @@ const routes = [
           ),
         meta: { title: "数据管理" },
         children: [
+          {
+            path: "dataAdmin",
+            redirect: "/",//升级前门户跳转重定向
+          },
           {
             path: "pickUp",
             name: "pickUp",
@@ -27,6 +31,7 @@ const routes = [
               ),
             meta: { title: "取件记录报表" },
             children: [
+              
               {
                 path: "pickUpRecord",
                 name: "pickUpRecord",

portal-manager-ui/admin/src/views/home/home.vue

@@ -230,6 +230,8 @@ export default {
   :deep(.ant-menu) {
     background-color: transparent;
     border: none;
+    flex: 1;
+    margin-left: 120px;
     .ant-menu-item {
       font-size: 18px;
       font-family: Source Han Sans CN;

portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue

@@ -93,7 +93,7 @@
             @end="isAdd = false"
           >
             <div
-              class="common-item w-full h-[130px] flex flex-col items-center"
+              class="common-item w-full h-[125px] flex flex-col items-center"
               v-for="item in v.list"
               :key="item.id"
             >
@@ -293,8 +293,8 @@ export default {
     background: rgba(0, 0, 0, 0.5);
   }
   .item-logo {
-    width: 80px;
-    height: 80px;
+    width: 66px;
+    height: 66px;
     padding: 10px;
     background: linear-gradient(180deg, #daefff 0%, #ffffff 100%);
     box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.1);
@@ -305,8 +305,9 @@ export default {
     position: relative;
     .bottom-img {
       position: absolute;
-      left: 0px;
-      bottom: -10px;
+      left: -2px;
+      bottom: -11px;
+      width: 70px;
     }
   }
   .site-box {