Commit Graph

306 Commits

Author SHA1 Message Date
art_station
344b16911b Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2022-01-17 11:05:40 +08:00
art_station
baed413622 环境趋势图基础代码完成,待详细测试 2022-01-17 11:05:33 +08:00
庞东林
744865894b 湖库图表 2022-01-17 07:03:37 +08:00
庞东林
7bb3f32af0 趋势图柱状图 2022-01-14 18:06:56 +08:00
庞东林
c27071780d 湖库图表基础页面 2022-01-14 12:13:17 +08:00
hey7845
64f9674891 环境变量修改 2022-01-12 16:50:07 +08:00
hey7845
2ff5176a3b 环境空气代码提交 2022-01-12 16:48:42 +08:00
庞东林
bed8b17091 修改水质达标情况接口返回接参 2022-01-10 14:28:47 +08:00
庞东林
fe1e0a71d4 江河联动 2022-01-10 09:56:26 +08:00
shixiaoman
da63fa3fa2 Merge branch 'master' into xiaoman 2022-01-07 15:39:03 +08:00
庞东林
4873ce3b96 调整饮用水时间搜索 2022-01-06 14:19:46 +08:00
hey7845
3f5b392004 空气相关代码提交 2022-01-06 14:09:52 +08:00
庞东林
42e2757b12 修复1-4问题 2022-01-05 17:59:03 +08:00
庞东林
19b5a12146 添加导入提示 2022-01-05 17:40:21 +08:00
710356044
bf4a31a4a1 Merge remote-tracking branch 'origin/master' 2022-01-04 21:04:46 +08:00
710356044
5f90df0716 取水量bug修复 2022-01-04 21:04:15 +08:00
庞东林
e15b3197fd Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2022-01-04 19:41:51 +08:00
庞东林
67960d3a1d 添加下载模板 2022-01-04 19:41:37 +08:00
f3d0f7440f Merge remote-tracking branch 'origin/master' 2022-01-04 18:28:03 +08:00
hey7845
2d19a7cfa8 Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2022-01-04 18:03:27 +08:00
hey7845
4eb3b9a387 噪声板块相关添加 2022-01-04 18:03:19 +08:00
庞东林
8f14f50daa 湖库添加经纬度 2022-01-04 17:52:18 +08:00
710356044
347230459d Merge remote-tracking branch 'origin/master' 2022-01-04 16:21:56 +08:00
710356044
3c6781b85d 饮用水取水量修改 2022-01-04 16:21:28 +08:00
hey7845
ffd62ce76d 地区更改 2022-01-04 15:56:10 +08:00
6c2617cccc Merge remote-tracking branch 'origin/xiaoman' 2022-01-04 11:21:11 +08:00
hey7845
a1cad26276 功能区相关代码完成 2022-01-01 18:36:26 +08:00
hey7845
d95e8a44ff Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin
# Conflicts:
#	src/views/sound/road/trend/index.vue
冲突解决
2022-01-01 08:01:40 +08:00
hey7845
1304789cf8 交通趋势图相关调整
年度相关调整
2022-01-01 07:57:23 +08:00
art_station
503cbc10d4 Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2021-12-30 16:54:52 +08:00
art_station
a205c4867c 数据为空统计代码变更 2021-12-30 16:54:45 +08:00
shixiaoman
1e8cc22dab 江河添加排序功能 2021-12-30 16:52:39 +08:00
庞东林
a71643d9fe 专湖添加五日生化需氧量 2021-12-30 15:22:59 +08:00
hey7845
127fd78b7e Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2021-12-29 21:14:27 +08:00
hey7845
5c2de8eec0 县级噪声趋势图修改 2021-12-29 21:14:20 +08:00
庞东林
707dcfa12d 调整专湖表头 2021-12-29 17:54:42 +08:00
hey7845
13ff3d1429 Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2021-12-29 12:23:03 +08:00
hey7845
8acd6e1018 功能区代码暂存 2021-12-29 12:22:56 +08:00
庞东林
c7deef7481 修改筛选传值 2021-12-28 21:54:28 +08:00
hey7845
9295105612 区域噪声统计 2021-12-28 18:11:51 +08:00
hey7845
611f5b5e69 显示错位问题修复 2021-12-28 16:57:30 +08:00
hey7845
2068d9e872 微调 2021-12-28 15:43:30 +08:00
hey7845
a09d607a0b Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2021-12-28 15:42:43 +08:00
hey7845
6b3b786bd4 趋势图变更 2021-12-28 15:42:34 +08:00
庞东林
16ae380b01 Merge branch 'huku' 2021-12-28 15:38:06 +08:00
庞东林
f9fbe6f941 去掉平均数据还有平均营养指数版块的监测时间 2021-12-28 14:17:29 +08:00
hey7845
68fe43b0fc Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2021-12-28 10:16:33 +08:00
art_station
0a2fcfcac5 南宁市显示增加 2021-12-27 19:39:50 +08:00
art_station
9dffc3ac70 左边分贝值保留一位小数
冗余代码删除
自动打开配置
2021-12-27 14:11:24 +08:00
庞东林
448db33376 Merge branch 'yinyongshui' 2021-12-27 11:07:18 +08:00