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

src/views/DataCollect/Collector/Point/Scan/Table.vue

@@ -1,10 +1,22 @@
 <template>
     <j-form class="table" ref="formTableRef" :model="modelRef">
         <j-table
+            v-if="modelRef.dataSource.length !== 0"
             :dataSource="modelRef.dataSource"
             :columns="FormTableColumns"
             :scroll="{ x: 1000, y: 550 }"
         >
+            <template #headerCell="{ column }">
+                <template
+                    v-if="column.key === 'nodeId' || column.key === 'action'"
+                >
+                    <span> {{ column.title }} </span>
+                </template>
+                <template v-else>
+                    <span> {{ column.title }} </span>
+                    <span style="margin-left: 5px; color: red">*</span>
+                </template>
+            </template>
             <template #bodyCell="{ column: { dataIndex }, record, index }">
                 <template v-if="dataIndex === 'name'">
                     <j-form-item
@@ -24,15 +36,20 @@
                     </j-form-item>
                 </template>
                 <template v-if="dataIndex === 'id'">
-                    <j-form-item :name="['dataSource', index, 'id']">
+                    <j-form-item
+                        v-show="false"
+                        :name="['dataSource', index, 'id']"
+                    >
                         <j-input
                             v-model:value="record[dataIndex]"
                             disabled
                             :bordered="false"
                         ></j-input>
                     </j-form-item>
+                    <div style="margin: -24px 0 0 10px">
+                        {{ record[dataIndex] }}
+                    </div>
                 </template>
-
                 <template v-if="dataIndex === 'accessModes'">
                     <j-form-item
                         class="form-item"
@@ -163,12 +180,15 @@
                             title="确认删除"
                             @confirm="clickDelete(record.id)"
                         >
-                            <a><AIcon type="DeleteOutlined" /></a>
+                            <a style="color: red"
+                                ><AIcon type="DeleteOutlined"
+                            /></a>
                         </j-popconfirm>
                     </j-tooltip>
                 </template>
             </template>
         </j-table>
+        <j-empty v-else style="margin-top: 10%" />
     </j-form>
 </template>
 
@@ -286,7 +306,20 @@ watch(
 </script>
 
 <style lang="less" scoped>
-.table {}
+.table {
+    :deep(.ant-table-tbody) {
+        .ant-table-cell {
+            padding: 24px 0 0 0;
+        }
+        .ant-table-cell-fix-right-first {
+            padding: 0 0 0 20px;
+        }
+    }
+    :deep(.ant-pagination) {
+        display: none;
+    }
+}
+
 .form-item {
     display: flex;
 }

src/views/DataCollect/Collector/Point/Scan/Tree.vue

@@ -10,6 +10,8 @@
                 :load-data="onLoadData"
                 :tree-data="treeData"
                 v-model:checkedKeys="checkedKeys"
+                :selectedKeys="selectedKeys"
+                :selectable="false"
                 checkable
                 @check="onCheck"
                 :height="600"
@@ -26,7 +28,7 @@
                     </span>
                 </template>
             </j-tree>
-            <j-empty v-else />
+            <j-empty v-else style="margin-top: 22%" />
         </j-spin>
     </div>
 </template>
@@ -216,13 +218,16 @@ watch(
 .tree-content {
     padding: 16px;
     padding-left: 0;
+    min-width: 180px;
     .tree-header {
         margin-bottom: 16px;
         display: flex;
         justify-content: space-between;
     }
     .tree-selected {
-        color: #1d39c4;
+        padding: 2px 5px;
+        background-color: #d6e4ff;
+        border-radius: 2px;
     }
     .tree-title {
         color: black;

src/views/DataCollect/Collector/data.ts

@@ -170,38 +170,39 @@ export const FormTableColumns = [
         title: '名称',
         dataIndex: 'name',
         key: 'name',
-        width: 200,
+        width: 140,
         fixed: 'left',
     },
     {
         title: 'nodeId',
         dataIndex: 'id',
         key: 'id',
+        width: 180,
         ellipsis: true,
     },
     {
         title: '访问类型',
         dataIndex: 'accessModes',
         key: 'accessModes',
-        width: 300,
+        width: 260,
     },
     {
         title: '采集频率',
         key: 'interval',
         dataIndex: 'interval',
-        width: 260,
+        width: 220,
     },
     {
         title: '只推送变化的数据',
         key: 'features',
         dataIndex: 'features',
-        width: 200,
+        width: 160,
     },
     {
         title: '操作',
         key: 'action',
         dataIndex: 'action',
         fixed: 'right',
-        width: 80,
+        width: 60,
     },
 ];

src/views/DataCollect/Dashboard/components/Card.vue

@@ -132,7 +132,6 @@ watch(
     height: 100%;
     padding: 24px;
     background-color: #fff;
-    box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
     border-radius: 2px;
     margin-top: 24px;
 }

src/views/link/DashBoard/components/Cpu.vue

@@ -189,7 +189,7 @@ watch(
     height: 100%;
     padding: 24px;
     background-color: #fff;
-    box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
+    // box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
     border-radius: 2px;
 }
 .header {

src/views/link/DashBoard/components/Jvm.vue

@@ -193,7 +193,7 @@ watch(
     height: 100%;
     padding: 24px;
     background-color: #fff;
-    box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
+    // box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
     border-radius: 2px;
 }
 .header {

src/views/link/DashBoard/components/Network.vue

@@ -209,7 +209,7 @@ watch(
     height: 100%;
     padding: 24px;
     background-color: #fff;
-    box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
+    // box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
     border-radius: 2px;
 }
 .header {

src/views/link/DashBoard/components/TopCard.vue

@@ -129,7 +129,7 @@ watch(
     flex-wrap: wrap;
     height: 100%;
     background-color: #fff;
-    box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
+    // box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
     border-radius: 2px;
     justify-content: space-between;
     .dash-board-item {

src/views/link/DashBoard/components/TopEchartsItemNode.vue

@@ -122,8 +122,9 @@ export default {
     height: 150px;
     padding: 16px;
     background-color: #fff;
-    box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
+    // box-shadow: 0px 2.73036px 5.46071px rgba(31, 89, 245, 0.2);
-
+    border: 1px solid #e0e4e8;
+    border-radius: 2px;
     .echarts-item-left {
         display: flex;
         flex-direction: column;