diff --git a/frontend/.prettierrc b/frontend/.prettierrc new file mode 100644 index 0000000..5dc795d --- /dev/null +++ b/frontend/.prettierrc @@ -0,0 +1,11 @@ +{ + "singleQuote": true, + "trailingComma": "none", + "tabWidth": 4, + "printWidth": 120, + "useTabs": false, + "semi": false, + "arrowParens": "avoid", + "endOfLine": "lf", + "htmlWhitespaceSensitivity": "ignore" +} diff --git a/frontend/src/api/check/test/index.ts b/frontend/src/api/check/test/index.ts index a7a4de2..24328ef 100644 --- a/frontend/src/api/check/test/index.ts +++ b/frontend/src/api/check/test/index.ts @@ -23,11 +23,11 @@ export const getFormData = (params: { * @param params */ export const getTreeData = (params: { - scriptId: string, - devId: string, - devNum: string, - scriptType: string | null, - code: number, + scriptId?: string, + devId?: string, + devNum?: string, + scriptType?: string | null, + code?: number, }) => { return http.post("/result/treeData/", params, {loading: true}); } diff --git a/frontend/src/api/device/interface/testScript.ts b/frontend/src/api/device/interface/testScript.ts index 1bf5434..2c30ef0 100644 --- a/frontend/src/api/device/interface/testScript.ts +++ b/frontend/src/api/device/interface/testScript.ts @@ -28,6 +28,7 @@ export namespace TestScript { createTime?: string; updateBy?: string; updateTime?: string; + selectedValue?: string; } /** diff --git a/frontend/src/views/machine/testScript/components/testProjectPopup.vue b/frontend/src/views/machine/testScript/components/testProjectPopup.vue index a61ca3a..7623495 100644 --- a/frontend/src/views/machine/testScript/components/testProjectPopup.vue +++ b/frontend/src/views/machine/testScript/components/testProjectPopup.vue @@ -1,229 +1,260 @@ \ No newline at end of file + diff --git a/frontend/src/views/machine/testScript/components/testScriptDetail.vue b/frontend/src/views/machine/testScript/components/testScriptDetail.vue index 885399f..2bcf140 100644 --- a/frontend/src/views/machine/testScript/components/testScriptDetail.vue +++ b/frontend/src/views/machine/testScript/components/testScriptDetail.vue @@ -1,266 +1,288 @@ - - - - - diff --git a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue index 14c8b34..ebaf85f 100644 --- a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue +++ b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue @@ -6,18 +6,19 @@
- - + + - - + +
\ No newline at end of file + diff --git a/frontend/src/views/machine/testScript/components/testScriptPopup.vue b/frontend/src/views/machine/testScript/components/testScriptPopup.vue index fcfd36e..65421af 100644 --- a/frontend/src/views/machine/testScript/components/testScriptPopup.vue +++ b/frontend/src/views/machine/testScript/components/testScriptPopup.vue @@ -1,158 +1,170 @@ - - \ No newline at end of file + diff --git a/frontend/src/views/machine/testScript/components/testScriptVolCurTab.vue b/frontend/src/views/machine/testScript/components/testScriptVolCurTab.vue index daf74fc..fbe708f 100644 --- a/frontend/src/views/machine/testScript/components/testScriptVolCurTab.vue +++ b/frontend/src/views/machine/testScript/components/testScriptVolCurTab.vue @@ -1,120 +1,131 @@ \ No newline at end of file + diff --git a/frontend/src/views/machine/testScript/components/tree.vue b/frontend/src/views/machine/testScript/components/tree.vue new file mode 100644 index 0000000..8936a4b --- /dev/null +++ b/frontend/src/views/machine/testScript/components/tree.vue @@ -0,0 +1,25 @@ + + + diff --git a/frontend/src/views/machine/testScript/components/valueTypePopup.vue b/frontend/src/views/machine/testScript/components/valueTypePopup.vue index 9f7a840..c156a69 100644 --- a/frontend/src/views/machine/testScript/components/valueTypePopup.vue +++ b/frontend/src/views/machine/testScript/components/valueTypePopup.vue @@ -1,78 +1,67 @@ - - - \ No newline at end of file + diff --git a/frontend/src/views/machine/testScript/index.vue b/frontend/src/views/machine/testScript/index.vue index 37b6e41..cc6d7ab 100644 --- a/frontend/src/views/machine/testScript/index.vue +++ b/frontend/src/views/machine/testScript/index.vue @@ -1,158 +1,172 @@ -