diff --git a/src/api/basic/station.js b/src/api/basic/station.js index 2247678..bd58359 100644 --- a/src/api/basic/station.js +++ b/src/api/basic/station.js @@ -11,18 +11,55 @@ export default { pageSize: searchModel.pageSize, startTime: searchModel.startTime, endTime: searchModel.endTime, - stcd:searchModel.stcd, - stnm:searchModel.stnm + stcds: searchModel.stcds, } }) }, - importDateToSoft(from){ + importDateToSoft() { return request({ url: "/basic/importDateToSoft", method: 'post', + }) + }, + getStnmAndStcdList(startTime, endTime, type) { + return request({ + url: "/basic/getStationList", + method: 'get', + params: { + startTime: startTime, + endTime: endTime, + type: type + } + }) + }, + + getStnmAndStcdByType(start, end, type) { + return request({ + url: "/basic/getStationListByType", + method: 'get', + params: { + type: type, + startTime: start, + endTime: end, + } + }) + }, + importDateToSoftOrExportSoft(param) { + return request({ + url: "/basic/importDateToSoftOrExportSoft", + method: 'post', + data:param + }) + }, + testSqlConnection(param) { + return request({ + url: "/basic/testConnection", + method: 'get', params: { - startTime: from.startTime, - endTime: from.endTime, + sqlseverIp: param.sqlseverIp, + userName: param.userName, + password: param.password, + dataBase: param.dataBase, } }) } diff --git a/src/api/day/dayZscs.js b/src/api/day/dayZscs.js new file mode 100644 index 0000000..f672c2e --- /dev/null +++ b/src/api/day/dayZscs.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' +export default { + getZscsTableList(searchModel) { + return request({ + url: "/day/getDayZscsList", + method: 'get', + params: { + pageNum: searchModel.pageNum, + pageSize: searchModel.pageSize, + startTime: searchModel.startTime, + endTime: searchModel.endTime, + stcd:searchModel.stcd, + stnm:searchModel.stnm + } + }) + }, + exportRainDataList(){ + return request({ + url: "/export/exportMonthRainList", + method: 'get', + responseType: 'blob' + }) + }, + +} diff --git a/src/components/SelectStaion/index.vue b/src/components/SelectStaion/index.vue new file mode 100644 index 0000000..09cdecc --- /dev/null +++ b/src/components/SelectStaion/index.vue @@ -0,0 +1,124 @@ + + + + diff --git a/src/views/basic/station/index.vue b/src/views/basic/station/index.vue index 3edb92a..c050f9f 100644 --- a/src/views/basic/station/index.vue +++ b/src/views/basic/station/index.vue @@ -1,12 +1,6 @@