Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

src/views/device/Product/Detail/index.vue

@@ -48,6 +48,8 @@
                     </div>
                 </div>
             </div>
+        </template>
+        <template #content>
             <div style="padding-top: 10px">
                 <j-descriptions size="small" :column="4">
                     <j-descriptions-item

src/views/init-home/Basic/index.vue

@@ -2,7 +2,7 @@
 <template>
     <j-form layout="vertical" :model="form" ref="formBasicRef">
         <j-row :span="24" :gutter="24">
-            <j-col :span="10">
+            <j-col :span="12">
                 <j-form-item
                     label="系统名称"
                     name="title"
@@ -193,7 +193,7 @@
                     </j-col>
                 </j-row>
             </j-col>
-            <j-col :span="14">
+            <j-col :span="12">
                 <j-form-item label="登录背景图">
                     <div class="upload-image-warp-back">
                         <div class="upload-image-border-back">

src/views/init-home/Role/index.vue

@@ -183,6 +183,7 @@ defineExpose({
                 flex: 1 1 auto;
                 font-weight: 700;
                 font-size: 16px;
+                text-align: center;
             }
         }
         .role-item-content {

src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue

@@ -20,7 +20,7 @@
                 </j-col>
             </j-row>
             <j-form-item label="级别" name="level">
-                <j-radio-group v-model:value="form.level">
+                <j-radio-group v-model:value="form.level" class="levelSelect">
                     <j-radio-button
                         v-for="(item, index) in levelOption"
                         :key="index"
@@ -199,7 +199,11 @@ queryData();
 <style lang="less" scoped>
 .ant-radio-button-wrapper {
     margin: 10px 15px 0 0;
-    width: 125px;
+    width: 20%;
     height: 100%;
 }
+.levelSelect{
+    display: flex;
+    width: 100%;
+}
 </style>

src/views/rule-engine/Alarm/Log/TabComponent/indev.vue

@@ -62,8 +62,8 @@
                             </span>
                         </Ellipsis>
                         <j-row :gutter="24">
-                            <j-col :span="8">
+                            <j-col :span="8" class="content-left">
-                                <div class="content-des-title">
+                                <div class="content-left-title">
                                     {{ titleMap.get(slotProps.targetType) }}
                                 </div>
                                 <Ellipsis
@@ -73,7 +73,7 @@
                                 >
                             </j-col>
                             <j-col :span="8">
-                                <div class="content-des-title">
+                                <div class="content-right-title">
                                     最近告警时间
                                 </div>
                                 <Ellipsis
@@ -87,7 +87,7 @@
                                 >
                             </j-col>
                             <j-col :span="8">
-                                <div class="content-des-title">状态</div>
+                                <div class="content-right-title">状态</div>
                                 <BadgeStatus
                                     :status="slotProps.state.value"
                                     :statusName="{
@@ -287,7 +287,7 @@ const orgCol = [
     },
 ];
 
-let params = ref({
+let params:any = ref({
     sorts: [{ name: 'alarmTime', order: 'desc' }],
     terms: [],
 });
@@ -432,4 +432,14 @@ const closeLog = () => {
 };
 </script>
 <style lang="less" scoped>
+.content-left{
+    border-right: .2px solid rgba(0,0,0,0.2);
+}
+.content-right-title{
+    color: #666;
+    font-size: 12px
+}
+.content-left-title{
+    font-size: 18px
+}
 </style>