Commit Graph

2650 Commits

Author SHA1 Message Date
shijingjing
3fb0b4bec0 30805 2022-08-15 14:03:18 +08:00
aixianling
ebcb37cdf6 Merge remote-tracking branch 'origin/dev' into dev 2022-08-15 13:52:48 +08:00
aixianling
82063280f7 监测对象增加导出名单 2022-08-15 13:52:34 +08:00
shijingjing
eddd56a0de 文件名称 2022-08-15 13:52:24 +08:00
aixianling
84299df63e Merge branch 'dev' into build 2022-08-15 13:51:24 +08:00
aixianling
4e1cf8a814 删除无用文件 2022-08-15 13:51:06 +08:00
yanran200730
fc7f522524 郫都大屏 2022-08-15 11:30:32 +08:00
shijingjing
418cc69634 网格员积分 2022-08-15 11:24:25 +08:00
aixianling
de53dfed54 Merge branch 'dev' into build 2022-08-15 09:31:48 +08:00
shijingjing
40a73c2a34 echarts label字段超出显示省略号 2022-08-15 08:42:49 +08:00
shijingjing
040cef5028 默认值 2022-08-12 19:01:09 +08:00
shijingjing
a275e873fa 规则 2022-08-12 18:35:02 +08:00
aixianling
cc06862696 图片压缩并把图片转移至cdn 2022-08-12 17:16:21 +08:00
aixianling
2d76c3fee4 Merge branch 'dev' into build 2022-08-12 17:06:29 +08:00
shijingjing
9961da1d25 bug 2022-08-12 16:15:34 +08:00
shijingjing
7032ea6e4f bug 2022-08-12 16:13:25 +08:00
yanran200730
ab2207b109 郫都大屏 2022-08-12 16:11:03 +08:00
aixianling
d7d6f12142 Merge branch 'dev' into build 2022-08-12 15:02:57 +08:00
yanran200730
1f1dc5eec8 bug 2022-08-12 14:07:46 +08:00
aixianling
cf2de900f0 Merge remote-tracking branch 'origin/dev' into build 2022-08-12 13:58:33 +08:00
shijingjing
b0b3193457 事件汇总 2022-08-12 11:50:37 +08:00
aixianling
6a39364b03 Merge remote-tracking branch 'origin/dev' into build 2022-08-12 11:50:33 +08:00
aixianling
38d01b37fd 修复大华视频播放 2022-08-12 11:50:04 +08:00
aixianling
98946c1e28 构建版本修改 2022-08-12 11:20:51 +08:00
yanran200730
ffc5682a36 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-12 09:47:41 +08:00
yanran200730
347bd16bb1 bug 2022-08-12 09:47:34 +08:00
aixianling
c3f6fbbffe Merge remote-tracking branch 'origin/dev' into dev 2022-08-12 09:29:56 +08:00
aixianling
d5b104fefd 增加es6兼容 2022-08-12 09:29:37 +08:00
shijingjing
b879c1b0c4 导出 2022-08-11 17:27:21 +08:00
shijingjing
23c5d65e0f 滚动条 2022-08-11 16:49:51 +08:00
yanran200730
bad3028a83 郫都大屏 2022-08-11 16:36:36 +08:00
yanran200730
86dbba831f Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-11 16:14:34 +08:00
yanran200730
52d60210c7 郫都大屏 2022-08-11 16:14:28 +08:00
shijingjing
15eb67168f 统计 2022-08-11 15:11:05 +08:00
aixianling
c08514c60f 增加工作流全局埋点 2022-08-11 15:01:52 +08:00
aixianling
1711b37750 Merge remote-tracking branch 'origin/dev' into dev 2022-08-11 14:25:01 +08:00
aixianling
d5c1bfe913 工作流台账对接完成 2022-08-11 14:24:49 +08:00
shijingjing
c4bee85e6f 统计 2022-08-11 11:41:58 +08:00
aixianling
509379e704 增加权限码控制 2022-08-11 11:14:27 +08:00
aixianling
84aa2f5f62 Merge remote-tracking branch 'origin/dev' into dev 2022-08-11 10:45:35 +08:00
aixianling
277029ad85 上架直接使用标准版居民档案 2022-08-11 10:45:21 +08:00
yanran200730
6861f7f754 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-11 10:31:48 +08:00
yanran200730
5132d41b14 郫都大屏 2022-08-11 10:31:35 +08:00
aixianling
53f9434f53 Merge remote-tracking branch 'origin/dev' into dev 2022-08-11 10:30:51 +08:00
aixianling
cb57ac7b48 整合代码 2022-08-11 10:30:31 +08:00
shijingjing
e404cc1417 积分 2022-08-11 09:54:52 +08:00
yanran200730
bcec48bdbf Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-11 09:28:51 +08:00
yanran200730
188d0ed258 郫都大屏 2022-08-11 09:28:44 +08:00
liuye
a9a466cca5 选择部门 2022-08-11 09:15:22 +08:00
yanran200730
ff8120d1b5 30786 2022-08-11 08:21:56 +08:00