Merge branch 'dev' into webUi

5 years ago · 0694f0d82d
parent a5fa6eb3d7 6a522925cf
commit 0694f0d82d
181 changed files with 36 additions and 529960 deletions
--- a/console/controllers/10-10.xlsx
+++ b/console/controllers/10-10.xlsx
--- a/console/controllers/10-11-15.xlsx
+++ b/console/controllers/10-11-15.xlsx
--- a/console/controllers/10-11.xlsx
+++ b/console/controllers/10-11.xlsx
--- a/console/controllers/10-12.xlsx
+++ b/console/controllers/10-12.xlsx
--- a/console/controllers/10-13.xlsx
+++ b/console/controllers/10-13.xlsx
--- a/console/controllers/10-14.xlsx
+++ b/console/controllers/10-14.xlsx
--- a/console/controllers/10-15.xlsx
+++ b/console/controllers/10-15.xlsx
--- a/console/controllers/10-30-1.xlsx
+++ b/console/controllers/10-30-1.xlsx
--- a/console/controllers/10-30.xlsx
+++ b/console/controllers/10-30.xlsx
--- a/console/controllers/10-31-1.xlsx
+++ b/console/controllers/10-31-1.xlsx
--- a/console/controllers/10-31.xlsx
+++ b/console/controllers/10-31.xlsx
--- a/console/controllers/10-7-data.xlsx
+++ b/console/controllers/10-7-data.xlsx
--- a/console/controllers/10-8-data.xlsx
+++ b/console/controllers/10-8-data.xlsx
--- a/console/controllers/10-9-1.xlsx
+++ b/console/controllers/10-9-1.xlsx
--- a/console/controllers/10-9.xlsx
+++ b/console/controllers/10-9.xlsx
--- a/console/controllers/11-1-1.xlsx
+++ b/console/controllers/11-1-1.xlsx
--- a/console/controllers/11-1.xlsx
+++ b/console/controllers/11-1.xlsx
--- a/console/controllers/11-2-1.xlsx
+++ b/console/controllers/11-2-1.xlsx
--- a/console/controllers/11-2.xlsx
+++ b/console/controllers/11-2.xlsx
--- a/console/controllers/11-3-1.xlsx
+++ b/console/controllers/11-3-1.xlsx
--- a/console/controllers/11-3.xlsx
+++ b/console/controllers/11-3.xlsx
--- a/console/controllers/11-30.xlsx
+++ b/console/controllers/11-30.xlsx
--- a/console/controllers/11-4-1.xlsx
+++ b/console/controllers/11-4-1.xlsx
--- a/console/controllers/11-4.xlsx
+++ b/console/controllers/11-4.xlsx
--- a/console/controllers/11-5-1.xlsx
+++ b/console/controllers/11-5-1.xlsx
--- a/console/controllers/11-5.xlsx
+++ b/console/controllers/11-5.xlsx
--- a/console/controllers/11-6-1.xlsx
+++ b/console/controllers/11-6-1.xlsx
--- a/console/controllers/11-6.xlsx
+++ b/console/controllers/11-6.xlsx
--- a/console/controllers/11-7-1.xlsx
+++ b/console/controllers/11-7-1.xlsx
--- a/console/controllers/11-7.xlsx
+++ b/console/controllers/11-7.xlsx
--- a/console/controllers/11-8-1.xlsx
+++ b/console/controllers/11-8-1.xlsx
--- a/console/controllers/11-8.xlsx
+++ b/console/controllers/11-8.xlsx
--- a/console/controllers/11-9-1.xlsx
+++ b/console/controllers/11-9-1.xlsx
--- a/console/controllers/11-9.xlsx
+++ b/console/controllers/11-9.xlsx
--- a/console/controllers/12-1.xlsx
+++ b/console/controllers/12-1.xlsx
--- a/console/controllers/12-10.xlsx
+++ b/console/controllers/12-10.xlsx
--- a/console/controllers/12-11.xlsx
+++ b/console/controllers/12-11.xlsx
--- a/console/controllers/12-2.xlsx
+++ b/console/controllers/12-2.xlsx
--- a/console/controllers/12-3.xlsx
+++ b/console/controllers/12-3.xlsx
--- a/console/controllers/12-4.xlsx
+++ b/console/controllers/12-4.xlsx
--- a/console/controllers/12-5.xlsx
+++ b/console/controllers/12-5.xlsx
--- a/console/controllers/12-6.xlsx
+++ b/console/controllers/12-6.xlsx
--- a/console/controllers/12-7.xlsx
+++ b/console/controllers/12-7.xlsx
--- a/console/controllers/12-8.xlsx
+++ b/console/controllers/12-8.xlsx
--- a/console/controllers/12-9.xlsx
+++ b/console/controllers/12-9.xlsx
--- a/console/controllers/14.11-t.xlsx
+++ b/console/controllers/14.11-t.xlsx
--- a/console/controllers/14.12-t.xlsx
+++ b/console/controllers/14.12-t.xlsx
--- a/console/controllers/16.01-t.xlsx
+++ b/console/controllers/16.01-t.xlsx
--- a/console/controllers/16.02-t.xlsx
+++ b/console/controllers/16.02-t.xlsx
--- a/console/controllers/16.03-t.xlsx
+++ b/console/controllers/16.03-t.xlsx
--- a/console/controllers/16.04-t.xlsx
+++ b/console/controllers/16.04-t.xlsx
--- a/console/controllers/16.05-t.xlsx
+++ b/console/controllers/16.05-t.xlsx
--- a/console/controllers/16.06-t.xlsx
+++ b/console/controllers/16.06-t.xlsx
--- a/console/controllers/16.07-t.xlsx
+++ b/console/controllers/16.07-t.xlsx
--- a/console/controllers/2013-无车牌.xls
+++ b/console/controllers/2013-无车牌.xls
--- a/console/controllers/2013-无车牌.xlsx
+++ b/console/controllers/2013-无车牌.xlsx
--- a/console/controllers/2013无保险日期.xlsx
+++ b/console/controllers/2013无保险日期.xlsx
--- a/console/controllers/2014-无车牌.xlsx
+++ b/console/controllers/2014-无车牌.xlsx
--- a/console/controllers/2014.04-2016.07-a-d.xlsx
+++ b/console/controllers/2014.04-2016.07-a-d.xlsx
--- a/console/controllers/2014.04-2016.07.xlsx
+++ b/console/controllers/2014.04-2016.07.xlsx
--- a/console/controllers/2014无保险日期.xlsx
+++ b/console/controllers/2014无保险日期.xlsx
--- a/console/controllers/2015-10-6-17.xlsx
+++ b/console/controllers/2015-10-6-17.xlsx
--- a/console/controllers/2015-10-6-18.xlsx
+++ b/console/controllers/2015-10-6-18.xlsx
--- a/console/controllers/2015-10-6-19.xlsx
+++ b/console/controllers/2015-10-6-19.xlsx
--- a/console/controllers/2015-10-6-20.xlsx
+++ b/console/controllers/2015-10-6-20.xlsx
--- a/console/controllers/2015-10-6-24.xlsx
+++ b/console/controllers/2015-10-6-24.xlsx
--- a/console/controllers/2015-10-6-28.xlsx
+++ b/console/controllers/2015-10-6-28.xlsx
--- a/console/controllers/2015-10-6-30.xlsx
+++ b/console/controllers/2015-10-6-30.xlsx
--- a/console/controllers/2015-10-7-01.xlsx
+++ b/console/controllers/2015-10-7-01.xlsx
--- a/console/controllers/2015-10-7-2.xlsx
+++ b/console/controllers/2015-10-7-2.xlsx
--- a/console/controllers/2015-11-7-5.xlsx
+++ b/console/controllers/2015-11-7-5.xlsx
--- a/console/controllers/2015-11-7-6.xlsx
+++ b/console/controllers/2015-11-7-6.xlsx
--- a/console/controllers/2015-11-7-7.xlsx
+++ b/console/controllers/2015-11-7-7.xlsx
--- a/console/controllers/2015-9-6-13.xlsx
+++ b/console/controllers/2015-9-6-13.xlsx
--- a/console/controllers/2015-9.xlsx
+++ b/console/controllers/2015-9.xlsx
--- a/console/controllers/2015-t-1.xlsx
+++ b/console/controllers/2015-t-1.xlsx
--- a/console/controllers/2015-t.xlsx
+++ b/console/controllers/2015-t.xlsx
--- a/console/controllers/2015-无车牌.xlsx
+++ b/console/controllers/2015-无车牌.xlsx
--- a/console/controllers/2015无保险日期.xlsx
+++ b/console/controllers/2015无保险日期.xlsx
--- a/console/controllers/2016-10-1-sk.xlsx
+++ b/console/controllers/2016-10-1-sk.xlsx
--- a/console/controllers/2016-10-6-14.xlsx
+++ b/console/controllers/2016-10-6-14.xlsx
--- a/console/controllers/2016-10-6-15.xlsx
+++ b/console/controllers/2016-10-6-15.xlsx
--- a/console/controllers/2016-10-6-16.xlsx
+++ b/console/controllers/2016-10-6-16.xlsx
--- a/console/controllers/2016-10-6-21.xlsx
+++ b/console/controllers/2016-10-6-21.xlsx
--- a/console/controllers/2016-10-6-22.xlsx
+++ b/console/controllers/2016-10-6-22.xlsx
--- a/console/controllers/2016-10-6-23.xlsx
+++ b/console/controllers/2016-10-6-23.xlsx
--- a/console/controllers/2016-10-6-26.xlsx
+++ b/console/controllers/2016-10-6-26.xlsx
--- a/console/controllers/2016-10-6-29.xlsx
+++ b/console/controllers/2016-10-6-29.xlsx
--- a/console/controllers/2016-10-6-30.xlsx
+++ b/console/controllers/2016-10-6-30.xlsx
--- a/console/controllers/2016-10.xlsx
+++ b/console/controllers/2016-10.xlsx
--- a/console/controllers/2016-11-7-2.xlsx
+++ b/console/controllers/2016-11-7-2.xlsx
--- a/console/controllers/2016-11-7-3.xlsx
+++ b/console/controllers/2016-11-7-3.xlsx
--- a/console/controllers/2016-11-7-4.xlsx
+++ b/console/controllers/2016-11-7-4.xlsx
--- a/console/controllers/2016-9-6-12.xlsx
+++ b/console/controllers/2016-9-6-12.xlsx
--- a/console/controllers/2016-9-6-13.xlsx
+++ b/console/controllers/2016-9-6-13.xlsx
--- a/console/controllers/2016-9.xlsx
+++ b/console/controllers/2016-9.xlsx
--- a/console/controllers/2016-无车牌.xlsx
+++ b/console/controllers/2016-无车牌.xlsx
--- a/console/controllers/2016无保险日期.xlsx
+++ b/console/controllers/2016无保险日期.xlsx
--- a/console/controllers/2017-无车牌.xlsx
+++ b/console/controllers/2017-无车牌.xlsx
--- a/console/controllers/2017无保险日期.xlsx
+++ b/console/controllers/2017无保险日期.xlsx
--- a/Show More
+++ b/Show More