diff --git a/src/layouts/local/dashboard/analysis/components/VisitAnalysis.vue b/src/layouts/local/dashboard/analysis/components/VisitAnalysis.vue index ccdabd5..23b7a0c 100644 --- a/src/layouts/local/dashboard/analysis/components/VisitAnalysis.vue +++ b/src/layouts/local/dashboard/analysis/components/VisitAnalysis.vue @@ -25,7 +25,7 @@ }, xAxis: { type: 'category', - boundaryGap: false, + boundaryGap: true, data: [...new Array(18)].map((_item, index) => `${index + 6}:00`), splitLine: { show: true, diff --git a/src/views/achievement/achievementType/api.ts b/src/views/achievement/achievementType/api.ts new file mode 100644 index 0000000..828da37 --- /dev/null +++ b/src/views/achievement/achievementType/api.ts @@ -0,0 +1,10 @@ +import { defHttp } from '@/utils/http/axios'; + +enum Api { + list = '/evr/project/getInfoList', +} + + +export function list(params?: any) { + return defHttp.get({ url: Api.list, params }); +} diff --git a/src/views/achievement/achievementType/index.vue b/src/views/achievement/achievementType/index.vue index b5db60e..f2d5928 100644 --- a/src/views/achievement/achievementType/index.vue +++ b/src/views/achievement/achievementType/index.vue @@ -3,21 +3,23 @@
- - + + - - + + - - + + - - + + - - - + + + + +
@@ -29,8 +31,12 @@ import { ref } from 'vue'; import { PageWrapper } from '@/components/Page'; import secondTab from './secondTab.vue'; - - const activeKey = ref('1'); + import {list} from './api' + // const tabChange = async(key) =>{ + // const res = await list({projectTypeList:key}) + + // } + const activeKey = ref('城镇污水处理及配套'); const loading = ref(false); diff --git a/src/views/water/waterPollution/index.vue b/src/views/water/waterPollution/index.vue new file mode 100644 index 0000000..741b3bb --- /dev/null +++ b/src/views/water/waterPollution/index.vue @@ -0,0 +1,45 @@ + + + + diff --git a/src/views/water/waterPollution/mutiBar.vue b/src/views/water/waterPollution/mutiBar.vue new file mode 100644 index 0000000..866ff1c --- /dev/null +++ b/src/views/water/waterPollution/mutiBar.vue @@ -0,0 +1,350 @@ + + + + diff --git a/src/views/water/waterPollution/threeAxis.vue b/src/views/water/waterPollution/threeAxis.vue new file mode 100644 index 0000000..0e87d91 --- /dev/null +++ b/src/views/water/waterPollution/threeAxis.vue @@ -0,0 +1,266 @@ + + + + diff --git a/src/views/water/waterPollution/twoBar.vue b/src/views/water/waterPollution/twoBar.vue new file mode 100644 index 0000000..f8d802b --- /dev/null +++ b/src/views/water/waterPollution/twoBar.vue @@ -0,0 +1,167 @@ + + + + diff --git a/src/views/演示使用自行删除/gitee/index.vue b/src/views/演示使用自行删除/gitee/index.vue index 61c8ab9..3c6e656 100644 --- a/src/views/演示使用自行删除/gitee/index.vue +++ b/src/views/演示使用自行删除/gitee/index.vue @@ -37,7 +37,7 @@ }, xAxis: { type: 'category', - boundaryGap: false, + boundaryGap: true, data: resp.starList.map((item) => item.date), }, yAxis: { diff --git a/src/views/演示使用自行删除/visit/pages/loginLine.vue b/src/views/演示使用自行删除/visit/pages/loginLine.vue index 0119387..7e14830 100644 --- a/src/views/演示使用自行删除/visit/pages/loginLine.vue +++ b/src/views/演示使用自行删除/visit/pages/loginLine.vue @@ -38,7 +38,7 @@ }, xAxis: { type: 'category', - boundaryGap: false, + boundaryGap: true, data: data.date, }, yAxis: { diff --git a/vite.config.ts b/vite.config.ts index f6fbce9..dadc47e 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -17,7 +17,7 @@ export default defineApplicationConfig({ server: { proxy: { '/basic-api': { - target: 'http://10.1.21.250:8083', + target: 'http://10.1.21.250:8085', changeOrigin: true, ws: true, rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''),