Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/api/datahub/index.ts

@@ -53,12 +53,11 @@ export default {
    },
   
    weather:{
-      getCityWeatherList: () => get('/region/weather/cityWeatherList'),
-      getWhichCityWeather: (params: object) => get('/region/weather/getInfoById', params),
-      getTemperatureEchartById: (params: object) => get('/region/weather/getTemperatureEchartById', params),
-      getWindpowerEchartById: (params: object) => get('/region/weather/getWindpowerEchartById', params),
+      getCityWeatherList: () => get('/envirotronics/weather/cityWeatherList'),
+      getWhichCityWeather: (params: object) => get('/envirotronics/weather/getInfoById', params),
+      getTemperatureEchartById: (params: object) => get('/envirotronics/weather/getTemperatureEchartById', params),
+      getWindpowerEchartById: (params: object) => get('/envirotronics/weather/getWindpowerEchartById', params),
    },
-
    statistics:{
       getStatisticsChartData: (params: object) => get('/statistics/bar/chart/data', params),
       getStatisticsLineChartData: (params: object) => get('/statistics/broken/line/data', params),

src/views/home/index.vue

@@ -106,8 +106,6 @@ let global: any = {
 	dispose: [null, '', undefined],
 };
 
-
-
 export default defineComponent({
 	name: 'home',
 	setup() {
@@ -123,7 +121,7 @@ export default defineComponent({
 				{
 					icon: map,
 					iconDark: map1,
-					title: '供暖面积',
+					title: '供热面积',
 					contentTitle1: '供热面积',
 					val1: '',
 					unit1: '㎡',
@@ -654,7 +652,7 @@ export default defineComponent({
 				nextTick(() => {
 					console.log(isIsDark)
 					// if(!isIsDark) return
-					state.charts.theme = isIsDark ? 'dark' : '';
+					state.charts.theme = isIsDark ? 'transparent' : '';
 					state.charts.bgColor = isIsDark ? 'transparent' : '';
 					state.charts.color = isIsDark ? '#dadada' : '#303133';
 					setTimeout(() => {