Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_web

src/components/LowDesign/src/LowReport/index.vue

@@ -209,7 +209,7 @@ const initTable = async () => {
     menu: false,
     addBtn: false,
     height: isHeight ? 'auto' : undefined,
-    calcHeight: isHeight ? 160 : '',
+    calcHeight: isHeight ? 10 : '',
     index: reportVo.tableConfig.includes('index'),
     border: reportVo.tableConfig.includes('border'),
     stripe: reportVo.tableConfig.includes('stripe'),
@@ -281,6 +281,11 @@ const initTable = async () => {
           tableSearch.value[config.prop]=item.searchDefaultValue
         }
     }
+    if(['年','年度','年份','月','月度','月份','年月'].includes(item.fieldName)){
+      config.searchSpan=3
+      config.searchLabelWidth=60
+
+    }
     if(!!item.isAmount){
       index==0?amountFieds.value.fistField=config.prop:''
       amountFieds.value[item.isAmount]=config
@@ -349,7 +354,7 @@ const initTableLayout = () => {
 
   if (tableInfo.value.isHeight || props.calcHeight) {
     const calcH = props.calcHeight
-    let calcHeight = calcH || 160
+    let calcHeight = calcH || 10
     if (calcH) tableOption.value.height = 'auto'
     tableOption.value.calcHeight = calcHeight
   }

src/views/Login/Login.vue

@@ -1,19 +1,14 @@
 <template>
-  <div
-    :class="prefixCls"
-    class="relative h-[100%]"
-    :style="{ backgroundImage: 'url(' + localImage + ')', backgroundSize: 'cover' }"
-  >
-    <div class="relative mx-auto h-full flex" style="margin: 0 auto">
+  <div :class="prefixCls" class="relative h-[100%]" :style="{ backgroundImage: 'url(' + localImage + ')' ,backgroundSize:'cover'}">
+    <div class="relative mx-auto h-full flex"  style=" margin: 0 auto;">
       <div
         class="relative flex-1 p-30px   lt-sm:p-10px overflow-x-hidden overflow-y-auto"
-        :class="`${prefixCls}__right`"
-      >
+        :class="`${prefixCls}__right`">     
         <!-- 右边的登录界面 -->
         <Transition appear enter-active-class="animate__animated animate__bounceInRight">
           <div
             :class="newClass"
-            class="pos-relative z-2 m-auto h-[calc(100%-60px)] w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px"
+            class="pos-relative z-2 m-auto h-[calc(100%-200px)] w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px"
           >
             <div class="bg-#fff dark:bg-[var(--login-bg-color)] b-rounded-20px px-20px">
               <!-- 账号登录 -->
@@ -25,23 +20,23 @@
     </div>
             <div class="tags">
               <div class="module cockpit">
-        <img :src="jsc" />
+               <img :src="jsc"/>
                 驾驶舱
               </div>
               <div class="module iot">
-        <img :src="wlzt" />
+                <img :src="wlzt"/>
                 物联中台
               </div>
               <div class="module data-center">
-        <img :src="sjzt" />
+                <img :src="sjzt"/>
                 数据中台
               </div>
               <div class="module report">
-        <img :src="znbb" />
+                <img :src="znbb"/>
                 智能报表
               </div>
               <div class="module digital-twin">
-        <img :src="szls" />
+                <img :src="szls"/>
                 数字孪生
               </div>
             </div>
@@ -60,6 +55,8 @@ import sjzt from '@/assets/imgs/sjzt.png'
 import szls from '@/assets/imgs/szls.png'
 import wlzt from '@/assets/imgs/wlzt.png'
 import znbb from '@/assets/imgs/znbb.png'
+
+// import { useRoute } from 'vue-router';
 import localImage from '@/assets/imgs/background.jpg'
 
 defineOptions({ name: 'Login' })
@@ -70,6 +67,7 @@ const { getPrefixCls } = useDesign()
 const prefixCls = getPrefixCls('login')
 const windowSize = useWindowSize()
 const loginAnimationData = ref(loginAnimation['default'])
+
 const leftStyle = computed(() => {
   const winW = windowSize.width.value
   const leftW = winW / 2
@@ -127,21 +125,21 @@ $prefix-cls: #{$namespace}-login;
   transform: translate(-50%, -50%) scale(0.7, 0.6);
 }
 
-.tags {
-  position: absolute;
-  bottom: 20px;
-  left: 50%;
+.tags{
+   position:absolute;
+   bottom:20px;
+   left:50%;
    display: grid;
-  width: 1000px;
-  transform: translateX(-50%);
+   width: 760px;
+   transform:translateX(-50%);
    grid-template-columns: 1fr 1fr 1fr;
    grid-template-rows: auto auto;
    gap: 20px;
 
   .module {
       display: flex;
-    padding: 20px;
-    font-size: 26px;
+      padding: 16px;
+      font-size: 22px;
       font-weight: 600;
       color: #fff;
       text-align: center;
@@ -152,8 +150,8 @@ $prefix-cls: #{$namespace}-login;
   }
 
   .module img {
-    width: 72px;
-    height: 72px;
+      width: 52px;
+      height: 52px;
       margin-bottom: 16px;
       object-fit: contain;
   }
@@ -163,9 +161,9 @@ $prefix-cls: #{$namespace}-login;
   .module.report,
   .module.digital-twin {
      flex-direction: row;
-    gap: 50px; /* 图标和文字之间的间距 */
-    img {
-      margin: 0;
+      gap: 32px; /* 图标和文字之间的间距 */
+    img{
+      margin:0
     }
   }
 
@@ -175,8 +173,8 @@ $prefix-cls: #{$namespace}-login;
       background: linear-gradient(180deg, rgb(109 147 245 / 75%), rgb(7 38 111 / 75%));
 
       img {
-      width: 130px;
-      height: 130px;
+          width: 96px;
+          height: 96px;
       }
   }