Commit Graph

278 Commits

Author SHA1 Message Date
9ff10fcc09 Merge remote-tracking branch 'origin/master' 2022-01-22 10:07:33 +08:00
710356044
356923bff6 新增县级,农村取水量导入 2022-01-21 22:40:09 +08:00
hey7845
00f536bf79 bug修复 2022-01-21 20:40:55 +08:00
a48a66d5e6 Merge remote-tracking branch 'origin/xiaoman' 2022-01-21 13:55:56 +08:00
e1542768c7 Merge remote-tracking branch 'origin/master' 2022-01-21 13:55:16 +08:00
710356044
c4c750ceb7 饮用水县级字典修复 2022-01-21 13:35:40 +08:00
hey7845
25ae4df57b Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2022-01-20 21:59:45 +08:00
hey7845
7558886125 酸雨环境空气相关代码提交 2022-01-20 21:58:58 +08:00
庞东林
1cc3a8a361 饮用水接口地址更换 2022-01-20 18:04:35 +08:00
weicw
618cd95d63 k 2022-01-20 16:15:50 +08:00
weicw
2a3b9803d0 首页样式 2022-01-20 05:36:34 +08:00
庞东林
0842c23c99 增加全选 2022-01-19 18:01:19 +08:00
庞东林
8e16d37034 水质类别更换字段 2022-01-19 15:40:31 +08:00
hey7845
8c153d1e2e Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin 2022-01-19 14:08:52 +08:00
hey7845
fcac01a010 环境空气趋势图相关调整 2022-01-19 14:08:27 +08:00
weicw
b0027e5a33 路径 2022-01-19 13:08:31 +08:00
庞东林
767fe2a378 饮用水添加字段 2022-01-19 11:05:10 +08:00
庞东林
6504d7aaf9 优化 2022-01-19 09:09:54 +08:00
庞东林
72407cc3ef 湖库图表 2022-01-19 08:48:28 +08:00
hey7845
2496e44485 酸雨代码暂存 2022-01-18 19:29:59 +08:00
art_station
5b2c0c7bea 微调 2022-01-17 20:54:38 +08:00
庞东林
461e4bba9c 湖库趋势图 2022-01-17 15:24:11 +08:00
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