diff --git a/yanzhu-bigscreen/src/api/index.js b/yanzhu-bigscreen/src/api/index.js index 90877d10..f9074947 100644 --- a/yanzhu-bigscreen/src/api/index.js +++ b/yanzhu-bigscreen/src/api/index.js @@ -1,8 +1,10 @@ import {axios,download} from '@/utils/request' import project from './project' +import weather from './weather' export default { http:axios, downFile:download, - project + project, + weather } \ No newline at end of file diff --git a/yanzhu-bigscreen/src/api/weather.js b/yanzhu-bigscreen/src/api/weather.js new file mode 100644 index 00000000..9e2ae8ab --- /dev/null +++ b/yanzhu-bigscreen/src/api/weather.js @@ -0,0 +1,28 @@ +import request from "@/utils/request"; + + +const getByCity = (id) => { + return request({ + url: "/manage/weather/city/"+id, + method: "get", + }); + }; + +const getCityInfo = () => { +return request({ + url: "/manage/weather/getCityInfo", + method: "get", +}); +}; + +const getCityNowInfo = (id) => { + return request({ + url: "/manage/weather/getCityNowInfo/"+id, + method: "get", + }); + }; +export default { + getByCity, + getCityInfo, + getCityNowInfo +} \ No newline at end of file diff --git a/yanzhu-bigscreen/src/assets/icons/svg/humidity.svg b/yanzhu-bigscreen/src/assets/icons/svg/humidity.svg new file mode 100644 index 00000000..f956d0c4 --- /dev/null +++ b/yanzhu-bigscreen/src/assets/icons/svg/humidity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/assets/icons/svg/precipitation.svg b/yanzhu-bigscreen/src/assets/icons/svg/precipitation.svg new file mode 100644 index 00000000..cbdd0e3f --- /dev/null +++ b/yanzhu-bigscreen/src/assets/icons/svg/precipitation.svg @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/assets/icons/svg/pressure.svg b/yanzhu-bigscreen/src/assets/icons/svg/pressure.svg new file mode 100644 index 00000000..90e2533e --- /dev/null +++ b/yanzhu-bigscreen/src/assets/icons/svg/pressure.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/assets/icons/svg/wind.svg b/yanzhu-bigscreen/src/assets/icons/svg/wind.svg new file mode 100644 index 00000000..8a6aa820 --- /dev/null +++ b/yanzhu-bigscreen/src/assets/icons/svg/wind.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/components-old/people-number.vue b/yanzhu-bigscreen/src/components/people-number.vue similarity index 86% rename from yanzhu-bigscreen/src/components-old/people-number.vue rename to yanzhu-bigscreen/src/components/people-number.vue index 004f9fb6..6dccccc2 100644 --- a/yanzhu-bigscreen/src/components-old/people-number.vue +++ b/yanzhu-bigscreen/src/components/people-number.vue @@ -1,7 +1,7 @@