From 7c5103ebb4155016eaa9c28381fdc8bd03e59c38 Mon Sep 17 00:00:00 2001 From: sjl <1716605279@qq.com> Date: Wed, 23 Oct 2024 19:30:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E8=AF=AF=E5=B7=AE=E4=BD=93=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 1 + frontend/src/api/error/errorData.ts | 36 +++ frontend/src/api/error/interface/index.ts | 17 + frontend/src/components/TimeControl/index.vue | 205 ++++++------ .../resource/components/ResourceDialog.vue} | 6 +- .../src/views/authority/resource/index.vue | 43 ++- frontend/src/views/log/index.vue | 13 +- .../components/Error standardDialog.vue | 91 ++++++ .../components/ErrorSystemDialog.vue | 294 ++++++++++++++++++ .../components/IndicatorTypeDialog.vue | 91 ++++++ .../src/views/machine/errorSystem/index.vue | 104 +++++++ 11 files changed, 791 insertions(+), 110 deletions(-) create mode 100644 frontend/src/api/error/errorData.ts create mode 100644 frontend/src/api/error/interface/index.ts rename frontend/src/{components/ResourceDialog/index.vue => views/authority/resource/components/ResourceDialog.vue} (94%) create mode 100644 frontend/src/views/machine/errorSystem/components/Error standardDialog.vue create mode 100644 frontend/src/views/machine/errorSystem/components/ErrorSystemDialog.vue create mode 100644 frontend/src/views/machine/errorSystem/components/IndicatorTypeDialog.vue create mode 100644 frontend/src/views/machine/errorSystem/index.vue diff --git a/.vscode/settings.json b/.vscode/settings.json index 12d3367..9d8722b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "cSpell.words": [ "daterange", + "errordata", "logdata", "resourcedata", "resourcename", diff --git a/frontend/src/api/error/errorData.ts b/frontend/src/api/error/errorData.ts new file mode 100644 index 0000000..ecfd166 --- /dev/null +++ b/frontend/src/api/error/errorData.ts @@ -0,0 +1,36 @@ +import type {ErrorSystem} from "./interface" + +const errordata = ref([ + { + 'id': '1', + 'name': 'Q/GDW 1650.2- 2016', + 'year':'2016', + 'level':'A级', + 'details': [ + { measured: '详细1-1', deviceLevel: '详细1-2', condition: '详细1-3', maxErrorValue: '详细1-4' }, + { measured: '详细1-5', deviceLevel: '详细1-6', condition: '详细1-7', maxErrorValue: '详细1-8' }, + ], + }, + { + 'id': '2', + 'name': 'Q/GDW 10650.2 - 2021', + 'year':'2021', + 'level':'A级', + 'details': [ + { measured: '详细1-1', deviceLevel: '详细1-2', condition: '详细1-3', maxErrorValue: '详细1-4' }, + { measured: '详细1-5', deviceLevel: '详细1-6', condition: '详细1-7', maxErrorValue: '详细1-8' }, + ], + }, + { + 'id': '3', + 'name': 'GBT 19862 - 2016', + 'year':'2016', + 'level':'A级', + 'details': [ + { measured: '详细1-1', deviceLevel: '详细1-2', condition: '详细1-3', maxErrorValue: '详细1-4' }, + { measured: '详细1-5', deviceLevel: '详细1-6', condition: '详细1-7', maxErrorValue: '详细1-8' }, + ], + }, + ]) + + export default errordata \ No newline at end of file diff --git a/frontend/src/api/error/interface/index.ts b/frontend/src/api/error/interface/index.ts new file mode 100644 index 0000000..5f3c9d6 --- /dev/null +++ b/frontend/src/api/error/interface/index.ts @@ -0,0 +1,17 @@ +// 误差体系模块 +export namespace ErrorSystem { + // 误差体系列表 + export interface ErrorSystemList { + id: string;//误差体系表Id + name: string;//误差体系名称 + year:string;//标准实施年份 + level:string;//使用设备等级 + details?: Array<{ + measured: string;//被测量 + deviceLevel: string;//检测装置级别 + condition: string;//测量条件 + maxErrorValue: string;//最大误差 + }>; // 详细信息 + } + + } \ No newline at end of file diff --git a/frontend/src/components/TimeControl/index.vue b/frontend/src/components/TimeControl/index.vue index 41b737e..6f0962f 100644 --- a/frontend/src/components/TimeControl/index.vue +++ b/frontend/src/components/TimeControl/index.vue @@ -6,14 +6,13 @@ placeholder='选择时间单位' @change='handleChange' > - - - - - - - - + + @@ -23,6 +22,7 @@ v-model='startDate' type='date' placeholder='起始时间' + :disabled-date="disableStartDate" :readonly="timeUnit != '自定义'" > ~ @@ -31,6 +31,7 @@ v-model='endDate' type='date' placeholder='结束时间' + :disabled-date="disableEndDate" :readonly="timeUnit !== '自定义'" > @@ -59,133 +60,159 @@ - \ No newline at end of file diff --git a/frontend/src/views/machine/errorSystem/components/IndicatorTypeDialog.vue b/frontend/src/views/machine/errorSystem/components/IndicatorTypeDialog.vue new file mode 100644 index 0000000..f49b6aa --- /dev/null +++ b/frontend/src/views/machine/errorSystem/components/IndicatorTypeDialog.vue @@ -0,0 +1,91 @@ + + + + diff --git a/frontend/src/views/machine/errorSystem/index.vue b/frontend/src/views/machine/errorSystem/index.vue new file mode 100644 index 0000000..f6f69ce --- /dev/null +++ b/frontend/src/views/machine/errorSystem/index.vue @@ -0,0 +1,104 @@ + + + + + \ No newline at end of file