diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..d73758c Binary files /dev/null and b/dist.zip differ diff --git a/src/views/dataSearch.vue b/src/views/dataSearch.vue index e29d5e4..a0abec3 100644 --- a/src/views/dataSearch.vue +++ b/src/views/dataSearch.vue @@ -58,21 +58,16 @@ {{ item.diving_sn }} -
+

设备类型:

{{ item.equipment_type }}
-
+

数据样品类型:

{{ item.data_type }}
-
-

作业类型:

- {{ item.job_type }} -
-
@@ -265,9 +260,6 @@ export default { { label: '航次首席' }, - { - label: '数据集名称' - }, { label: '数据样品类型', disabled: false @@ -349,9 +341,9 @@ export default { }, menu4(val) { if (val) { - this.searchType[4].disabled = true + this.searchType[5].disabled = true } else { - this.searchType[4].disabled = false + this.searchType[5].disabled = false } }, }, @@ -428,7 +420,7 @@ export default { handleCurrentChange4(item) { this.menu4 = item.name this.tableData4 = [] - this.searchType[4].disabled = true + this.searchType[5].disabled = true const str = this.searchType.find(item => { return item.disabled !== true }) @@ -770,6 +762,12 @@ export default { flex: 1; min-height: 0; } + + /** 数据样品集:设备类型、数据样品类型各占一整行 */ + .left4_list .list1--block { + width: 100%; + flex-basis: 100%; + } } /** 筛选结果列表:占满左侧剩余高度并独立滚动 */ diff --git a/src/views/dicManage/dataSampleType.vue b/src/views/dicManage/dataSampleType.vue index 7f4a3d1..339cffc 100644 --- a/src/views/dicManage/dataSampleType.vue +++ b/src/views/dicManage/dataSampleType.vue @@ -10,7 +10,7 @@
diff --git a/src/views/dicManage/docType.vue b/src/views/dicManage/docType.vue index 6c88cf1..9e20e99 100644 --- a/src/views/dicManage/docType.vue +++ b/src/views/dicManage/docType.vue @@ -10,7 +10,7 @@
diff --git a/src/views/dicManage/fundingAgencies.vue b/src/views/dicManage/fundingAgencies.vue index 8012bf6..530bb46 100644 --- a/src/views/dicManage/fundingAgencies.vue +++ b/src/views/dicManage/fundingAgencies.vue @@ -10,7 +10,7 @@
diff --git a/src/views/dicManage/platformType.vue b/src/views/dicManage/platformType.vue index 801bfcb..b0fbe1d 100644 --- a/src/views/dicManage/platformType.vue +++ b/src/views/dicManage/platformType.vue @@ -10,7 +10,7 @@
diff --git a/src/views/dicManage/sharedUnit.vue b/src/views/dicManage/sharedUnit.vue index 08c3c83..607fe5d 100644 --- a/src/views/dicManage/sharedUnit.vue +++ b/src/views/dicManage/sharedUnit.vue @@ -10,7 +10,7 @@
diff --git a/src/views/dicManage/visitorUnit.vue b/src/views/dicManage/visitorUnit.vue index f0c6fce..5456ace 100644 --- a/src/views/dicManage/visitorUnit.vue +++ b/src/views/dicManage/visitorUnit.vue @@ -10,7 +10,7 @@
diff --git a/src/views/statistics/AuvStatistics.vue b/src/views/statistics/AuvStatistics.vue index 44e702a..7d55296 100644 --- a/src/views/statistics/AuvStatistics.vue +++ b/src/views/statistics/AuvStatistics.vue @@ -11,7 +11,7 @@
-

无人航行潜水器汇总统计

+

水下自主式无人潜水器汇总统计

{{ uuv.length }} 艘在册