diff --git a/src/app.vue b/src/app.vue index 9f69a44..1a9b861 100644 --- a/src/app.vue +++ b/src/app.vue @@ -9,13 +9,13 @@ onMounted(async () => { const res = await getStatus() console.log(res) console.log(systemStore.systemStatus) - // systemStore.updateSystemStatus(res) + systemStore.updateSystemStatus(res) startProgress() }) socket.init((data: System.SystemStatus) => { console.log(data) - // systemStore.updateSystemStatus(data) + systemStore.updateSystemStatus(data) }, 'status') const progress = ref(0) diff --git a/src/assets/images/background.svg b/src/assets/images/background.svg index e69de29..27a17e5 100644 --- a/src/assets/images/background.svg +++ b/src/assets/images/background.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/common/FTTable/index.vue b/src/components/common/FTTable/index.vue index 3126599..d4c1093 100644 --- a/src/components/common/FTTable/index.vue +++ b/src/components/common/FTTable/index.vue @@ -43,6 +43,7 @@ interface TableColumn { width?: number // 列宽 fixed?: 'left' | 'right' | undefined // 是否固定列 render?: (row: any) => VNode // 内容自定义 + selectable?: (row: any) => boolean } interface Btn { @@ -62,8 +63,8 @@ interface Search { } interface TableProp { - columns: TableColumn[] - getDataFn: (params: any) => Promise // 表格数据的接口 + columns?: TableColumn[] + getDataFn?: (params: any) => Promise // 表格数据的接口 mustInit?: boolean // 是否在mounted里执行getDataFn hasHeader?: boolean hasPage?: boolean @@ -165,6 +166,7 @@ defineExpose({ :width="column.width" :type="column.type" :fixed="column.fixed" + :selectable="column.selectable" >