解决冲突

src/api/datahub/index.ts

@@ -69,6 +69,7 @@ export default {
       getStatisticsLineChartData: (params: object) => get('/statistics/broken/line/data', params),
       getStatisticsTotalData: (params: object) => get('/statistics/city/data', params),
       getStatisticsPieData: (params: object) => get('/statistics/tempering/ratio/data', params),
+      getStatisticsOverview: (params: object) => get('/statistics/overview', params),
    },
    iotManage:{
       getOverviewData: () => get('/statistics/thing/overview'),

src/views/iot/iotmanager/dashboard.vue

@@ -99,8 +99,6 @@ let global: any = {
 	dispose: [null, '', undefined]
 };
 
-// api.log.getList
-
 export default defineComponent({
 	name: 'home',
 	components: { EditDic, DetailDic },