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

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

@@ -254,6 +254,9 @@ const initTable = async () => {
       amountFieds.value[item.isAmount]=config
       tableOption.value.showSummary=true
     }
+    if(item.width){
+      config.width=item.width
+    }
     if(item.isDimension=='Y'){
       dimensionFields.value[config.prop]=config
       hideFeilds.value[config.prop]=item.isHideDimension

src/views/Login/Login.vue

@@ -14,10 +14,34 @@
               <!-- 账号登录 -->
               <LoginForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
             </div>
+
+            
           </div>
         </Transition>
       </div>
     </div>
+            <div class="tags">
+              <div class="module cockpit">
+               <img :src="jsc"/>
+                驾驶舱
+              </div>
+              <div class="module iot">
+                <img :src="wlzt"/>
+                物联中台
+              </div>
+              <div class="module data-center">
+                <img :src="sjzt"/>
+                数据中台
+              </div>
+              <div class="module report">
+                <img :src="znbb"/>
+                智能报表
+              </div>
+              <div class="module digital-twin">
+                <img :src="szls"/>
+                数字孪生
+              </div>
+            </div>
   </div>
 </template>
 <script lang="ts" setup>
@@ -28,6 +52,11 @@ import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
 import { useWindowSize } from '@vueuse/core'
 import { LoginForm } from './components'
 import * as loginAnimation from '@/assets/json/login_left.json'
+import jsc from '@/assets/imgs/jsc.png'
+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'
@@ -100,4 +129,68 @@ $prefix-cls: #{$namespace}-login;
   left: 50%;
   transform: translate(-50%, -50%) scale(0.7, 0.6);
 }
+.tags{
+   display: grid;
+   grid-template-columns: 1fr 1fr 1fr;
+   grid-template-rows: auto auto;
+   gap: 20px;
+
+   width: 1000px;
+   position:absolute;
+   left:790px;
+   bottom:40px;
+  .module {
+      border-radius: 4px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      color: #fff;
+      font-size: 26px;
+      font-weight: 600;
+      padding: 20px;
+      text-align: center;
+  }
+  .module img {
+      width: 80px;
+      height: 80px;
+      margin-bottom: 16px;
+      object-fit: contain;
+  }
+  .module.iot,
+  .module.data-center,
+  .module.report,
+  .module.digital-twin {
+     flex-direction: row;
+      gap: 50px; /* 图标和文字之间的间距 */
+    img{
+      margin:0
+    }
+  }
+  /* 驾驶舱：深蓝色渐变 */
+  .module.cockpit {
+      grid-row: 1 / 3;
+      img {
+          width: 140px;
+          height: 140px;
+      }
+      background: linear-gradient(180deg, rgba(109, 147, 245, 0.75), rgba(7,38,111, 0.75));
+  }
+  /* 物联中台：中蓝色渐变 */
+  .module.iot {
+      background: linear-gradient(180deg, rgba(130, 156, 223, 0.75), rgba(7,38,111, 0.75));
+  }
+  /* 数据中台：青绿色渐变 */
+  .module.data-center {
+      background: linear-gradient(180deg, rgba(46, 192, 182, 0.75), rgba(40, 180, 170, 0.75));
+  }
+  /* 智能报表：绿色渐变 */
+  .module.report {
+      background: linear-gradient(180deg, rgba(77, 212, 122, 0.75), rgba(60, 180, 100, 0.75));
+  }
+  /* 数字孪生：浅蓝色渐变 */
+  .module.digital-twin {
+      background: linear-gradient(180deg, rgba(111, 181, 235, 0.75), rgba(60, 140, 200, 0.75));
+  }
+}
 </style>

src/views/lowdesign/reportDesign/designData.ts

@@ -152,6 +152,8 @@ const infoColumn = {
     parentFieldName: { title: '父字段名称', width: 120, editRender: { name: 'LowSelect', dicData: [], filterable: true,allowCreate:true, clearable: true } },
     labelI18n: { title: '国际化配置', width: 140, editRender: { name: 'LowMonacoEditorInput', events: {} } },
     fieldType: { title: '字段类型', minWidth: 100, editRender: { name: 'LowSelect', verifyEdit: true, dicData: dicObj.fieldType, dicObj: getDicObj('fieldType') } },
+    width: { title: '列宽', width: 120, align: "center", editRender: { name: 'LowInput', verifyEdit: true } },
+    
     isFixedColumn: { title: '固定列', width: 75, align: "center", editRender: { name: 'LowCheckbox' } },
     fixedColumnValue: { title: '固定列内容', width: 110, align: "center", editRender: { name: 'LowButton', disabled: (row) => row.isFixedColumn !== 'Y', buttonText: '配置内容', buttonType: 'primary', buttonSize: 'small', events: {} } },
     queryIsDb: { title: '接口查询', width: 75, align: "center", editRender: { name: 'LowCheckbox' } },