diff --git a/src/api/dataSearch.js b/src/api/dataSearch.js index 0d84883..29980c5 100644 --- a/src/api/dataSearch.js +++ b/src/api/dataSearch.js @@ -27,7 +27,7 @@ export function getDataSearch(query) { }) } -// 获取航次名称列表 +// 获取航次编号列表 export function voyageNameList(query) { return request({ url: '/voyage/reg/page.htm', diff --git a/src/views/dataSearch.vue b/src/views/dataSearch.vue index 4ecd146..e29d5e4 100644 --- a/src/views/dataSearch.vue +++ b/src/views/dataSearch.vue @@ -3,7 +3,7 @@
- 航次名称:{{ menu1 }} + 航次编号:{{ menu1 }} 平台类型:{{ menu2 }} 设备类型:{{ menu3 }} 数据样品类型:{{ menu4 }} @@ -26,7 +26,7 @@
-

编号规则:航次号_潜次号_设备类型_数据样品类型

+

编号规则:航次编号_平台类型_设备类型_数据样品类型

@@ -144,13 +144,13 @@
- - + + - + @@ -248,7 +248,7 @@ export default { filter: null, searchType: [ { - label: '航次名称', + label: '航次编号', disabled: false }, { @@ -273,7 +273,7 @@ export default { disabled: false }, ], - searchTypeValue: '航次名称', + searchTypeValue: '航次编号', radio: '航次', dialog1: false, tableData1: [], @@ -320,7 +320,7 @@ export default { this.dataList = [] }, searchTypeValue(val) { - if (val == '航次名称' || val == '平台类型' || val == '设备类型' || val == '数据样品类型') { + if (val == '航次编号' || val == '平台类型' || val == '设备类型' || val == '数据样品类型') { this.menuShow = true } else { this.menuShow = false @@ -380,7 +380,7 @@ export default { equipment_type: this.menu3, data_type: this.menu4 }).then(res => { - if (this.searchTypeValue === '航次名称') { + if (this.searchTypeValue === '航次编号') { this.dialog1 = true this.tableData1 = res.page.records } else if (this.searchTypeValue === '平台类型') { @@ -758,7 +758,12 @@ export default { > .rule-text { flex-shrink: 0; + margin-top: 12px; margin-bottom: 10px; + font-size: 14px; + color: #999; + white-space: nowrap; + overflow-x: auto; } > .left4 { @@ -997,8 +1002,4 @@ export default { background: none !important; } -.rule-text { - font-size: 16px; - color: #212121; -} diff --git a/src/views/dataTransfer/sampleViews/formViews/Platform.vue b/src/views/dataTransfer/sampleViews/formViews/Platform.vue index 1b4ec6b..0e6823f 100644 --- a/src/views/dataTransfer/sampleViews/formViews/Platform.vue +++ b/src/views/dataTransfer/sampleViews/formViews/Platform.vue @@ -10,7 +10,7 @@ - + @@ -304,7 +304,7 @@ export default { return { // 表单禁用 disabled: false, - // 航次名称下拉数据 + // 航次编号下拉数据 voyageOptions: [], // 平台类型下拉数据 platformDicts: [], @@ -411,7 +411,7 @@ export default { this.getVoyageList() }, methods: { - // 获取航次名称列表 + // 获取航次编号列表 getVoyageList() { voyageRegList().then(res => { this.voyageOptions = res.page.records @@ -453,7 +453,7 @@ export default { this.mainMemberOptions = mainArr }) }, - // 选择航次名称 + // 选择航次编号 changeVoyage(val) { this.getMemberList(val) this.showPlatform = val ? true : false diff --git a/src/views/dataTransfer/voyageReg.vue b/src/views/dataTransfer/voyageReg.vue index f127969..af3d4e7 100644 --- a/src/views/dataTransfer/voyageReg.vue +++ b/src/views/dataTransfer/voyageReg.vue @@ -32,7 +32,7 @@
- +