Commit Graph

289 Commits

Author SHA1 Message Date
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
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
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
庞东林
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
庞东林
e2c1fc7c5d 页面监听调整 2021-12-27 10:54:17 +08:00
庞东林
45996c6364 Merge branch 'yinyongshui' 2021-12-27 09:57:18 +08:00
庞东林
35e5d10be0 优化表格空数据提示 2021-12-27 09:52:09 +08:00
hey7845
d069ff4eb6 区域噪声趋势图暂存 2021-12-25 23:09:52 +08:00
庞东林
e9571baec0 Merge branch 'yinyongshui' 2021-12-25 17:57:43 +08:00
庞东林
4ba63e2d2e 备用水源 2021-12-25 17:57:06 +08:00
hey7845
e04d95d7d9 趋势图问题修复 2021-12-25 13:15:44 +08:00
hey7845
fd6f04dedc 道路噪声趋势图-存在柱状图部分不兼容问题 2021-12-25 00:45:24 +08:00
art_station
d77faf65ed Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2021-12-24 17:11:51 +08:00
art_station
b8affdb541 趋势图前端代码提交-未完成 2021-12-24 17:11:39 +08:00
庞东林
9f57272b5b Merge branch 'huku' 2021-12-23 15:12:59 +08:00
庞东林
d98096ff4d 专湖区域筛选去重 2021-12-23 15:12:37 +08:00
庞东林
dddb52ae49 Merge branch 'huku' 2021-12-23 15:09:57 +08:00
庞东林
4d61ba87d5 增加专湖区域多选 2021-12-23 15:06:33 +08:00
c400e30d82 Merge remote-tracking branch 'origin/huku' 2021-12-22 12:21:03 +08:00
庞东林
3584c8f67a 更换专湖表头字段 2021-12-21 17:16:23 +08:00
4454500cf7 Merge remote-tracking branch 'origin/yinyongshui' 2021-12-21 12:58:10 +08:00