Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/router/routes/modules/dashboard.ts

@@ -5,16 +5,16 @@ import { t } from '@/hooks/web/useI18n';
 
 const dashboard: AppRouteModule =
  {
-  path: '/dashboard',
+  // path: '/dashboard',
-  name: 'Dashboard',
+  // name: 'Dashboard',
-  component: LAYOUT,
+  // component: LAYOUT,
-  redirect: '/dashboard/analysis',
+  // redirect: '/dashboard/analysis',
-  meta: {
+  // meta: {
-    orderNo: 10,
+  //   orderNo: 10,
-    icon: 'ion:grid-outline',
+  //   icon: 'ion:grid-outline',
-    title: t('routes.dashboard.dashboard'),
+  //   title: t('routes.dashboard.dashboard'),
-  },
+  // },
-  children: [
+  // children: [
     // {
     //   path: '/dashboard/analysis',
     //   name: 'Analysis',
@@ -24,15 +24,15 @@ const dashboard: AppRouteModule =
     //     title: t('routes.dashboard.analysis'),
     //   },
     // },
-    {
+    // {
-      path: '/dashboard/test',
+    //   path: '/dashboard/test',
-      name: 'test',
+    //   name: 'test',
-      component: () => import('@/views/dashboard/test/index.vue'),
+    //   component: () => import('@/views/dashboard/test/index.vue'),
-      meta: {
+    //   meta: {
-        // affix: true,
+    //     // affix: true,
-        title: t('routes.dashboard.test'),
+    //     title: t('routes.dashboard.test'),
-      },
+    //   },
-    },
+    // },
     // {
     //   path: '/formCallPage',
     //   name: 'formCallPage',
@@ -94,7 +94,7 @@ const dashboard: AppRouteModule =
     //   },
     //   component: () => import('@/views/demo/workflow/h5/look.vue'),
     // },
-  ],
+  // ],
 };
 
 

src/views/demo/caseoffence/index.vue

@@ -438,4 +438,15 @@
     height: 60px;
     margin: 5px;
   }
+
+  ::v-deep .ant-table-container table {
+    line-height: 1.1 !important;
+
+    .ant-table-row {
+      td {
+        padding-top: 8px !important;
+        padding-bottom: 8px !important;
+      }
+    }
+  }
 </style>

src/views/demo/system/version/index.vue

@@ -26,6 +26,7 @@
                   <a-input
                     v-model:value="currentAppForm.project_name"
                     defaultValue="drone_enforcement"
+                    disabled="true"
                   />
                 </a-form-item>
                 <a-form-item label="上传">

src/views/subject/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="subject">
     <div class="subject_header">
+      <img class="subject_header_img" src="/subject/subject_header.png" />
       <div class="subject_header_title">
         <span>
           <img src="/subject/subject_logo.png" />
@@ -195,17 +196,20 @@
     background-attachment: fixed;
     width: 100%;
     height: 100%;
+    -webkit-user-select: none; /* Safari */
+    -moz-user-select: none; /* Firefox */
+    -ms-user-select: none; /* IE/Edge */
+    user-select: none;
 
     &_header {
-      background-image: url('/subject/subject_header.png');
+      &_img {
-      background-repeat: no-repeat;
+        height: 82px;
-      background-size: cover;
+        width: 100%;
-      height: 82px;
+      }
-      width: 100%;
 
       &_title {
         position: relative;
-        top: -5px;
+        top: -87px;
 
         span {
           img {
@@ -263,6 +267,8 @@
 
     &_box {
       display: flex;
+      position: relative;
+      top: -82px;
 
       &_btn {
         align-items: center;
@@ -270,12 +276,18 @@
         flex-wrap: wrap;
         position: relative;
         top: 50px;
-        left: 110px;
+        left: 100px;
         height: 688px;
-        width: calc(100vw - 200px);
+        width: calc(100vw);
         display: flex;
         overflow-x: hidden;
-        overflow-y: hidden;
+        overflow-y: auto;
+        -ms-overflow-style: none; /* IE 和 Edge */
+        scrollbar-width: none; /* Firefox */
+
+        ::-webkit-scrollbar {
+          display: none; /* Chrome, Safari, Opera */
+        }
 
         &_div {
           flex: 0 0 auto;
@@ -353,9 +365,9 @@
       }
 
       &_overflow {
-        position: relative;
+        position: absolute;
         top: 220px;
-        left: 100px;
+        right: -110px;
         height: 300px;
         width: 110px;
 
@@ -364,7 +376,7 @@
           cursor: pointer;
           position: relative;
           top: 100px;
-          left: 20px;
+          right: 85px;
         }
 
         &_icon2 {
@@ -372,7 +384,7 @@
           cursor: pointer;
           position: relative;
           top: 200px;
-          left: -10px;
+          right: 115px;
         }
       }
     }