diff --git a/frontend/src/api/device/interface/device.ts b/frontend/src/api/device/interface/device.ts index 8143ff8..8135666 100644 --- a/frontend/src/api/device/interface/device.ts +++ b/frontend/src/api/device/interface/device.ts @@ -44,7 +44,6 @@ export namespace Device { checkState?: number| null; //检测状态 checkResult?: number| null; //检测结果 reportState?: number| null; //报告状态 - documentState?: number| null; //归档状态 reportPath?: string| null; //报告路径 qRCode?: string| null; //设备关键信息二维码 reCheckNum: number; //复检次数 diff --git a/frontend/src/api/home/channelsTest/index.ts b/frontend/src/api/home/channelsTest/index.ts new file mode 100644 index 0000000..6a51f42 --- /dev/null +++ b/frontend/src/api/home/channelsTest/index.ts @@ -0,0 +1,6 @@ +import http from "@/api"; +import {ChannelsTest} from "@/api/home/interface/channelsTest"; + +export const getBigTestItem = () => { + return http.get(''); +} \ No newline at end of file diff --git a/frontend/src/api/home/interface/channelsTest.ts b/frontend/src/api/home/interface/channelsTest.ts new file mode 100644 index 0000000..92c6d18 --- /dev/null +++ b/frontend/src/api/home/interface/channelsTest.ts @@ -0,0 +1,22 @@ +// 系数校准模块 +export namespace ChannelsTest { + + // 系数校准列表 + export interface CoefficientVO { + monitorNum: string;//监测点序号 + desc: string;//描述 + aVuData:string;//电压通道A数据 + aVuXi:string;//电压通道A系数 + bVuData:string;//电压通道B数据 + bVuXi:number;//电压通道B系数 + cVuData:number;//电压通道C数据 + cVuXi?:string;//电压通道C系数 + aIeData?:string;//电流通道A数据 + aIeXi?:string;//电流通道A系数 + bIeData?:string;//电流通道B数据 + bIeXi?:string;//电流通道B系数 + cIeData?:string;//电流通道C数据 + cIeXi?:string;//电流通道C系数 + } + +} \ No newline at end of file diff --git a/frontend/src/components/echarts/pie/default.vue b/frontend/src/components/echarts/pie/default.vue index d4d5af7..d151910 100644 --- a/frontend/src/components/echarts/pie/default.vue +++ b/frontend/src/components/echarts/pie/default.vue @@ -35,6 +35,7 @@ const init = () => { isRadius: false, //是否圆角 isSpace: false, //是否显示间隔 isLabelLine: true, //是否显示引导线 + titleFontSize: '18px', //标题字体大小 ...props.customData, }; legendData.value = { @@ -49,6 +50,9 @@ const init = () => { title: { text: customData.value.title, left: customData.value.textAlign, + textStyle: { + fontSize: customData.value.titleFontSize, // 使用 titleFontSize 属性 + }, }, legend:legendData.value, // legend: { diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue index 5e663b6..726cd95 100644 --- a/frontend/src/views/home/components/channelsTest.vue +++ b/frontend/src/views/home/components/channelsTest.vue @@ -22,33 +22,33 @@ @@ -146,12 +146,11 @@ const webMsgSend = toRef(props, 'webMsgSend'); watch(webMsgSend,function (newValue,oldValue){ switch (newValue.requestId){ + } }) - - // 定义 TableDataItem 接口 interface TableDataItem { id: string; @@ -169,8 +168,6 @@ interface TableDataItem { IbChannel?: number | string; IcData?: number | string; IcChannel?: number | string; - Result?: string | string; - updateTime?: string; } const dataTemplates3 = [ @@ -542,6 +539,7 @@ const activities = [ qualified.value = 0 active.value = 0 dialogVisible.value = false + editableTabsValue.value = '0' } const getTableDataForChannel = (index: number): any[] => { @@ -616,6 +614,7 @@ const checkForErrors = (data: TableDataItem[]): boolean => { }; const handleSubmit = async () => { + debugger // 初始化 currentTableData let isTimer2Completed = false; // 初始化 loadingStates 为 true @@ -843,6 +842,10 @@ const initializeTableData = (templates: TableDataItem[], index: number): Ref diff --git a/frontend/src/views/home/components/channelsTestTable.vue b/frontend/src/views/home/components/channelsTestTable.vue index 3fbccd4..b12e8e7 100644 --- a/frontend/src/views/home/components/channelsTestTable.vue +++ b/frontend/src/views/home/components/channelsTestTable.vue @@ -7,7 +7,6 @@ max-height="400px" :span-method="objectSpanMethod"> - @@ -21,7 +20,13 @@ - + + @@ -47,7 +51,13 @@ - + + - + + - + + - + + - + + diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index f2b590a..9f00552 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -18,7 +18,7 @@