diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/Agriculture-front-end.iml b/.idea/Agriculture-front-end.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/Agriculture-front-end.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/dist.xml b/.idea/libraries/dist.xml new file mode 100644 index 0000000..b925a43 --- /dev/null +++ b/.idea/libraries/dist.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..9a32be6 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/public/libs/openlayers/4.6.5/ol-debug.js b/public/libs/openlayers/4.6.5/ol-debug.js index eab35d6..693333a 100644 --- a/public/libs/openlayers/4.6.5/ol-debug.js +++ b/public/libs/openlayers/4.6.5/ol-debug.js @@ -14485,7 +14485,7 @@ goog.require('ol.math'); * * @constructor * @extends {ol.geom.SimpleGeometry} - * @param {ol.Coordinate} coordinates Coordinates. + * @param {number[]} coordinates Coordinates. * @param {ol.geom.GeometryLayout=} opt_layout Layout. * @api */ @@ -56872,7 +56872,7 @@ goog.require('ol.geom.flat.deflate'); * * @constructor * @extends {ol.geom.SimpleGeometry} - * @param {ol.Coordinate} center Center. + * @param {*[]} center Center. * @param {number=} opt_radius Radius. * @param {ol.geom.GeometryLayout=} opt_layout Layout. * @api diff --git a/src/api/meteorological/monitor/information.js b/src/api/meteorological/monitor/information.js index b393137..9c668d0 100644 --- a/src/api/meteorological/monitor/information.js +++ b/src/api/meteorological/monitor/information.js @@ -1,7 +1,7 @@ import request from '@/utils/request' -export function getreturnToMonitoringTime(query) { +export function getreturnToMonitoringTime(query) { return request({ url: 'equipment/returnToMonitoringTime', method: 'get', @@ -9,7 +9,7 @@ export function getreturnToMonitoringTime(query) { }) } -export function getmeteorologicalFreeze(query) { +export function getmeteorologicalFreeze(query) { return request({ url: 'equipment/meteorologicalFreeze', method: 'get', @@ -17,7 +17,7 @@ export function getmeteorologicalFreeze(query) { }) } -export function getsendSms(data) { +export function getsendSms(data) { return request({ url: 'equipment/sendSms', method: 'post', @@ -25,11 +25,34 @@ export function getsendSms(data) { }) } -export function getmeteorologyEquipment(data) { +export function getmeteorologyEquipment(data) { return request({ url: 'equipment/meteorologicals', - method: 'post', - data: data + method: 'get', + params: data + + }) +} + +export function meteorologicalsPeople () { + return request({ + url: 'equipment/meteorologicalsPeople', + method: 'post', + + }) +} + +export function meteorology (data) { + return request({ + url: '/equipment/meteorology', + method: 'get', + params:data + }) +} +export function zdmc () { + return request({ + url: '/equipment/zdmc ', + method: 'get', }) } diff --git a/src/assets/images/ganhan0.png b/src/assets/images/ganhan0.png new file mode 100644 index 0000000..03948d0 Binary files /dev/null and b/src/assets/images/ganhan0.png differ diff --git a/src/assets/images/ganhan1.png b/src/assets/images/ganhan1.png new file mode 100644 index 0000000..81482ad Binary files /dev/null and b/src/assets/images/ganhan1.png differ diff --git a/src/assets/images/ganhan2.png b/src/assets/images/ganhan2.png new file mode 100644 index 0000000..05b018f Binary files /dev/null and b/src/assets/images/ganhan2.png differ diff --git a/src/assets/images/ganhan3.png b/src/assets/images/ganhan3.png new file mode 100644 index 0000000..ca0a07e Binary files /dev/null and b/src/assets/images/ganhan3.png differ diff --git a/src/assets/images/ganhan4.png b/src/assets/images/ganhan4.png new file mode 100644 index 0000000..13f202f Binary files /dev/null and b/src/assets/images/ganhan4.png differ diff --git a/src/assets/images/personSelected.png b/src/assets/images/personSelected.png new file mode 100644 index 0000000..14993cb Binary files /dev/null and b/src/assets/images/personSelected.png differ diff --git a/src/assets/images/personUnselected.png b/src/assets/images/personUnselected.png new file mode 100644 index 0000000..91714cd Binary files /dev/null and b/src/assets/images/personUnselected.png differ diff --git a/src/views/meteorological/monitor/drought/index.vue b/src/views/meteorological/monitor/drought/index.vue index ce066f7..60f3389 100644 --- a/src/views/meteorological/monitor/drought/index.vue +++ b/src/views/meteorological/monitor/drought/index.vue @@ -1,177 +1,223 @@ - - - - - 监测日期: - - - - - - - 预警信息发布 - - - - 预警范围: - - 5km - 10km - - - - - - - - - - - 发布预警短信 - - - + + + + + 监测日期: + + + + + + + + + + - - - - - - - - + + + + + 预警信息发布 - - - - - - - + + + 预警范围: + + 5km + 10km + + + + 站点名称: + + + + + + + 预警情况: + + + + + + + 查询 + 重置 + + + + + + + + + + + 发布预警短信 + - - - - 设备: - {{ regionName }} - - - 经度: - {{ popdata.msLongitude }} - - - 纬度: - {{ popdata.msLatitude }} - - - X + + + + + + + + + + + + + + + + + + + + + + + 设备: + {{ regionName }} - - - - 设备: - {{ regionName }} - - - 经度: - {{ item.msLongitude }} - 纬度: - {{ item.msLatitude }} - - - X + + 经度: + {{ popdata.msLongitude }} - - - 图例 - - - + 纬度: + + {{ popdata.msLatitude }} + + + X + + + + + 设备: + {{ regionName }} + + + 经度: + {{ item.msLongitude }} + 纬度: + {{ item.msLatitude }} + + + X + + + + 图例 + + + - - - - + :v-model="value.disabled" + :disabled="value.disabled" + :label="item" + /> + + + + - 返回 - + 返回 +