Commit Graph

19 Commits

Author SHA1 Message Date
caishi a54226a5e7 附件样式 2018-02-09 10:20:37 +08:00
daiao afe708eb86 数据首页筛选优化 2018-02-08 16:25:49 +08:00
daiao 75f9f867e8 新建数据使用editorMD 2018-02-08 16:05:29 +08:00
huang a7322ac90c 修复编辑在特殊情况下的一些问题 2018-02-08 15:10:53 +08:00
huang 462d910ece statistics编辑 2018-02-08 14:33:50 +08:00
huang 70894ace5e 新建statistics的一些问题修复 2018-02-08 11:31:31 +08:00
huang 2b73c4b338 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-08 11:25:00 +08:00
huang dc36435be5 编辑功能 2018-02-08 11:24:42 +08:00
daiao aed5823d3f 数据页面 2018-02-08 11:24:04 +08:00
huang cfb3b3184b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/statistics/_form.html.erb
2018-02-08 10:30:05 +08:00
huang 89bc3c24ed 新建数据统计两级类型选择 2018-02-08 10:28:45 +08:00
caishi 2aa424f356 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/statistics/_form.html.erb
2018-02-07 17:28:04 +08:00
caishi 4645bddd1c fdf 2018-02-07 17:26:09 +08:00
huang ae0e78664c 提交 2018-02-07 17:25:41 +08:00
huang 405b362470 数据子类别与数据主类别的一些修改 2018-02-07 16:01:14 +08:00
huang a25dc9d6ce 数据子类(增删查改);数据主类(增删查该) 2018-02-07 14:13:09 +08:00
caishi a38c68a791 数据新建和列表 2018-02-06 17:41:39 +08:00
huang 0db396175b 数据统计添加附件功能 2018-02-05 15:13:03 +08:00
huang 11dfd8dbb2 数据统计功能(增删查改) 2018-02-05 12:03:35 +08:00