diff --git a/config/prod.env.js b/config/prod.env.js index 38471e2..b5e3ff5 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -11,8 +11,10 @@ module.exports = { // VUE_APP_BASE_APIURL: '"http://120.48.105.88/api"', // 生产环境 // VUE_APP_BASE_API: '"http://120.48.105.88/api"', // 生产环境 // VUE_APP_BASE_APIURL: '"http://120.48.105.88/api"', // 生产环境 - VUE_APP_BASE_API: '"/api"', // 生产环境 - VUE_APP_BASE_APIURL: '"http://1.95.42.191:8080/api"', // 生产环境 + // VUE_APP_BASE_API: '"/api"', // 生产环境 + // VUE_APP_BASE_APIURL: '"http://1.95.42.191:8080/api"', // 生产环境 + VUE_APP_BASE_API: '"/api"', + VUE_APP_BASE_APIURL: '"http://ds.hzzxq.com/api"', VUE_APP_FULL_API: '"http://10.10.151.3:5555"', VUE_APP_BASE_API_FRONT: '"http://10.10.150.128:8080/satellitePub/pub/index.html"', VUE_APP_CAS_LOGIN_FRONT: '"http://10.10.150.237/login?service=http://10.10.151.3:5555/api/login/cas?sign=asos_client"', diff --git a/src/api/dataSearch.js b/src/api/dataSearch.js index ceab4e9..408ba87 100644 --- a/src/api/dataSearch.js +++ b/src/api/dataSearch.js @@ -8,3 +8,66 @@ export function getDataSearch(query) { params: query }) } + +// 获取航次名称列表 +export function voyageNameList(query) { + return request({ + url: '/voyage/reg/page.htm', + method: 'get', + params: query + }) +} + +// 获取平台类型列表 +export function PlatformTypeList(query) { + return request({ + url: '/dict/platform/page.htm', + method: 'get', + params: query + }) +} + +// 获取设备类型列表 +export function equipmentTypeList(query) { + return request({ + url: '/dict/equipment/page.htm', + method: 'get', + params: query + }) +} + +// 获取数据样品类型列表 +export function dataTypeList(query) { + return request({ + url: '/dict/data/page.htm', + method: 'get', + params: query + }) +} + +// 获取数据样品集点位 +export function dataPoints(query) { + return request({ + url: '/sample/dataset/track/list.htm', + method: 'get', + params: query + }) +} + +// 获取数据样品测线列表 +export function sampleLineList(query) { + return request({ + url: '/sample/line/list.htm', + method: 'get', + params: query + }) +} + +// 获取数据样品站位列表 +export function sampleStationList(query) { + return request({ + url: '/sample/station/list.htm', + method: 'get', + params: query + }) +} diff --git a/src/views/dataSearch.vue b/src/views/dataSearch.vue index 9534da1..ebaf7e1 100644 --- a/src/views/dataSearch.vue +++ b/src/views/dataSearch.vue @@ -18,9 +18,10 @@ class="sousuo" type="primary" icon="el-icon-search" - @click="getList" + @click="getSearch" />
-
+

{{ item.dataset_name }} {{item.file_total}}

{{ item.create_time }}
+
    +
  • {{sample.sample_name}}
    • +

航次：

@@ -127,29 +137,138 @@
- + - - + + + - - + + + + + + - + +
+ +
+ + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + +
+ +
@@ -435,6 +876,31 @@ export default { color: #999999; } } + .sample { + padding: 6px 12px; + box-sizing: border-box; + box-sizing: border-box; + font-size: 14px; + color: #555555; + position: relative; + &::before { + content: ""; + display: block; + width: 8px; + height: 8px; + background-color: #B82C22; + position: absolute; + left: 0; + top: 12px; + border-radius: 50%; + } + //&:hover { + // background-color: rgb(248,249,250); + //} + } + .bg-color { + background-color: rgb(93,156,236); + } .left4_list{ width: 100%; display: flex;