diff --git a/frontend/src/views/home/components/matchPopup.vue b/frontend/src/views/home/components/matchPopup.vue index 1ab6d4c..999ed91 100644 --- a/frontend/src/views/home/components/matchPopup.vue +++ b/frontend/src/views/home/components/matchPopup.vue @@ -2,17 +2,25 @@
- + - + + + + + + + + + + -
@@ -24,68 +32,80 @@ import { dialogSmall} from '@/utils/elementBind' import {dictPattern,dictTestState,dictReportState,dictResult,testPlanDataList,sourceDataList,deviceDataList,testSoureDataList,testScriptDataList,testErrSystDataList,planData,testFatherPlanList} from '@/api/plan/planData' -const value = ref() + const selectChange = (val: any) => { + console.log(val) + } +const value1 = ref() +const value2 = ref() +const value3 = ref() +const value4 = ref() const sourcesList = [ { value: '1', label: '高精度设备-PQV520-1', - disabled: true, + disabled: false, children: [ { value: '1-1', label: '监测点1', - disabled: true, + disabled: false, }, { value: '1-2', label: '监测点2', - disabled: true, + disabled: false, }, ], }, { value: '2', label: '高精度设备-PQV520-2', + disabled: false, children: [ { value: '2-1', label: '监测点1', + disabled: false, }, { value: '2-2', label: '监测点2', + disabled: false, }, ], }, { value: '3', label: '高精度设备-PQV520-3', - disabled: true, + disabled: false, children: [ { value: '3-1', label: '监测点1', - disabled: true, + disabled: false, }, { value: '3-2', label: '监测点2', - disabled: true, + disabled: false, }, ], }, { value: '4', label: '高精度设备-PQV520-4', + disabled: false, children: [ { value: '4-1', label: '监测点1', + disabled: false, }, { value: '4-2', label: '监测点2', + disabled: false, }, ], }, @@ -93,24 +113,6 @@ const sourcesList = [ const props = defineProps<{ visible: boolean; - dialogTitle: string; - isReadOnly: boolean, - formData: { - id:string; - name: string; - pattern: string; //模式,字典表(数字、模拟、比对) - father_Plan_Id: string; //父计划ID - source_Id: string;//检测源ID - dataSource_Id: string; //数据源ID - script_Id: string; //检测脚本ID - error_Sys_Id: string;//误差体系ID - device_Id: string;//被检设备ID - test_State: string; //检测状态 - report_State: string; //报告生成状态 - result: string;//检测结果 - state: number; //状态 - - }; }>(); const fatherPlanList = [ diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index e45eadc..322402e 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -180,6 +180,11 @@ :visible="dataCheckChangeErrSysDialogVisible" @update:visible="dataCheckChangeErrSysDialogVisible = $event" > + + @@ -211,6 +216,7 @@ const dialogFormVisible = ref(false) const reportDialogVisible = ref(false) const dataCheckDialogVisible = ref(false) const dataCheckChangeErrSysDialogVisible = ref(false) +const matchDialogVisible = ref(false) const dialogTitle = ref('手动检测') const dialogForm = ref({ id: '', @@ -590,7 +596,8 @@ const resetSearchForm = () => { }; //查询 const handleSearch = () => { - proTable.value?.getTableList(); + matchDialogVisible.value = true; + //proTable.value?.getTableList(); }; //重置 const handleRefresh = () => { diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue index 26cad45..a281dd8 100644 --- a/frontend/src/views/home/tabs/dashboard.vue +++ b/frontend/src/views/home/tabs/dashboard.vue @@ -291,7 +291,7 @@ const planDetail = () => { }; //功能选择css切换 const handleCheckFunction = (val: any) => { - // console.log("test",val); + editableTabsValue.value = '0'; form.value.activeChildTabs = 0; tabsList.value.map((item: any, index: any) => { @@ -303,7 +303,7 @@ const handleCheckFunction = (val: any) => { }); tabShow.value = false; - + console.log("test",val,tabLabel1.value); switch (val) { case 0://自动检测 tabLabel1.value = "设备检测"; @@ -320,11 +320,12 @@ const handleCheckFunction = (val: any) => { break; case 4://设备归档 tabLabel1.value = "设备归档"; + break; case 5://数据查询 tabLabel1.value = "数据查询"; break; } - + console.log("test",val,tabLabel1.value); form.value.activeTabs = val; };