diff --git a/src/hooks/commonDataComponents/useCompanyTempTopRes.ts b/src/hooks/commonDataComponents/useCompanyTempTopRes.ts index 3bbac332..a05e450e 100644 --- a/src/hooks/commonDataComponents/useCompanyTempTopRes.ts +++ b/src/hooks/commonDataComponents/useCompanyTempTopRes.ts @@ -23,7 +23,7 @@ export const handleCompanyTempTop =async (targetComponent: CreateComponentType) dimensions: ['名称','温度值'], source:res?.data.map((item: any)=>{ return { - '名称':`${item.node_name}-${item.dems_device_point.node_name}`, + '名称':`${item.node_name}`, '温度值':item.dems_device_point.node_value, } }) diff --git a/src/packages/components/Tables/Tables/TablesBasic/index.vue b/src/packages/components/Tables/Tables/TablesBasic/index.vue index 3307ff49..b80ad9c0 100644 --- a/src/packages/components/Tables/Tables/TablesBasic/index.vue +++ b/src/packages/components/Tables/Tables/TablesBasic/index.vue @@ -21,7 +21,10 @@ font-size: ${option.style.fontSize}px; border-width: ${option.style.border === 'on' ? option.style.borderWidth : 0}px; border-color: ${option.style.borderColor}; - border-style: ${option.style.borderStyle}`" + border-style: ${option.style.borderStyle}; + + ` + " :bordered="option.style.border === 'on'" :single-column="option.style.singleColumn === 'on'" :single-line="option.style.singleLine === 'on'" @@ -176,7 +179,8 @@ useChartCommonData(props.chartConfig, useChartEditStore) align-items: flex-end; } :deep(td) { - background-color:red; + text-align: left !important; + // padding-left: 10px; } :deep(.n-data-table-th) { background-color:#1A1D25;