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 @@
-
编号规则:航次号_潜次号_设备类型_数据样品类型
+
编号规则:航次编号_平台类型_设备类型_数据样品类型
-
-
+
+
-
+
@@ -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 @@
-
+
@@ -82,7 +82,7 @@
-
+
diff --git a/src/views/home.vue b/src/views/home.vue
index ecd6749..023c605 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -287,7 +287,7 @@ export default {
}
},
voyageList: [], // 航次列表数据
- currentVoyage: null, // 当前选中的航次名称
+ currentVoyage: null, // 当前选中的航次编号
highlightLayer: null, // 存储当前高亮图层实例
dataUpdateList: [],
sampleDataUpdateList: [],
@@ -368,7 +368,7 @@ export default {
// 处理表格选择项变化
handleSelectionChange(val) {
- // 获取新旧选中的航次名称数组
+ // 获取新旧选中的航次编号数组
const newVoyages = val.map(item => item.voyage_name);
const oldVoyages = this.multipleSelection.map(item => item.voyage_name);
diff --git a/src/views/sampleEntry.vue b/src/views/sampleEntry.vue
index beac569..0a9ce55 100644
--- a/src/views/sampleEntry.vue
+++ b/src/views/sampleEntry.vue
@@ -25,7 +25,7 @@
-
+
-
+
diff --git a/src/views/statistics/AuvStatistics.vue b/src/views/statistics/AuvStatistics.vue
index c4703ef..6b31a28 100644
--- a/src/views/statistics/AuvStatistics.vue
+++ b/src/views/statistics/AuvStatistics.vue
@@ -292,10 +292,11 @@ export default {
background-color: #ebf1f7;
.banner {
+ background-color: #012458;
background-image: url(../../../static/images/bannerny1.jpg);
background-repeat: no-repeat;
background-position: center;
- background-size: 100% 100%;
+ background-size: contain;
width: 100%;
height: 480px;
display: flex;
diff --git a/src/views/statistics/HovStatistics.vue b/src/views/statistics/HovStatistics.vue
index d1bb7b3..80f0f6e 100644
--- a/src/views/statistics/HovStatistics.vue
+++ b/src/views/statistics/HovStatistics.vue
@@ -292,10 +292,11 @@ export default {
background-color: #ebf1f7;
.banner {
+ background-color: #012458;
background-image: url(../../../static/images/bannerny1.jpg);
background-repeat: no-repeat;
background-position: center;
- background-size: 100% 100%;
+ background-size: contain;
width: 100%;
height: 480px;
display: flex;
diff --git a/src/views/statistics/RovStatistics.vue b/src/views/statistics/RovStatistics.vue
index 2d8a171..1950f05 100644
--- a/src/views/statistics/RovStatistics.vue
+++ b/src/views/statistics/RovStatistics.vue
@@ -291,10 +291,11 @@ export default {
background-color: #ebf1f7;
.banner {
+ background-color: #012458;
background-image: url(../../../static/images/bannerny1.jpg);
background-repeat: no-repeat;
background-position: center;
- background-size: 100% 100%;
+ background-size: contain;
width: 100%;
height: 480px;
display: flex;
diff --git a/src/views/statistics/ShipStatistics.vue b/src/views/statistics/ShipStatistics.vue
index 010b23c..bab6120 100644
--- a/src/views/statistics/ShipStatistics.vue
+++ b/src/views/statistics/ShipStatistics.vue
@@ -70,14 +70,13 @@