From 580f832a86103adb632e71180bbab358d7adb56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=90=AA?= <727393967@qq.com> Date: Mon, 21 Oct 2024 17:17:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A9=BE=E7=9A=84=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=8E=E6=BD=9C=E8=88=AA=E5=91=98=E4=B8=AD?= =?UTF-8?q?=E9=80=89=EF=BC=9B=E9=80=89=E5=A5=BD=E5=B7=A6=E3=80=81=E5=8F=B3?= =?UTF-8?q?=E8=88=B7=E4=BA=BA=E5=91=98=EF=BC=8C=E4=B8=8B=E6=96=B9=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=86=99=EF=BC=9B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A3=80=E7=B4=A2=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BB=A5=E5=BC=B9=E7=AA=97=E5=BD=A2=E5=BC=8F=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataSearch.vue | 123 +++++++++++------- src/views/dataTransfer/sampleDataset.vue | 3 +- .../sampleViews/formViews/Platform.vue | 35 ++++- .../sampleViews/formViews/SampleList.vue | 2 +- 4 files changed, 112 insertions(+), 51 deletions(-) diff --git a/src/views/dataSearch.vue b/src/views/dataSearch.vue index 1ff7f99..b354189 100644 --- a/src/views/dataSearch.vue +++ b/src/views/dataSearch.vue @@ -25,34 +25,6 @@ 航次 -
-
-
请选择航次名称
-
{{ - item.name }}
-
-
-
-
-
请选择平台类型
-
{{ - item.name + '(' + item.value + ')' }}
-
-
-
-
-
请选择设备类型
-
{{ - item.name + '(' + item.value + ')' }}
-
-
-
-
-
请选择数据样品类型
-
{{ - item.name + '(' + item.value + ')' }}
-
-
@@ -156,6 +128,53 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -210,14 +229,22 @@ export default { ], searchTypeValue: '航次名称', radio: '航次', + dialog1: false, + tableData1: [], + total1: 0, + dialog2: false, + tableData2: [], + total2: 0, + dialog3: false, + tableData3: [], + total3: 0, + dialog4: false, + tableData4: [], + total4: 0, menu1: '', menu2: '', menu3: '', menu4: '', - menuList1: [], - menuList2: [], - menuList3: [], - menuList4: [], dataList: [], searchValue: '', menuShow: true, @@ -311,51 +338,59 @@ export default { data_type: this.menu4 }).then(res => { if (this.searchTypeValue === '航次名称') { - this.menuList1 = res.page.records + this.dialog1 = true + this.tableData1 = res.page.records } else if (this.searchTypeValue === '平台类型') { - this.menuList2 = res.page.records + this.dialog2 = true + this.tableData2 = res.page.records } else if (this.searchTypeValue === '设备类型') { - this.menuList3 = res.page.records + this.dialog3 = true + this.tableData3 = res.page.records } else if (this.searchTypeValue === '数据样品类型') { - this.menuList4 = res.page.records + this.dialog4 = true + this.tableData4 = res.page.records } }) }, - selectMenu1(item) { + handleCurrentChange1(item) { this.menu1 = item.name - this.menuList1 = [] + this.tableData1 = [] this.searchType[0].disabled = true const str = this.searchType.find(item => { return item.disabled !== true }) this.searchTypeValue = str.label + this.dialog1 = false }, - selectMenu2(item) { + handleCurrentChange2(item) { this.menu2 = item.name - this.menuList2 = [] + this.tableData2 = [] this.searchType[1].disabled = true const str = this.searchType.find(item => { return item.disabled !== true }) this.searchTypeValue = str.label + this.dialog2 = false }, - selectMenu3(item) { + handleCurrentChange3(item) { this.menu3 = item.name - this.menuList3 = [] + this.tableData3 = [] this.searchType[3].disabled = true const str = this.searchType.find(item => { return item.disabled !== true }) this.searchTypeValue = str.label + this.dialog3 = false }, - selectMenu4(item) { + handleCurrentChange4(item) { this.menu4 = item.name - this.menuList4 = [] + this.tableData4 = [] this.searchType[4].disabled = true const str = this.searchType.find(item => { return item.disabled !== true }) this.searchTypeValue = str.label + this.dialog4 = false }, // 获取左侧航次列表 getList() { diff --git a/src/views/dataTransfer/sampleDataset.vue b/src/views/dataTransfer/sampleDataset.vue index c29652c..7ba7542 100644 --- a/src/views/dataTransfer/sampleDataset.vue +++ b/src/views/dataTransfer/sampleDataset.vue @@ -34,8 +34,9 @@ - + - - + + - - + + @@ -308,6 +308,8 @@ export default { voyageOptions: [], // 平台类型下拉数据 platformDicts: [], + // 主驾人员下拉数据 + mainMemberOptions: [], // 参航人员下拉数据 memberOptions: [], // 平台信息表单数据 @@ -442,6 +444,11 @@ export default { getMemberList(id) { memberList({ voyage_id: id }).then(res => { this.memberOptions = res.array + this.mainMemberOptions = this.memberOptions.filter(obj => { + if (obj.member_dept.includes('潜航员')) { + return obj + } + }) }) }, // 选择航次名称 @@ -495,6 +502,24 @@ export default { this.$refs['form'].resetFields() this.showPlatform = false this.currentPlatform = '' + }, + // 选择左舷人员 + changeLeft(value) { + const arr = this.memberOptions.filter(obj => { + if (obj.member_name.includes(value)) { + return obj + } + }) + this.form.driver_unit_left = arr[0].member_unit + }, + // 选择右舷人员 + changeRight(value) { + const arr = this.memberOptions.filter(obj => { + if (obj.member_name.includes(value)) { + return obj + } + }) + this.form.driver_unit_right = arr[0].member_unit } } } diff --git a/src/views/dataTransfer/sampleViews/formViews/SampleList.vue b/src/views/dataTransfer/sampleViews/formViews/SampleList.vue index 561e2ff..9ec3637 100644 --- a/src/views/dataTransfer/sampleViews/formViews/SampleList.vue +++ b/src/views/dataTransfer/sampleViews/formViews/SampleList.vue @@ -2,7 +2,7 @@
{{ row.job_type }}数据样品 [{{ row.dataset_name }}] - 新增样品 + 新增数据样品