Merge branch 'master' of http://222.71.165.188:3000/yunxi/mes-heli

mes-ui/mes-ui-admin-vue3/src/layout/components/Footer/src/Footer.vue

@@ -19,7 +19,7 @@ const title = computed(() => appStore.getTitle)
     :class="prefixCls"
     class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]"
   >
-    <span class="text-14px">Copyright ©2022 上海长江云息数字科技有限公司,All Rights Reserved.
+    <span class="text-14px">Copyright ©上海长江云息数字科技有限公司,All Rights Reserved.
       <br/>专注工业信息化-供应链解决方案
     </span>
     

mes-ui/mes-ui-admin-vue3/src/styles/cus.scss

@@ -11,11 +11,14 @@
 * {
   font-size: 18px !important;
   box-sizing: border-box;
+  .el-form-item__error{
+    font-size: 14px !important;
+  }
 }
 
 .hl-card {
   margin: 0px;
-  margin-top: var(--hl-margin);
+  // margin-top: var(--hl-margin);
   border-radius: 10px !important;
 
   .el-card__header {
@@ -100,3 +103,5 @@
   }
 }
 
+
+

mes-ui/mes-ui-admin-vue3/src/views/heli/dept/index.vue

@@ -10,7 +10,7 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="108px"
     >
       <el-form-item label="部门名称" label-width="108px" prop="title">
         <el-input